mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: bump chromium to 92.0.4498.0 (master) (#28991)

Browse source
This commit is contained in:
Electron Bot 2021-05-05 16:26:17 -07:00 committed by GitHub
parent 2086e1903c
commit 9d9921b533
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 75 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -14,7 +14,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'92.0.4496.0',
'92.0.4498.0',
'node_version':
'v14.16.1',
'nan_version':

1
patches/chromium/.patches
View file

@ -106,4 +106,3 @@ extend_apply_webpreferences.patch
fix_expose_decrementcapturercount_in_web_contents_impl.patch
add_setter_for_browsermainloop_result_code.patch
revert_roll_clang_llvmorg-13-init-7051-gdad5caa5-2.patch
cherry-pick-5d3a047a15e0.patch

29
patches/chromium/can_create_window.patch
View file

@ -9,7 +9,7 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index fdfcd32b87b02e11f68f5a1599300771e4c1c7f2..04dd31f6a392a16aacc8ec613125fb12bab16672 100644
index 80e4a073dc34ee6eeca411afb663477941b2ebca..e881cd42b45d2100749c270e5abfc12664329051 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5575,6 +5575,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@ -199,35 +199,34 @@ index c65d30c9187dd275488ed74bcc3a4eb918d2cbce..e4c6c828150e91f555b1b42e1988a101
bool opener_suppressed,
bool* no_javascript_access) override;
diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
index 18d045f5de2f93c1f8439c25770e2575429f7c66..039c48d6e0124ff6066214c41d0138f2873b213c 100644
index 888a2a26e67dae0d42353e5e906d26ea30c66cb3..7e48698a4b18d4d805667b93f79962524e090044 100644
--- a/third_party/blink/public/web/web_window_features.h
+++ b/third_party/blink/public/web/web_window_features.h
@@ -31,6 +31,8 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_WINDOW_FEATURES_H_
#define THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_WINDOW_FEATURES_H_
@@ -34,6 +34,7 @@
#include "base/optional.h"
#include "third_party/blink/public/platform/web_impression.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
+
namespace blink {
struct WebWindowFeatures {
@@ -60,6 +62,8 @@ struct WebWindowFeatures {
bool noreferrer = false;
bool background = false;
bool persistent = false;
@@ -68,6 +69,8 @@ struct WebWindowFeatures {
// Represents the attribution source declared by Attribution Reporting related
// window features, if any.
base::Optional<WebImpression> impression;
+
+ String raw_features;
};
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 3df1ac74802e927c24ae29c762a12cc3cae048fd..682b12f90fa42f877e118ecd432d2fcb460a7f3c 100644
index c02bf531f7f7c82642710c0286a366f241f13797..6a9e101c7b56c9192cddcd7d14c414ab46a406ba 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -1976,6 +1976,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
}
@@ -1991,6 +1991,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
WebWindowFeatures window_features = GetWindowFeaturesFromString(features);
WebWindowFeatures window_features =
GetWindowFeaturesFromString(features, incumbent_window);
+ window_features.raw_features = features;
FrameLoadRequest frame_request(incumbent_window,

26
patches/chromium/cherry-pick-5d3a047a15e0.patch
View file

@ -1,26 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 3 May 2021 15:40:47 -0700
Subject: conditionally import strip_binary.gni in chromedriver tests
This import is conditional elsewhere (see e.g.
https://source.chromium.org/chromium/chromium/src/+/main:chrome/BUILD.gn;l=38;drc=dfe5d22212436b797a2f0dba23fe5152f4c5e871).
This removes a dependency on the //build/linux .gni files from the macos build.
Change-Id: Ia2f2c245f7182c9f48327962d9e8d37d0e9652b4
diff --git a/chrome/test/chromedriver/BUILD.gn b/chrome/test/chromedriver/BUILD.gn
index 31237143bebba64d15c6b021760a416ec022ca00..eae6482aa679680fa078626a5709a28a7da8bff0 100644
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -4,7 +4,9 @@
import("//build/config/python.gni")
import("//build/config/ui.gni")
-import("//build/linux/strip_binary.gni")
+if (is_linux) {
+ import("//build/linux/strip_binary.gni")
+}
import("//build/util/lastchange.gni")
import("//testing/test.gni")
import("//third_party/ffmpeg/ffmpeg_options.gni")

6
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -140,7 +140,7 @@ index 33f1168f834d138aefb190b7718271d6962b3532..aeb30a22349e0682586bd1bad20dc5e2
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 217251d290d231c02f9166508c4760caf436157c..a495f8b304ff6eea3eb4486561f71fd67c545404 100644
index 6a2ea7c4fd52fe2ae00c58706eddf0929cfca0cc..7e9e5a84af0b7b75041c2a2c42f66f80c2b7d61b 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1792,12 +1792,11 @@ bool Browser::IsWebContentsCreationOverridden(
@ -362,10 +362,10 @@ index 7d27e12c4e9a7f32af8a26f672359057a643dd67..7a30ac31f79871f2a9afa0345e0e88af
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
index 9e95136de2a8a802e1753ca4a628e120f97a0b74..1af68ff77159a4c08e98440ddf9ff325f0887975 100644
index cf444f0509056dff3e9486444bf3726c58247c8e..807b4d851139b3454c8a8a365f5925ccc7def0b1 100644
--- a/fuchsia/engine/browser/frame_impl.cc
+++ b/fuchsia/engine/browser/frame_impl.cc
@@ -373,8 +373,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
@@ -374,8 +374,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,

4
patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
View file

@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index e4cfc24f6e1aaad9a99f2d68df83b8a6541ee33f..024276e3c4b5bb9c24ea75efec7a4af8baf64c8a 100644
index c2359837f08332d18ac81f81f1b4d4e0728292b8..39e37edfe9d98630595e300ae000e920cfe4236b 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6279,6 +6279,7 @@ static_library("browser") {
@@ -6282,6 +6282,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

2
patches/chromium/disable-redraw-lock.patch
View file

@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
can be found at https://github.com/electron/electron/issues/1821
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 91dd04b117e16192c450923c0833d0ba82722886..464b8bacb9009e0b4448822541b53c12e57dc2a5 100644
index 2d64e8ab2bf1748892f7f4e7a89a10fc6597401b..052d1a9c35f9e9b571cf9bc0c16ffc0847ed89cb 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -306,6 +306,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;

12
patches/chromium/disable_color_correct_rendering.patch
View file

@ -81,7 +81,7 @@ index f919df4d79a1168269c1538ac13a2a944586cf4e..fc34cf5d7dab95e7b6fc0576674b3e2b
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index 153f8fd8dd9255a3f45532be05b5eb4be296fb0f..5a07850683b7e24489cf0448c4faeb7d48e3134f 100644
index 046cd7582b11760a3d512ca8e63d495b9b5f35be..fc44552756eda92e376a31943842922ab9e21f92 100644
--- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc
@@ -87,6 +87,9 @@
@ -198,7 +198,7 @@ index 153f8fd8dd9255a3f45532be05b5eb4be296fb0f..5a07850683b7e24489cf0448c4faeb7d
gfx::ColorSpace adjusted_src_color_space = src_color_space;
if (adjust_src_white_level) {
// If the input color space is HDR, and it did not specify a white level,
@@ -4039,9 +4051,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
@@ -4040,9 +4052,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
}
@ -211,7 +211,7 @@ index 153f8fd8dd9255a3f45532be05b5eb4be296fb0f..5a07850683b7e24489cf0448c4faeb7d
*new_bounds = gfx::RectF(updated_dst_rect.origin(),
gfx::SizeF((*overlay_texture)->texture.size()));
@@ -4261,8 +4273,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
@@ -4262,8 +4274,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
PrepareGeometry(SHARED_BINDING);
@ -222,7 +222,7 @@ index 153f8fd8dd9255a3f45532be05b5eb4be296fb0f..5a07850683b7e24489cf0448c4faeb7d
gfx::Transform render_matrix;
render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
@@ -4452,3 +4464,5 @@ GLRenderer::OverlayTexture::OverlayTexture() = default;
@@ -4453,3 +4465,5 @@ GLRenderer::OverlayTexture::OverlayTexture() = default;
GLRenderer::OverlayTexture::~OverlayTexture() = default;
} // namespace viz
@ -241,7 +241,7 @@ index cbb30f8900ed07d5cccbf250f2f1e6fafb66b40e..411fabb7e8c3e2a1aceb9db0fefdc4c6
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 08fd62722a0bcb996f2dfab5329ebaecfe5c50c0..d3e89b9aa2500ce920e77637b1e1e79967d30137 100644
index 43ad6054fc9c310fb78f8e718a91d29cfcc797d8..635ac52ba7615aa2dbe0c728c274c8027e651b7c 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -211,6 +211,7 @@
@ -252,7 +252,7 @@ index 08fd62722a0bcb996f2dfab5329ebaecfe5c50c0..d3e89b9aa2500ce920e77637b1e1e799
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
#include "url/origin.h"
@@ -3191,6 +3192,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3200,6 +3201,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {

4
patches/chromium/disable_hidden.patch
View file

@ -34,10 +34,10 @@ index 81c55683ea0c08bc87487b7d0bd45160634d3aa3..bb1b37ae5cb6fce48aaa7a8e9e636a7b
// |routing_id| must not be MSG_ROUTING_NONE.
// If this object outlives |delegate|, DetachDelegate() must be called when
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index c3c9629206280dcd6b61bd1ba9342eeb30c4d2b0..e4bbc1d36e7291c5a504710ca7b8b57cb2e531c9 100644
index c3f4bf477f30bd441a42f00e90f05523f737f072..7839107b2143afd4268d1028ec2fe0dfb104b7b5 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -599,7 +599,7 @@ void RenderWidgetHostViewAura::HideImpl() {
@@ -595,7 +595,7 @@ void RenderWidgetHostViewAura::HideImpl() {
DCHECK(visibility_ == Visibility::HIDDEN ||
visibility_ == Visibility::OCCLUDED);

6
patches/chromium/enable_reset_aspect_ratio.patch
View file

@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
Make SetAspectRatio accept 0 as valid input, which would reset to null.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 4dcb1abd6a3a07e57a420804d2308e8e54c43c9d..2104bb79dde6bb05fdfc90ca7c4e759ffe9fba4e 100644
index 4c0c38e5f00a20489b4787c4d5cfaf34b0747787..d2c7ba362285307182aa647448c27846590c8c41 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -490,7 +490,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -491,7 +491,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
}
void DesktopWindowTreeHostWin::SetAspectRatio(const gfx::SizeF& aspect_ratio) {
@ -19,7 +19,7 @@ index 4dcb1abd6a3a07e57a420804d2308e8e54c43c9d..2104bb79dde6bb05fdfc90ca7c4e759f
aspect_ratio.height());
}
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 464b8bacb9009e0b4448822541b53c12e57dc2a5..ee6939b9b4d04980009ad39c9cd809b22fae2d8e 100644
index 052d1a9c35f9e9b571cf9bc0c16ffc0847ed89cb..92eb76ff7a5406ff022b5a88988ef78451c90c1c 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -927,8 +927,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {

2
patches/chromium/mas-audiodeviceduck.patch
View file

@ -6,7 +6,7 @@ Subject: mas-audiodeviceduck.patch
Removes usage of the AudioDeviceDuck private API.
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index e5fd2b351b4990e8139208b60e5b7454b9bd2fa3..ff05b24cd0f6cd7ee6b4a1de754d34a3a43a39b9 100644
index eb39b38c308ddd876e3fbc142d4fdfd5dc002cb5..137ccd81aa98f6d44969e7b7733e2cfb1fb615a9 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -34,19 +34,23 @@

2
patches/chromium/mas_disable_custom_window_frame.patch
View file

@ -95,7 +95,7 @@ index 5a23ea7558814eec59eda349bc7194afcb70d01e..c9147bbe5a225291552082434e5db342
// The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
// can only be accomplished by overriding methods.
diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
index ca3d6a6626d191bcc6253ab35e2b5094e50d11d3..a693e44156a82dad9846be60436c5ada3972d0d9 100644
index 7556af60173045c2a384656eb3f9c8972e2f85e0..868179c9cfc2a4c65944d02e789b1e42f5d355c3 100644
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
@@ -16,7 +16,9 @@

8
patches/chromium/mas_disable_remote_accessibility.patch
View file

@ -236,10 +236,10 @@ index b6d860060e4ba86d8871bd19e7011a64eb057350..040a18fa5049698429d2c51b52d32409
// Used to force the NSApplication's focused accessibility element to be the
// views::Views accessibility tree when the NSView for this is focused.
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
index 44973b5dce26d297eb5339cf9ede2ff06767a453..af92ed3311c14e54845bf743fdea7654f8b6c93d 100644
index 1de90c3bf77b2b1d69d10cd0fbe6e963f7b48861..f437109802677f1c237116eadfc2952249daf084 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -284,14 +284,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -285,14 +285,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
if (in_process_ns_window_bridge_)
return in_process_ns_window_bridge_->ns_view();
@ -262,7 +262,7 @@ index 44973b5dce26d297eb5339cf9ede2ff06767a453..af92ed3311c14e54845bf743fdea7654
}
remote_cocoa::mojom::NativeWidgetNSWindow*
@@ -1172,6 +1180,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -1173,6 +1181,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
const std::vector<uint8_t>& window_token,
const std::vector<uint8_t>& view_token) {
@ -270,7 +270,7 @@ index 44973b5dce26d297eb5339cf9ede2ff06767a453..af92ed3311c14e54845bf743fdea7654
remote_window_accessible_ =
ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
remote_view_accessible_ =
@@ -1179,14 +1188,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -1180,14 +1189,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
[remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
[remote_view_accessible_
setTopLevelUIElement:remote_window_accessible_.get()];

6
patches/chromium/mas_no_private_api.patch
View file

@ -380,10 +380,10 @@ index 4e2e99418b4023abd59e82437bd7964dbb34fbe7..53f3295695dc7d83f2785cbe78050449
- (id)accessibilityFocusedUIElement {
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index 96cceee74f1f15edf4b951ef182c63bfff313dff..57b3a1b78e9556ea52c283add53c3c169a70820c 100644
index 840b1935491804b9ac2fd6f0c8ef1aa32f31a9ae..208d4c32864a9c6142b544488951596aa2ab115b 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -480,7 +480,7 @@ void PostAnnouncementNotification(NSString* announcement) {
@@ -496,7 +496,7 @@ void PostAnnouncementNotification(NSString* announcement) {
if (native_focus_object && [native_focus_object instanceActive]) {
[user_info setObject:native_focus_object
forKey:ui::NSAccessibilityTextChangeElement];
@ -392,7 +392,7 @@ index 96cceee74f1f15edf4b951ef182c63bfff313dff..57b3a1b78e9556ea52c283add53c3c16
id selected_text = [native_focus_object selectedTextMarkerRange];
if (selected_text) {
NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
@@ -488,6 +488,7 @@ void PostAnnouncementNotification(NSString* announcement) {
@@ -504,6 +504,7 @@ void PostAnnouncementNotification(NSString* announcement) {
[user_info setObject:selected_text
forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
}

4
patches/chromium/notification_provenance.patch
View file

@ -108,10 +108,10 @@ index 71dad766e05ac4726e1e18159f2af5ea01079a91..ef8e55a4420288fe64c99e68d0a649a9
const GURL& document_url,
mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 8ed81f9cc14157827c33aab5952e2b28c0755027..458f004ce92f719795dbc91f65a6bb6f05244291 100644
index d94dbfafeb8a87434a4df8db5286527bb20cfdd6..1a01a7264f7a89c6b6f1d4e903333718adfbeb2d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2152,7 +2152,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2161,7 +2161,7 @@ void RenderProcessHostImpl::CreateNotificationService(
document_url = rfh->GetLastCommittedURL();
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(

32
patches/chromium/printing.patch
View file

@ -387,7 +387,7 @@ index 4fde003f2a12794bfcd479ef2797cc6281c5720b..bc3bc4aee26f9373de35366ddb07f7ba
// Tells the RenderFrame to switch the CSS to print media type, render every
// requested page using the print preview document's frame/node, and then
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e95317aea399 100644
index b888b7c38814cbac14ef0dc792a5372886532dcb..fec67ef8da4eaffde505b66f8317312c58f5656d 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -38,6 +38,7 @@
@ -398,17 +398,17 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
#include "printing/units.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
@@ -1172,7 +1173,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1176,7 +1177,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
if (!weak_this)
return;
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
+ false /* silent */, base::DictionaryValue() /* new_settings */);
if (!weak_this)
return;
if (weak_this)
web_frame->DispatchAfterPrintEvent();
@@ -1200,7 +1202,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
@@ -1207,7 +1209,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
receivers_.Add(this, std::move(receiver));
}
@ -417,7 +417,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
if (ipc_nesting_level_ > 1)
return;
@@ -1215,7 +1217,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
@@ -1222,7 +1224,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
// that instead.
auto plugin = delegate_->GetPdfElement(frame);
@ -426,7 +426,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
if (!render_frame_gone_)
frame->DispatchAfterPrintEvent();
@@ -1234,7 +1236,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
@@ -1252,7 +1254,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
}
Print(frame, print_preview_context_.source_node(),
@ -436,7 +436,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
if (!render_frame_gone_)
print_preview_context_.DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1282,6 +1285,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
@@ -1300,6 +1303,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
if (ipc_nesting_level_ > 1)
return;
@ -445,7 +445,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
print_preview_context_.OnPrintPreview();
if (print_preview_context_.IsForArc()) {
@@ -1817,7 +1822,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -1835,7 +1840,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
return;
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@ -455,7 +455,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
// Check if |this| is still valid.
if (!weak_this)
return;
@@ -1832,7 +1838,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -1850,7 +1856,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node,
@ -466,7 +466,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
// If still not finished with earlier print request simply ignore.
if (prep_frame_view_)
return;
@@ -1840,7 +1848,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -1858,7 +1866,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
FrameReference frame_ref(frame);
uint32_t expected_page_count = 0;
@ -475,7 +475,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
DidFinishPrinting(FAIL_PRINT_INIT);
return; // Failed to init print page settings.
}
@@ -1859,8 +1867,41 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -1877,8 +1885,41 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr();
@ -518,7 +518,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
// Check if |this| is still valid.
if (!self)
return;
@@ -2109,7 +2150,9 @@ void PrintRenderFrameHelper::IPCProcessed() {
@@ -2127,7 +2168,9 @@ void PrintRenderFrameHelper::IPCProcessed() {
}
}
@ -529,7 +529,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
mojom::PrintPagesParams settings;
settings.params = mojom::PrintParams::New();
GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
@@ -2133,12 +2176,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
@@ -2151,12 +2194,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
return result;
}
@ -548,7 +548,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
notify_browser_of_print_failure_ = false;
GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
return false;
@@ -2494,18 +2539,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
@@ -2527,18 +2572,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
}
bool PrintRenderFrameHelper::CheckForCancel() {
@ -569,7 +569,7 @@ index ddcf650704b6d5f30faa0eb19ad385cc49ed5360..50a3bc2effe67ea3bbae4a3f0070e953
bool PrintRenderFrameHelper::PreviewPageRendered(
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
index 8bd08c90b1f05483db8d7a58427a7431edef7868..26a26ceea435f0c09fae4219fd1e907f1f3fe26b 100644
index ae14b4e5da65fb3548d4369216a3c6b90c8d17a1..67962f518035b528dd3e958e6e56c764257894ae 100644
--- a/components/printing/renderer/print_render_frame_helper.h
+++ b/components/printing/renderer/print_render_frame_helper.h
@@ -231,7 +231,7 @@ class PrintRenderFrameHelper

2
patches/chromium/resource_file_conflict.patch
View file

@ -52,7 +52,7 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index d4d23acf8813ad30ed5ed5ad979207021b33eff3..564753ffe8666c2febeb8fe45baac47628224e2d 100644
index 1219a5107c61ccca0f792cf65d99848f074dcfce..2138afbbf5eeafbac8bb0e12a760dfdab8e959f2 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1504,7 +1504,7 @@ if (is_chrome_branded && !is_android) {

8
patches/chromium/revert_roll_clang_llvmorg-13-init-7051-gdad5caa5-2.patch
View file

@ -9,15 +9,17 @@ This reverts commit 6da81f26271d1efe8c3da6dd7cfb409d35763a35.
This broke WoA builds, ref: https://github.com/electron/electron/issues/28876
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 603d9d165cf43b5efb1c18501eb4c29d6f8d558b..33cd83fc835e0204a4aba0e17d2152b3021a4c35 100755
index a4ae8fa31330c92a356d8fd9e67fc49826a2b5d6..33cd83fc835e0204a4aba0e17d2152b3021a4c35 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -39,7 +39,7 @@ import zipfile
@@ -39,8 +39,8 @@ import zipfile
# https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though.
# This is the output of `git describe` and is usable as a commit-ish.
-CLANG_REVISION = 'llvmorg-13-init-7296-ga749bd76'
-CLANG_SUB_REVISION = 3
+CLANG_REVISION = 'llvmorg-13-init-7051-gdad5caa5'
CLANG_SUB_REVISION = 2
+CLANG_SUB_REVISION = 2
PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
RELEASE_VERSION = '13.0.0'

4
patches/chromium/support_mixed_sandbox_with_zygote.patch
View file

@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 458f004ce92f719795dbc91f65a6bb6f05244291..08fd62722a0bcb996f2dfab5329ebaecfe5c50c0 100644
index 1a01a7264f7a89c6b6f1d4e903333718adfbeb2d..43ad6054fc9c310fb78f8e718a91d29cfcc797d8 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -388,10 +388,18 @@ class RendererSandboxedProcessLauncherDelegate
@ -66,7 +66,7 @@ index 458f004ce92f719795dbc91f65a6bb6f05244291..08fd62722a0bcb996f2dfab5329ebaec
if (cmd_line->HasSwitch(switches::kJavaScriptFlags)) {
std::string js_flags =
cmd_line->GetSwitchValueASCII(switches::kJavaScriptFlags);
@@ -1870,9 +1886,15 @@ bool RenderProcessHostImpl::Init() {
@@ -1879,9 +1895,15 @@ bool RenderProcessHostImpl::Init() {
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
cmd_line.get());

6
patches/v8/add_realloc.patch
View file

@ -12,10 +12,10 @@ when we override ReallocateBufferMemory, so we therefore need to implement
Realloc on the v8 side.
diff --git a/include/v8.h b/include/v8.h
index b63a8aae24ca6216a67ecf3fc1337d6478805c86..29f74b2a211b0ff08dc68afecb2c98d6eedddd08 100644
index f3ed035d0dbc6e64fc555d6e2f6ad20f80ce3529..43a95bbfc2ed26cd041ee5d893aaebec3b613995 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -5364,6 +5364,13 @@ class V8_EXPORT ArrayBuffer : public Object {
@@ -5363,6 +5363,13 @@ class V8_EXPORT ArrayBuffer : public Object {
*/
virtual void* AllocateUninitialized(size_t length) = 0;
@ -30,7 +30,7 @@ index b63a8aae24ca6216a67ecf3fc1337d6478805c86..29f74b2a211b0ff08dc68afecb2c98d6
* Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|.
diff --git a/src/api/api.cc b/src/api/api.cc
index 2383682428f0144211fd3e67fc998083386fc69d..85412c681c71db79cce01a607cf8c27f19940efb 100644
index ee141364d72a9719bf32d09b3aef0945eca7d7d0..31f4086936a9cdbbc926bb95467bf119350d4368 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -324,6 +324,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

8
patches/v8/dcheck.patch
View file

@ -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 85412c681c71db79cce01a607cf8c27f19940efb..43e1815c4cbbcb1dbeae0b9fd7464619f884fd1b 100644
index 31f4086936a9cdbbc926bb95467bf119350d4368..b4772fdc015659c081061a8265b04d29b63651ff 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -8734,7 +8734,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -8735,7 +8735,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
}
void Isolate::PerformMicrotaskCheckpoint() {
@ -19,10 +19,10 @@ index 85412c681c71db79cce01a607cf8c27f19940efb..43e1815c4cbbcb1dbeae0b9fd7464619
isolate->default_microtask_queue()->PerformCheckpoint(this);
}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 46462f57264968e3d4fbbc8e07371ff96e8237e7..ad629663f7f76ac3aa4ec221310708e35cb25bd0 100644
index 6a332a26493dc1af6c4afb9c8a32f8af3d78acb5..9054ea4814bc67dd78bd174c5e2273b1cd01bff6 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -5751,9 +5751,9 @@ void Heap::DeinitSharedSpaces() {
@@ -5815,9 +5815,9 @@ void Heap::DeinitSharedSpaces() {
void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
GCType gc_type, void* data) {
DCHECK_NOT_NULL(callback);

18
shell/browser/ui/views/submenu_button.cc
View file

@ -38,27 +38,11 @@ SubmenuButton::SubmenuButton(PressedCallback callback,
SetInkDropMode(InkDropMode::ON);
SetInkDropBaseColor(
color_utils::BlendTowardMaxContrast(background_color_, 0x81));
views::InkDrop::UseInkDropForFloodFillRipple(this, false, true);
}
SubmenuButton::~SubmenuButton() = default;
std::unique_ptr<views::InkDropRipple> SubmenuButton::CreateInkDropRipple()
const {
std::unique_ptr<views::InkDropRipple> ripple(
new views::FloodFillInkDropRipple(
size(), GetInkDropCenterBasedOnLastEvent(), GetInkDropBaseColor(),
GetInkDropVisibleOpacity()));
return ripple;
}
std::unique_ptr<views::InkDrop> SubmenuButton::CreateInkDrop() {
std::unique_ptr<views::InkDropImpl> ink_drop =
views::Button::CreateDefaultInkDropImpl();
ink_drop->SetShowHighlightOnHover(false);
ink_drop->SetShowHighlightOnFocus(true);
return std::move(ink_drop);
}
void SubmenuButton::SetAcceleratorVisibility(bool visible) {
if (visible == show_underline_)
return;

4
shell/browser/ui/views/submenu_button.h
View file

@ -31,10 +31,6 @@ class SubmenuButton : public views::MenuButton {
// views::MenuButton:
void PaintButtonContents(gfx::Canvas* canvas) override;
// views::InkDropHostView:
std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
std::unique_ptr<views::InkDrop> CreateInkDrop() override;
private:
bool GetUnderlinePosition(const std::u16string& text,
char16_t* accelerator,