diff --git a/DEPS b/DEPS index ec35f4af6a339..9ce87bed1d8d6 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '112.0.5615.183', + '112.0.5615.204', 'node_version': 'v18.14.0', 'nan_version': diff --git a/patches/chromium/cherry-pick-ec53103cc72d.patch b/patches/chromium/cherry-pick-ec53103cc72d.patch index ca806935b31af..aa18acf9e03f4 100644 --- a/patches/chromium/cherry-pick-ec53103cc72d.patch +++ b/patches/chromium/cherry-pick-ec53103cc72d.patch @@ -38,7 +38,7 @@ Bot-Commit: chromium-autoroll CanCommitOriginAndUrl. Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index d979fc0def505512f6847899f4c039a96e6d83ec..aac2bf5c5bd372f8d38e0f89e0ef3ed9f057ac4d 100644 +index 74ead3b0943da72725fcf32f541665916fd10459..604b299f62ac86b7c5f85f777407fc7d7977981b 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -7074,10 +7074,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -7080,10 +7080,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { if (IsForMhtmlSubframe()) return origin_with_debug_info; diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch index 6b754ba3a5005..fa2cae3db9b29 100644 --- a/patches/v8/dcheck.patch +++ b/patches/v8/dcheck.patch @@ -6,10 +6,10 @@ Subject: dcheck.patch https://github.com/auchenberg/volkswagen diff --git a/src/api/api.cc b/src/api/api.cc -index fac24bae124fc5659c3e875bf88ede9b66be9c8d..5449ae36c6f001114f0d5bf1bba8038b483d1e50 100644 +index a8c89cafbf8fed4633d303c266c94f5e1c25acec..3827b8795e6c16c79bd87885570026444d98335d 100644 --- a/src/api/api.cc +++ b/src/api/api.cc -@@ -9728,7 +9728,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { +@@ -9739,7 +9739,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { } void Isolate::PerformMicrotaskCheckpoint() { diff --git a/shell/browser/web_view_guest_delegate.cc b/shell/browser/web_view_guest_delegate.cc index 8a474b215125c..e67c84f1b7fa4 100644 --- a/shell/browser/web_view_guest_delegate.cc +++ b/shell/browser/web_view_guest_delegate.cc @@ -124,4 +124,9 @@ WebViewGuestDelegate::CreateNewGuestWindow( return guest_contents; } +base::WeakPtr +WebViewGuestDelegate::GetGuestDelegateWeakPtr() { + return weak_ptr_factory_.GetWeakPtr(); +} + } // namespace electron diff --git a/shell/browser/web_view_guest_delegate.h b/shell/browser/web_view_guest_delegate.h index 3b8671c4e27c4..9a2123fc799af 100644 --- a/shell/browser/web_view_guest_delegate.h +++ b/shell/browser/web_view_guest_delegate.h @@ -37,6 +37,8 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate, content::WebContents* GetOwnerWebContents() final; std::unique_ptr CreateNewGuestWindow( const content::WebContents::CreateParams& create_params) final; + base::WeakPtr GetGuestDelegateWeakPtr() + final; // WebContentsZoomController::Observer: void OnZoomLevelChanged(content::WebContents* web_contents, @@ -55,6 +57,8 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate, WebContentsZoomController* embedder_zoom_controller_ = nullptr; api::WebContents* api_web_contents_ = nullptr; + + base::WeakPtrFactory weak_ptr_factory_{this}; }; } // namespace electron