From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: deepak1556 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 7e252a7017b3f6905627b6b8cd203dc2d9baf00b..9aec4dceabb169338e800c1eacdb98fa7817b81c 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3586,6 +3586,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 delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); @@ -3596,6 +3603,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 d7403bb66b94540a0a717b7b969c9d801b10c63a..9cc338e9b446cd9c91b8e54089c42cdc73ed57db 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; @@ -259,6 +262,10 @@ class WebContents : public PageNavigator, network::mojom::WebSandboxFlags starting_sandbox_flags = network::mojom::WebSandboxFlags::kNone; + // Optionally specify the view and delegate view. + raw_ptr view = nullptr; + raw_ptr delegate_view = nullptr; + // Value used to set the last time the WebContents was made active, this is // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents