mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 100584.
- Add a new CefSettings.graphics_implementation option for using different GL implementations. - Disable accelerated compositing by default due to multiple issues (issue #334, issue #335, issue #337). - Eliminate the "patcher" project and perform all patching during GYP project generation. - Fix references to non-existent files in cef.gyp. - Move BrowserWebKitInit method implementations to a separate .cc file. - Add support for Flash on Mac (issue #305). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@284 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1238,19 +1238,19 @@ void CefBrowserImpl::UIT_Find(int identifier, const CefString& search_text,
|
||||
|
||||
if (main_frame->document().isPluginDocument()) {
|
||||
WebPlugin* plugin = main_frame->document().to<WebPluginDocument>().plugin();
|
||||
webkit::npapi::WebPluginDelegate* delegate =
|
||||
static_cast<webkit::npapi::WebPluginImpl*>(plugin)->delegate();
|
||||
if (options.findNext) {
|
||||
// Just navigate back/forward.
|
||||
delegate->SelectFindResult(options.forward);
|
||||
} else {
|
||||
if (delegate->StartFind(searchText, options.matchCase, identifier)) {
|
||||
if (plugin) {
|
||||
if (options.findNext) {
|
||||
// Just navigate back/forward.
|
||||
plugin->selectFindResult(options.forward);
|
||||
} else {
|
||||
// No find results.
|
||||
UIT_NotifyFindStatus(identifier, 0, gfx::Rect(), 0, true);
|
||||
if (plugin->startFind(searchText, options.matchCase, identifier)) {
|
||||
} else {
|
||||
// No find results.
|
||||
UIT_NotifyFindStatus(identifier, 0, gfx::Rect(), 0, true);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
WebFrame* frame_after_main = main_frame->traverseNext(true);
|
||||
@@ -1358,11 +1358,10 @@ void CefBrowserImpl::UIT_StopFinding(bool clear_selection)
|
||||
|
||||
WebDocument doc = view->mainFrame()->document();
|
||||
if (doc.isPluginDocument()) {
|
||||
WebPlugin* plugin = view->mainFrame()->document().
|
||||
to<WebPluginDocument>().plugin();
|
||||
webkit::npapi::WebPluginDelegate* delegate =
|
||||
static_cast<webkit::npapi::WebPluginImpl*>(plugin)->delegate();
|
||||
delegate->StopFind();
|
||||
WebPlugin* plugin =
|
||||
view->mainFrame()->document().to<WebPluginDocument>().plugin();
|
||||
if (plugin)
|
||||
plugin->stopFind();
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user