4c3014944c
* chore: bump chromium in DEPS to 129.0.6657.0
* chore: update patches
* chore: bump chromium in DEPS to 129.0.6658.0
* chore: update patches
* 5743786: [ServiceWorker] Populate service worker start token to WorkerId.
https://chromium-review.googlesource.com/c/chromium/src/+/5743786
* 5784424: [Extensions] Move ownership of Dispatcher to ExtensionsRendererClient
https://chromium-review.googlesource.com/c/chromium/src/+/5784424
* chore: bump chromium in DEPS to 129.0.6659.0
* chore: bump chromium in DEPS to 129.0.6660.0
* chore: update patches
* chore: bump chromium in DEPS to 129.0.6662.0
* chore: bump chromium in DEPS to 129.0.6664.0
* 5789627: [Partitioned Popins] (3) `popin` feature triggers third-party storage partitioning
https://chromium-review.googlesource.com/c/chromium/src/+/5789627
* 5791367: Remove some chrome:: namespace from chrome/browser/app_mode/*
https://chromium-review.googlesource.com/c/chromium/src/+/5791367
* 5791522: [SCK] Skip redundant getShareableContentWithCompletionHandler
https://chromium-review.googlesource.com/c/chromium/src/+/5791522
* 5761330: Send refresh rate prefs b/w RefreshRateController and DisplayPrivate
https://chromium-review.googlesource.com/c/chromium/src/+/5761330
* chore: fixup patch indices
* 5793591: Remove unused GetHeader overload
https://chromium-review.googlesource.com/c/chromium/src/+/5793591
* 5787624: [Extensions] Simplify ExtensionsRendererClient::RenderThreadStarted()
https://chromium-review.googlesource.com/c/chromium/src/+/5787624
* 5721709: Fix Incorrect last_accessed_time Tracking for Tabs
https://chromium-review.googlesource.com/c/chromium/src/+/5721709
* 5789215: [Extensions] Add a //chrome/common/extensions build target
https://chromium-review.googlesource.com/c/chromium/src/+/5789215
* Roll V8 from 48f669a0758c to eee3eb91d01c
48f669a075..eee3eb91d0
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
65 lines
2.7 KiB
Diff
65 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Sat, 24 Apr 2021 18:07:09 -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 15d6c1bee20af41785f226b4495cec7a7a7a523b..f6ee9889a13febef9945fef2973bca759c713ac1 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -3636,6 +3636,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
|
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
|
base::UnguessableToken::Create());
|
|
|
|
+ if (params.view && params.delegate_view) {
|
|
+ view_.reset(params.view);
|
|
+ render_view_host_delegate_view_ = params.delegate_view;
|
|
+ }
|
|
+
|
|
+ if (!view_) {
|
|
+
|
|
std::unique_ptr<WebContentsViewDelegate> delegate =
|
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
|
|
|
@@ -3646,6 +3653,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
|
view_ = CreateWebContentsView(this, std::move(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 73715da6824efbce7823b6b43b9aaf08378f3b33..c04223ef7bbd74f1f1c7ef690a1a8e6e5b882abc 100644
|
|
--- a/content/public/browser/web_contents.h
|
|
+++ b/content/public/browser/web_contents.h
|
|
@@ -109,10 +109,13 @@ class BrowserContext;
|
|
class BrowserPluginGuestDelegate;
|
|
class RenderFrameHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHostView;
|
|
+class RenderWidgetHostViewBase;
|
|
class ScreenOrientationDelegate;
|
|
class SiteInstance;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
class WebUI;
|
|
struct DropData;
|
|
struct MHTMLGenerationParams;
|
|
@@ -258,6 +261,10 @@ class WebContents : public PageNavigator, public base::SupportsUserData {
|
|
network::mojom::WebSandboxFlags starting_sandbox_flags =
|
|
network::mojom::WebSandboxFlags::kNone;
|
|
|
|
+ // Optionally specify the view and delegate view.
|
|
+ raw_ptr<content::WebContentsView> view = nullptr;
|
|
+ raw_ptr<content::RenderViewHostDelegateView> delegate_view = nullptr;
|
|
+
|
|
// Value used to set the last time the WebContents was made active, this is
|
|
// the value that'll be returned by GetLastActiveTimeTicks(). If this is
|
|
// left default initialized then the value is not passed on to the
|