![electron-roller[bot]](/assets/img/avatar_default.png) 49e62f1261
			
		
	
	
	
	
	49e62f1261* chore: bump chromium in DEPS to 95.0.4620.0 * chore: update patches * 3076261: Move args_ to private in ExtensionFunction https://chromium-review.googlesource.com/c/chromium/src/+/3076261 * [GURL -> SiteForCookies] content/public/browser/content_browser_client.h https://chromium-review.googlesource.com/c/chromium/src/+/3107759 * chore: fix -Wunreachable-code-return in node * Tracing to diagnose ContentScriptTracker-related bad message reports https://chromium-review.googlesource.com/c/chromium/src/+/3057922 * chore: bump chromium in DEPS to 95.0.4621.0 * chore: update patches * Remove title from the URL format on Windows. https://chromium-review.googlesource.com/c/chromium/src/+/3108445 * chore: bump chromium in DEPS to 95.0.4623.0 * Revert "chore: disable v8 oilpan" This reverts commit 5d255cf1d8e8efbb906047937a713279e5f800d0. (cherry picked from commit ba5cde4da2428020d99b7fb603c702878f95da78) * Change file paths in network context params to be relative. https://chromium-review.googlesource.com/c/chromium/src/+/3092927 * Code Health: Rename/replace content::WebUI::RegisterMessageCallback(). https://chromium-review.googlesource.com/c/chromium/src/+/3104691 * Migrate CanExecuteContentScriptSync to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/3108452 * chore: update patches * remove unreachable code * Revert "Revert "chore: disable v8 oilpan"" This reverts commit fef495c0294e21760df51bddb5f7bf1ec9ed5f1e. * fixup mas patch * Reland "[include] Split out v8.h" https://chromium-review.googlesource.com/c/v8/v8/+/3113629 * chore: bump chromium in DEPS to 95.0.4624.0 * chore: bump chromium in DEPS to 95.0.4625.0 * chore: bump chromium in DEPS to 95.0.4626.0 * 3033504: Pass NavigationDownloadPolicy in CreateNewWindowParams https://chromium-review.googlesource.com/c/chromium/src/+/3033504 * 3058038: Introduce TestPrintingContext & test UpdatePrintSettings https://chromium-review.googlesource.com/c/chromium/src/+/3058038 * 3114943: [Conditional Focus][#4] Add tests and remove flag gating https://chromium-review.googlesource.com/c/chromium/src/+/3114943 * chore: update patch indices * chore: bump chromium in DEPS to 95.0.4627.0 * chore: update patches * 3093591: ozone: webpagepopups: calculate anchor for menu bounds. 4/* https://chromium-review.googlesource.com/c/chromium/src/+/3093591 * 3110414: [PA] Remove the leading cookie https://chromium-review.googlesource.com/c/chromium/src/+/3110414 * chore: update patches * 3076261: Move args_ to private in ExtensionFunction https://chromium-review.googlesource.com/c/chromium/src/+/3076261 * 3113629: Reland "[include] Split out v8.h" https://chromium-review.googlesource.com/c/v8/v8/+/3113629 * chore: bump chromium in DEPS to 95.0.4628.0 * chore: update patches * chore: bump chromium in DEPS to 95.0.4629.0 * chore: update patches * Fix chrome root store codegen for cross-compile builds. https://chromium-review.googlesource.com/c/chromium/src/+/3133701 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: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
		
			
				
	
	
		
			64 lines
		
	
	
	
		
			2.7 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			64 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 b6524566b96a141ba710441ab70d17f46e5b1b9a..6a48e38254024ea721d2f10a9e88aa8ce00f8975 100644
 | |
| --- a/content/browser/web_contents/web_contents_impl.cc
 | |
| +++ b/content/browser/web_contents/web_contents_impl.cc
 | |
| @@ -2897,6 +2897,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
 | |
|    frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
 | |
|                     params.main_frame_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);
 | |
|  
 | |
| @@ -2907,6 +2913,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 ddf33e29d8f06a29a9107fee4c614d288cdbfc3b..383d0fd95d7e807b83f4cd972c107fa27fefaac6 100644
 | |
| --- a/content/public/browser/web_contents.h
 | |
| +++ b/content/public/browser/web_contents.h
 | |
| @@ -86,10 +86,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;
 | |
| @@ -222,6 +225,10 @@ class WebContents : public PageNavigator,
 | |
|      // Sandboxing flags set on the new WebContents.
 | |
|      network::mojom::WebSandboxFlags starting_sandbox_flags;
 | |
|  
 | |
| +    // Optionally specify the view and delegate view.
 | |
| +    content::WebContentsView* view = nullptr;
 | |
| +    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 GetLastActiveTime(). If this is left
 | |
|      // default initialized then the value is not passed on to the WebContents
 |