Index: content/browser/web_contents/web_contents_view_mac.mm |
diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm |
index c27c9927397f02c273ef4721495a1a56ad8db365..5fd3fb9ea7da2ae808acb784b236fb3ecc5d9a55 100644 |
--- a/content/browser/web_contents/web_contents_view_mac.mm |
+++ b/content/browser/web_contents/web_contents_view_mac.mm |
@@ -284,7 +284,7 @@ void WebContentsViewMac::CreateView( |
} |
RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( |
- RenderWidgetHost* render_widget_host) { |
+ RenderWidgetHost* render_widget_host, bool is_guest_view_hack) { |
if (render_widget_host->GetView()) { |
// During testing, the view will already be set up in most cases to the |
// test view, so we don't want to clobber it with a real one. To verify that |
@@ -297,8 +297,8 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( |
} |
RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac( |
- render_widget_host); |
- if (delegate()) { |
+ render_widget_host, is_guest_view_hack); |
+ if (!is_guest_view_hack && delegate()) { |
lazyboy
2014/10/16 06:14:24
I needed to add this check here to fix mac crash.
piman
2014/10/16 20:47:47
I'm no mac expert, not fully sure about everything
lazyboy
2014/10/17 00:46:00
I've done #2, check for GetView() before using it.
|
base::scoped_nsobject<NSObject<RenderWidgetHostViewMacDelegate> > |
rw_delegate( |
delegate()->CreateRenderWidgetHostViewDelegate(render_widget_host)); |
@@ -331,7 +331,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( |
RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForPopupWidget( |
RenderWidgetHost* render_widget_host) { |
- return new RenderWidgetHostViewMac(render_widget_host); |
+ return new RenderWidgetHostViewMac(render_widget_host, false); |
} |
void WebContentsViewMac::SetPageTitle(const base::string16& title) { |