62da00e5c5
* chore: bump chromium in DEPS to 7f366dc6e2f06228b12b021cc1486a1de81a257d * chore: bump chromium in DEPS to d785c1a601f5f33627d23e40b1ed9dd94c63d818 * update patches * Rename an old referrer policy value https://chromium-review.googlesource.com/c/chromium/src/+/2082856 * chore: bump chromium in DEPS to 735e0d2910b2e55c15e0b9cb9fca9431307ac661 * update v8 patches * Update DEPS * update patches * chore: bump chromium in DEPS to b3d09c15c4460680b85218b7b0eb0849c5a6e840 * Replace blink::WebCursorInfo with ui::Cursor https://chromium-review.googlesource.com/c/chromium/src/+/1997138 * chore: bump chromium in DEPS to bf433ad6dcfcaac460512bb45a53d5a2ea5356f9 * chore: bump chromium in DEPS to 38fad190ac908b6977ab271acc82c2fe74f6e85e * chore: bump chromium in DEPS to aa597178119cb37ab54caeda27b2ef30a2f9a003 * update patches * DownloadURLParameters: Remove NetworkIsolationKey parameter. https://chromium-review.googlesource.com/c/chromium/src/+/2050987 * fix pdf viewer tests by binding more mojo things * chore: bump chromium in DEPS to 08835601be331b4a223e6e2bd9d5ce6c37cbdec6 Co-authored-by: Jeremy Apthorp <jeremya@chromium.org> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
63 lines
2.5 KiB
Diff
63 lines
2.5 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
|
|
|
|
This allows overriding the RenderViewHostDelegateView of a WebContents, which
|
|
is needed for OSR.
|
|
|
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
|
index 84587a78262128fb03bad83e8b51cba2755eab6c..611ba2b46eaf4f3d9b69c3c1eeb7824a3a9ece48 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -2100,6 +2100,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);
|
|
|
|
@@ -2110,6 +2116,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 65d6373115587dea79ef33b28ec898e9142f08ea..b28d70d9288fa94a55c4d460c68df1a38a2dfbff 100644
|
|
--- a/content/public/browser/web_contents.h
|
|
+++ b/content/public/browser/web_contents.h
|
|
@@ -78,9 +78,12 @@ class BrowserPluginGuestDelegate;
|
|
class InterstitialPage;
|
|
class RenderFrameHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHost;
|
|
class RenderWidgetHostView;
|
|
+class RenderWidgetHostViewBase;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
class WebUI;
|
|
struct CustomContextMenuContext;
|
|
struct DropData;
|
|
@@ -213,6 +216,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::mojom::WebSandboxFlags starting_sandbox_flags;
|
|
|