1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Anonymous <[email protected]>
- Date: Thu, 20 Sep 2018 17:46:53 -0700
- Subject: web_contents.patch
- diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
- index 08c2fda816c1c2c983849b5172946662515ed4d9..c2a579ed267f4081f44e9f2da2cfc90ae08bf750 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -2068,6 +2068,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
- std::string unique_name;
- frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
-
- + if (params.view && params.delegate_view) {
- + view_.reset(params.view);
- + render_view_host_delegate_view_ = params.delegate_view;
- + }
- +
- + if (!view_) {
- WebContentsViewDelegate* delegate =
- GetContentClient()->browser()->GetWebContentsViewDelegate(this);
-
- @@ -2078,6 +2084,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
- view_.reset(CreateWebContentsView(this, delegate,
- &render_view_host_delegate_view_));
- }
- + } // !view_
- CHECK(render_view_host_delegate_view_);
- CHECK(view_.get());
-
- diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
- index ecee31b744ed0871a9f1052d5419075582a90baa..0ce547c74610e13f7f723da997fb0a9799c96efb 100644
- --- a/content/public/browser/web_contents.h
- +++ b/content/public/browser/web_contents.h
- @@ -79,9 +79,12 @@ class BrowserPluginGuestDelegate;
- class InterstitialPage;
- class RenderFrameHost;
- class RenderViewHost;
- +class RenderViewHostDelegateView;
- class RenderWidgetHost;
- class RenderWidgetHostView;
- +class RenderWidgetHostViewBase;
- class WebContentsDelegate;
- +class WebContentsView;
- struct CustomContextMenuContext;
- struct DropData;
- struct MHTMLGenerationParams;
- @@ -214,6 +217,10 @@ class WebContents : public PageNavigator,
- kInitializeAndWarmupRendererProcess,
- } desired_renderer_state;
-
- + // Optionally specify the view and delegate view.
- + content::WebContentsView* view = nullptr;
- + content::RenderViewHostDelegateView* delegate_view = nullptr;
- +
- // Sandboxing flags set on the new WebContents.
- blink::WebSandboxFlags starting_sandbox_flags;
-
|