47572286f3
*6230977* chore: bump chromium to 135.0.7012.0 * chore: update accelerator.patch Support parsing Ctrl+Alt shortcuts |6238137* 6234236: Reapply bindings: Pass CppHeap on Isolate creation |6234236* 6234614: [ios blink] Move to use external begin frame source |6234614* chore: update chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch no manual changes; patch applied with fuzz * chore: update chromium/build_libc_as_static_library.patch no manual changes; patch applied with fuzz * chore: remove chromium/cherry-pick-dd8e2822e507.patch landed upstream * 6188884: Grit: Remove output_all_resource_defines from list of valid attributes. |6188884* 6226981: [views-ax] Remove View::GetAccessibleNodeData() method |6226981* 6214895: [views-ax] Deprecate View::NotifyAccessibilityEvent |6214895* 6196494: Remove ImageView::SetImage() with ImageSkia param |6196494* 6236267: [cleanup] Remove unused PrinterBasicInfo fields |6236267* refactor: remove status, isDefault properties from PrinterInfo Xref:6236267* chore: lint * fixup: added mas bypass to new file added in6208630see slack for more context * chore: node script/gen-libc++-filenames.js * chore: e patches all * fix: duplicate crdtp symbols * chore: update patches * fixup! [Media Features] Remove launched features --------- Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@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 90ac881d8e9f534c875b5eb259b06ef1db1c71d3..08024a20a7c0a227cfaffc77c70874d0a01d6029 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -3830,6 +3830,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);
|
|
|
|
@@ -3840,6 +3847,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 24afa41509becd05d331bccd2452019f90b419d8..bea85663723c7b2d54f6dce11172d9e33e144676 100644
|
|
--- a/content/public/browser/web_contents.h
|
|
+++ b/content/public/browser/web_contents.h
|
|
@@ -116,10 +116,13 @@ class BrowserPluginGuestDelegate;
|
|
class GuestPageHolder;
|
|
class RenderFrameHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHostView;
|
|
+class RenderWidgetHostViewBase;
|
|
class ScreenOrientationDelegate;
|
|
class SiteInstance;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
class WebUI;
|
|
struct DropData;
|
|
struct MHTMLGenerationParams;
|
|
@@ -265,6 +268,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
|