Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump chromium to 112.0.5615.204 (24-x-y) #38350

Merged
merged 3 commits into from
May 18, 2023
Merged

chore: bump chromium to 112.0.5615.204 (24-x-y) #38350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f84eb0d
chore: bump chromium in DEPS to 112.0.5615.204
electron-roller[bot] May 17, 2023
1744f10
chore: update patches
patchup[bot] May 17, 2023
d41d645
refactor: add WebViewGuestDelegate::GetGuestDelegateWeakPtr()
ckerr May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/cherry-pick-ec53103cc72d.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Bot-Commit: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount
Cr-Commit-Position: refs/heads/main@{#1129520}

diff --git a/DEPS b/DEPS
index 0358ee8aa458ddc776f2d87c4a817c708b04c8ac..25499d7bed5c7a579aa4eaaca2eae53c14214486 100644
index 0184cbad2abf3d206631ed6385d5e247e6223aa8..60df78a003e67aa2a000ff25588bf4c5fae40f4a 100644
--- a/DEPS
+++ b/DEPS
@@ -299,7 +299,7 @@ vars = {
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ policy->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;

Expand Down
4 changes: 2 additions & 2 deletions patches/v8/dcheck.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
5 changes: 5 additions & 0 deletions shell/browser/web_view_guest_delegate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,9 @@ WebViewGuestDelegate::CreateNewGuestWindow(
return guest_contents;
}

base::WeakPtr<content::BrowserPluginGuestDelegate>
WebViewGuestDelegate::GetGuestDelegateWeakPtr() {
return weak_ptr_factory_.GetWeakPtr();
}

} // namespace electron
4 changes: 4 additions & 0 deletions shell/browser/web_view_guest_delegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
content::WebContents* GetOwnerWebContents() final;
std::unique_ptr<content::WebContents> CreateNewGuestWindow(
const content::WebContents::CreateParams& create_params) final;
base::WeakPtr<content::BrowserPluginGuestDelegate> GetGuestDelegateWeakPtr()
final;

// WebContentsZoomController::Observer:
void OnZoomLevelChanged(content::WebContents* web_contents,
Expand All @@ -55,6 +57,8 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
WebContentsZoomController* embedder_zoom_controller_ = nullptr;

api::WebContents* api_web_contents_ = nullptr;

base::WeakPtrFactory<WebViewGuestDelegate> weak_ptr_factory_{this};
};

} // namespace electron
Expand Down