bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 776 changes:

Browse Source 
- Fix DCHECK failure when calling OnSetFocus from LoadRequest (issue #685).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@777 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-09-10 19:48:47 +00:00
parent 12362a83e2
commit b15a5ac9ac
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cef3/libcef/browser/browser_host_impl.cc
View File

@@ -313,12 +313,7 @@ void CefBrowserHostImpl::SetFocus(bool enable) {
if (!enable) if (!enable)
return; return;
if (CEF_CURRENTLY_ON_UIT()) { OnSetFocus(FOCUS_SOURCE_SYSTEM);
OnSetFocus(FOCUS_SOURCE_SYSTEM);
} else {
CEF_POST_TASK(CEF_UIT,
base::Bind(&CefBrowserHostImpl::SetFocus, this, enable));
}
} }
CefWindowHandle CefBrowserHostImpl::GetWindowHandle() { CefWindowHandle CefBrowserHostImpl::GetWindowHandle() {
@@ -839,26 +834,29 @@ GURL CefBrowserHostImpl::GetLoadingURL() {
} }
void CefBrowserHostImpl::OnSetFocus(cef_focus_source_t source) { void CefBrowserHostImpl::OnSetFocus(cef_focus_source_t source) {
CEF_REQUIRE_UIT(); if (CEF_CURRENTLY_ON_UIT()) {
// SetFocus() might be called while inside the OnSetFocus() callback. If so,
// don't re-enter the callback.
if (!is_in_onsetfocus_) {
if (client_.get()) {
CefRefPtr<CefFocusHandler> handler = client_->GetFocusHandler();
if (handler.get()) {
is_in_onsetfocus_ = true;
bool handled = handler->OnSetFocus(this, source);
is_in_onsetfocus_ = false;
// SetFocus() might be called while inside the OnSetFocus() callback. If so, if (handled)
// don't re-enter the callback. return;
if (!is_in_onsetfocus_) { }
if (client_.get()) {
CefRefPtr<CefFocusHandler> handler = client_->GetFocusHandler();
if (handler.get()) {
is_in_onsetfocus_ = true;
bool handled = handler->OnSetFocus(this, source);
is_in_onsetfocus_ = false;
if (handled)
return;
} }
} }
}
if (web_contents_.get()) if (web_contents_.get())
web_contents_->Focus(); web_contents_->Focus();
} else {
CEF_POST_TASK(CEF_UIT,
base::Bind(&CefBrowserHostImpl::OnSetFocus, this, source));
}
} }
@@ -1408,7 +1406,7 @@ CefBrowserHostImpl::CefBrowserHostImpl(const CefWindowInfo& window_info,
registrar_.reset(new content::NotificationRegistrar); registrar_.reset(new content::NotificationRegistrar);
registrar_->Add(this, content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED, registrar_->Add(this, content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
content::Source<content::WebContents>(web_contents)); content::Source<content::WebContents>(web_contents));
response_manager_.reset(new CefResponseManager); response_manager_.reset(new CefResponseManager);
placeholder_frame_ = placeholder_frame_ =