From 7709915848702d5e57d2db566b0a5a484876193f Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 10 Jun 2014 21:06:24 +0000 Subject: [PATCH] Mac: Fix assertion when OSR is enabled (issue #1301) git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1737 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser/browser_host_impl_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcef/browser/browser_host_impl_mac.mm b/libcef/browser/browser_host_impl_mac.mm index 8a7f1802c..ad768aac6 100644 --- a/libcef/browser/browser_host_impl_mac.mm +++ b/libcef/browser/browser_host_impl_mac.mm @@ -432,7 +432,7 @@ void CefBrowserHostImpl::PlatformSetFocus(bool focus) { web_contents_->GetRenderWidgetHostView()) { view->SetActive(focus); - if (focus) { + if (focus && !IsWindowRenderingDisabled()) { // Give keyboard focus to the native view. NSView* view = web_contents_->GetView()->GetContentNativeView(); DCHECK([view canBecomeKeyView]);