2018-10-24 11:24:11 -07:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-13 16:39:26 -07:00
|
|
|
From: deepak1556 <hop2deep@gmail.com>
|
2021-04-27 14:27:34 -07:00
|
|
|
Date: Sat, 24 Apr 2021 18:07:09 -0700
|
2018-09-20 17:30:26 -07:00
|
|
|
Subject: web_contents.patch
|
|
|
|
|
2019-12-13 09:18:45 -08:00
|
|
|
This allows overriding the RenderViewHostDelegateView of a WebContents, which
|
|
|
|
is needed for OSR.
|
|
|
|
|
|
|
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
2018-09-20 17:30:26 -07:00
|
|
|
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
2025-02-28 17:29:23 -05:00
|
|
|
index 9d6ad368980202f74d36785623d27354beef3f03..9fb2ac59a8b6a4e6f1ca388cd053c8f4d5eac8ff 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
2025-02-28 17:29:23 -05:00
|
|
|
@@ -3853,6 +3853,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
2022-11-17 14:59:23 -05:00
|
|
|
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
|
|
|
base::UnguessableToken::Create());
|
2018-09-13 22:02:16 -07:00
|
|
|
|
|
|
|
+ if (params.view && params.delegate_view) {
|
|
|
|
+ view_.reset(params.view);
|
|
|
|
+ render_view_host_delegate_view_ = params.delegate_view;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!view_) {
|
2022-01-10 17:31:39 -05:00
|
|
|
+
|
2022-05-17 12:48:40 -04:00
|
|
|
std::unique_ptr<WebContentsViewDelegate> delegate =
|
2018-09-13 22:02:16 -07:00
|
|
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
|
|
|
|
2025-02-28 17:29:23 -05:00
|
|
|
@@ -3863,6 +3870,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
2022-05-17 12:48:40 -04:00
|
|
|
view_ = CreateWebContentsView(this, std::move(delegate),
|
|
|
|
&render_view_host_delegate_view_);
|
2018-09-13 22:02:16 -07:00
|
|
|
}
|
2021-02-09 12:16:21 -08:00
|
|
|
+ } // !view_
|
2018-09-13 22:02:16 -07:00
|
|
|
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
|
2025-02-28 17:29:23 -05:00
|
|
|
index 4f3914d6936cbf0119b34da82ab6d5d67bb526f7..49291ee02aa20a34cab44838121e1cff0c380508 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/content/public/browser/web_contents.h
|
|
|
|
+++ b/content/public/browser/web_contents.h
|
2025-02-06 15:30:54 -05:00
|
|
|
@@ -116,10 +116,13 @@ class BrowserPluginGuestDelegate;
|
2024-11-04 09:10:00 -05:00
|
|
|
class GuestPageHolder;
|
2018-09-13 22:02:16 -07:00
|
|
|
class RenderFrameHost;
|
|
|
|
class RenderViewHost;
|
|
|
|
+class RenderViewHostDelegateView;
|
|
|
|
class RenderWidgetHostView;
|
|
|
|
+class RenderWidgetHostViewBase;
|
2021-05-19 16:15:47 -07:00
|
|
|
class ScreenOrientationDelegate;
|
|
|
|
class SiteInstance;
|
2018-09-13 22:02:16 -07:00
|
|
|
class WebContentsDelegate;
|
|
|
|
+class WebContentsView;
|
2020-03-03 13:35:05 -08:00
|
|
|
class WebUI;
|
2018-09-13 22:02:16 -07:00
|
|
|
struct DropData;
|
2021-02-09 12:16:21 -08:00
|
|
|
struct MHTMLGenerationParams;
|
2025-02-06 15:30:54 -05:00
|
|
|
@@ -265,6 +268,10 @@ class WebContents : public PageNavigator, public base::SupportsUserData {
|
2022-01-10 17:31:39 -05:00
|
|
|
network::mojom::WebSandboxFlags starting_sandbox_flags =
|
|
|
|
network::mojom::WebSandboxFlags::kNone;
|
2018-09-13 22:02:16 -07:00
|
|
|
|
|
|
|
+ // Optionally specify the view and delegate view.
|
2023-05-11 16:07:39 -04:00
|
|
|
+ raw_ptr<content::WebContentsView> view = nullptr;
|
|
|
|
+ raw_ptr<content::RenderViewHostDelegateView> delegate_view = nullptr;
|
2018-09-13 22:02:16 -07:00
|
|
|
+
|
2020-04-13 16:39:26 -07:00
|
|
|
// Value used to set the last time the WebContents was made active, this is
|
2024-08-08 17:16:59 -05:00
|
|
|
// the value that'll be returned by GetLastActiveTimeTicks(). If this is
|
|
|
|
// left default initialized then the value is not passed on to the
|