121 lines
5.1 KiB
Diff
121 lines
5.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
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 ba990c79d5bf88077cef601d63d604b2e372bab3..709230e0ecf624c0014b3a2e61f90c25dc23ebe7 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -2142,6 +2142,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);
|
|
|
|
@@ -2157,6 +2163,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
|
&render_view_host_delegate_view_);
|
|
}
|
|
}
|
|
+ } // !view_
|
|
CHECK(render_view_host_delegate_view_);
|
|
CHECK(view_.get());
|
|
|
|
diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc
|
|
index c45581fd22b7ba28b76bdebfffdc872b820798c8..f22ac0e611cc79aa1bc7f85836d69e3a8e326a6e 100644
|
|
--- a/content/browser/web_contents/web_contents_view_guest.cc
|
|
+++ b/content/browser/web_contents/web_contents_view_guest.cc
|
|
@@ -68,19 +68,27 @@ gfx::NativeWindow WebContentsViewGuest::GetTopLevelNativeWindow() const {
|
|
|
|
void WebContentsViewGuest::OnGuestAttached(WebContentsView* parent_view) {
|
|
#if defined(USE_AURA)
|
|
+ if (!platform_view_->GetNativeView())
|
|
+ return;
|
|
// In aura, ScreenPositionClient doesn't work properly if we do
|
|
// not have the native view associated with this WebContentsViewGuest in the
|
|
// view hierarchy. We add this view as embedder's child here.
|
|
// This would go in WebContentsViewGuest::CreateView, but that is too early to
|
|
// access embedder_web_contents(). Therefore, we do it here.
|
|
- parent_view->GetNativeView()->AddChild(platform_view_->GetNativeView());
|
|
+ if (parent_view->GetNativeView() != platform_view_->GetNativeView()) {
|
|
+ parent_view->GetNativeView()->AddChild(platform_view_->GetNativeView());
|
|
+ }
|
|
#endif // defined(USE_AURA)
|
|
}
|
|
|
|
void WebContentsViewGuest::OnGuestDetached(WebContentsView* old_parent_view) {
|
|
#if defined(USE_AURA)
|
|
- old_parent_view->GetNativeView()->RemoveChild(
|
|
- platform_view_->GetNativeView());
|
|
+ if (!platform_view_->GetNativeView())
|
|
+ return;
|
|
+ if (old_parent_view->GetNativeView() != platform_view_->GetNativeView()) {
|
|
+ old_parent_view->GetNativeView()->RemoveChild(
|
|
+ platform_view_->GetNativeView());
|
|
+ }
|
|
#endif // defined(USE_AURA)
|
|
}
|
|
|
|
@@ -130,11 +138,22 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
|
|
render_widget_host->GetView());
|
|
}
|
|
|
|
+ RenderWidgetHost* embedder_render_widget_host =
|
|
+ guest_->embedder_web_contents()->GetRenderViewHost()->GetWidget();
|
|
+ RenderWidgetHostViewBase* embedder_render_widget_host_view =
|
|
+ static_cast<RenderWidgetHostViewBase*>(
|
|
+ embedder_render_widget_host->GetView());
|
|
RenderWidgetHostViewBase* platform_widget =
|
|
- platform_view_->CreateViewForWidget(render_widget_host, true);
|
|
-
|
|
- return RenderWidgetHostViewGuest::Create(render_widget_host, guest_,
|
|
- platform_widget->GetWeakPtr());
|
|
+ embedder_render_widget_host_view->CreateViewForWidget(
|
|
+ render_widget_host,
|
|
+ embedder_render_widget_host,
|
|
+ platform_view_.get());
|
|
+ RenderWidgetHostViewGuest* guest_view = RenderWidgetHostViewGuest::Create(
|
|
+ render_widget_host, guest_, platform_widget->GetWeakPtr());
|
|
+ platform_widget->InitAsGuest(embedder_render_widget_host->GetView(),
|
|
+ guest_view);
|
|
+
|
|
+ return guest_view;
|
|
}
|
|
|
|
RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForChildWidget(
|
|
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
|
index 9dd92030f9a4a0405c9d7724817a5fc3bf497da1..9bef76029aa3e71cf9ac3d2ac5a5e3a66e60c165 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;
|
|
|