From f8ab48adacb0a4864853178ee6d66c3ce506d5df Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Thu, 23 May 2019 10:39:06 -0700 Subject: [PATCH] roll patches --- patches/common/chromium/.patches | 1 - ..._proxy_calls_for_metal_10_14_methods.patch | 58 ------------------- .../chromium/allow_webview_file_url.patch | 2 +- .../common/chromium/blink_local_frame.patch | 2 +- .../common/chromium/can_create_window.patch | 4 +- .../disable_color_correct_rendering.patch | 2 +- patches/common/chromium/disable_hidden.patch | 6 +- ...requirement_for_beforeunload_dialogs.patch | 4 +- .../exclude-a-few-test-files-from-build.patch | 4 +- .../common/chromium/mas_no_private_api.patch | 30 +++++----- .../chromium/notification_provenance.patch | 4 +- .../render_widget_host_view_mac.patch | 2 +- .../support_mixed_sandbox_with_zygote.patch | 2 +- .../worker_context_will_destroy.patch | 4 +- patches/common/v8/add_realloc.patch | 6 +- patches/common/v8/build_gn.patch | 6 +- patches/common/v8/dcheck.patch | 8 +-- ...vide_more_v8_backwards_compatibility.patch | 16 ++--- ...ort_symbols_needed_for_windows_build.patch | 4 +- patches/common/v8/expose_mksnapshot.patch | 4 +- ...v8_export_private_to_arm_arm64_ports.patch | 22 +++---- ...workaround_an_undefined_symbol_error.patch | 2 +- 22 files changed, 67 insertions(+), 126 deletions(-) delete mode 100644 patches/common/chromium/add_proxy_calls_for_metal_10_14_methods.patch diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index 9498f299cb4..ba6285d533b 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -78,4 +78,3 @@ add_contentgpuclient_precreatemessageloop_callback.patch disable_custom_libcxx_on_windows.patch feat_offscreen_rendering_with_viz_compositor.patch worker_context_will_destroy.patch -add_proxy_calls_for_metal_10_14_methods.patch diff --git a/patches/common/chromium/add_proxy_calls_for_metal_10_14_methods.patch b/patches/common/chromium/add_proxy_calls_for_metal_10_14_methods.patch deleted file mode 100644 index 4b2cda3bda7..00000000000 --- a/patches/common/chromium/add_proxy_calls_for_metal_10_14_methods.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Elly Fong-Jones -Date: Wed, 22 May 2019 17:41:30 +0000 -Subject: Add proxy calls for Metal 10.14 methods - -Bug: 964476 -Change-Id: I8ae07324d58dc373e99bda157b7bece4c04c0d6f -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1623165 -Reviewed-by: Elly Fong-Jones -Commit-Queue: ccameron -Cr-Commit-Position: refs/heads/master@{#662252} - -diff --git a/components/viz/common/gpu/metal_api_proxy.mm b/components/viz/common/gpu/metal_api_proxy.mm -index 5cd5333a928b0616d6c6b5905900b8c76baa2171..1f255e164136ed3438e0fd5f7dfd2195b65a09e8 100644 ---- a/components/viz/common/gpu/metal_api_proxy.mm -+++ b/components/viz/common/gpu/metal_api_proxy.mm -@@ -32,6 +32,10 @@ -(R)fn : (A0)a0 { \ - -(R)fn : (A0)a0 a1 : (A1)a1 { \ - return [device_ fn:a0 a1:a1]; \ - } -+#define PROXY_METHOD3(R, fn, A0, a1, A1, a2, A2) \ -+ -(R)fn : (A0)a0 a1 : (A1)a1 : (A2)a2 { \ -+ return [device_ fn:a0 a1:a1 a2:a2]; \ -+ } - #define PROXY_METHOD0_SLOW(R, fn) \ - -(R)fn { \ - gl::ScopedProgressReporter scoped_reporter(progressReporter_); \ -@@ -252,5 +256,30 @@ -(R)fn : (A0)a0 a1 : (A1)a1 a2 : (A2)a2 a3 : (A3)a3 { \ - PROXY_METHOD1_SLOW(nullable id, - newArgumentEncoderWithArguments, - NSArray*) -+#if defined(MAC_OS_X_VERSION_10_14) -+PROXY_METHOD1_SLOW(nullable id, -+ newSharedTextureWithDescriptor, -+ MTLTextureDescriptor*) -+PROXY_METHOD1_SLOW(nullable id, -+ newSharedTextureWithHandle, -+ MTLSharedTextureHandle*) -+PROXY_METHOD1(NSUInteger, -+ minimumTextureBufferAlignmentForPixelFormat, -+ MTLPixelFormat) -+PROXY_METHOD0(NSUInteger, maxBufferLength) -+PROXY_METHOD0(NSUInteger, maxArgumentBufferSamplerCount) -+PROXY_METHOD3_SLOW(nullable id, -+ newIndirectCommandBufferWithDescriptor, -+ MTLIndirectCommandBufferDescriptor*, -+ maxCommandCount, -+ NSUInteger, -+ options, -+ MTLResourceOptions) -+PROXY_METHOD0(nullable id, newEvent) -+PROXY_METHOD0(nullable id, newSharedEvent) -+PROXY_METHOD1(nullable id, -+ newSharedEventWithHandle, -+ MTLSharedEventHandle*) -+#endif - #pragma clang diagnostic pop - @end diff --git a/patches/common/chromium/allow_webview_file_url.patch b/patches/common/chromium/allow_webview_file_url.patch index 56cee963049..af306972604 100644 --- a/patches/common/chromium/allow_webview_file_url.patch +++ b/patches/common/chromium/allow_webview_file_url.patch @@ -6,7 +6,7 @@ Subject: allow_webview_file_url.patch Allow webview to load non-web URLs. diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc -index 73c8f135fe2619e1588e7fcd5bc33e4ba7bfdef9..cc2409ee161bcdc7ec5d1db041517ef830dbd06f 100644 +index 934dee87c444429a65f6be2a953a104caa5c1e46..c378fb89eefc5fc9c4500919480e86967c488290 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -1475,6 +1475,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( diff --git a/patches/common/chromium/blink_local_frame.patch b/patches/common/chromium/blink_local_frame.patch index 7ad51daa54e..15ca03a6237 100644 --- a/patches/common/chromium/blink_local_frame.patch +++ b/patches/common/chromium/blink_local_frame.patch @@ -14,7 +14,7 @@ when there is code doing that. This patch reverts the change to fix the crash in Electron. diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index b5e3f6498dbbc4dafffe39eca93d0f477868001a..22bb327aa2f17c6f2807341475c010eff54317c4 100644 +index 06cf42e8199de15e2c32a59443b1daa1255d8882..4d66c30c45d87e70bce65f384a2944cf2697b1ae 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -392,10 +392,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/common/chromium/can_create_window.patch b/patches/common/chromium/can_create_window.patch index 10fe8b2af2f..d4df86287b8 100644 --- a/patches/common/chromium/can_create_window.patch +++ b/patches/common/chromium/can_create_window.patch @@ -5,10 +5,10 @@ Subject: can_create_window.patch diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index f104289d567bbe184c6f22684fef68e03ddb4f72..bd4241688a301a53b0a315b4031ddf89f0241e6d 100644 +index b552de393894d9a9b26d92693f9bcd1fdfb86aba..187615224412a349c758489d9e5e080282860983 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -3711,6 +3711,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -3710,6 +3710,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, diff --git a/patches/common/chromium/disable_color_correct_rendering.patch b/patches/common/chromium/disable_color_correct_rendering.patch index 04db8737432..0a675a05aaa 100644 --- a/patches/common/chromium/disable_color_correct_rendering.patch +++ b/patches/common/chromium/disable_color_correct_rendering.patch @@ -215,7 +215,7 @@ index f19bbb46ea6f3962f83d10fb400ae55584a17a9e..c5dff79af54a03ef888e4474e5ea5368 service_manager::switches::kGpuSandboxAllowSysVShm, service_manager::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 45c7b31e9f8b678fac72c4a1b1e7246e63253121..0fe8a88d4dae61782990b05b9fb32b7dd6f1f21d 100644 +index 982b82ef2b517bd21f05f24efc8e0d78c111d495..4a32760fc4764341d0c3a4d74b8f9fd044c891e9 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -218,6 +218,7 @@ diff --git a/patches/common/chromium/disable_hidden.patch b/patches/common/chromium/disable_hidden.patch index ce33d5ea1b2..16da58a6d8b 100644 --- a/patches/common/chromium/disable_hidden.patch +++ b/patches/common/chromium/disable_hidden.patch @@ -5,10 +5,10 @@ Subject: disable_hidden.patch diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 525bb5e2a54c60c91ec7b435eb0387393c80a4b5..165e717369f9e218ba476bbecf8f1cd2979c6426 100644 +index bd0343cbb4ba7d91f7541f94d27499b1e1a120e8..e28d6e0077455a461f270988e3c46a89e1c485b2 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -736,6 +736,9 @@ void RenderWidgetHostImpl::WasHidden() { +@@ -672,6 +672,9 @@ void RenderWidgetHostImpl::WasHidden() { if (is_hidden_) return; @@ -19,7 +19,7 @@ index 525bb5e2a54c60c91ec7b435eb0387393c80a4b5..165e717369f9e218ba476bbecf8f1cd2 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden"); diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h -index 551ee2b2199d86a200dfed22b5405e40891284d9..1a2c38dc16d4521762d0557b17e07b30b23f5b82 100644 +index 654c60e7bdecf009f2b837e38e9db50f3409978d..65fb1c070196b814edc6d94012150fa496897577 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -155,6 +155,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch b/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch index 043b3de4ef5..09180b1fa08 100644 --- a/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch +++ b/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch @@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch See https://github.com/electron/electron/issues/10754 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index b0c66785d69eb9c1bfbe583b283990e373d5f34a..0b51467333d877ceb7bccffffc963d45e45244a3 100644 +index 41f62a2100fdd0a82cebdb52561fef32bae769e2..2179904cd2b27c47c036b2ee10a36592ceac6580 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -3647,7 +3647,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, +@@ -3651,7 +3651,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, "frame that never had a user gesture since its load. " "https://www.chromestatus.com/feature/5082396709879808"; Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message); diff --git a/patches/common/chromium/exclude-a-few-test-files-from-build.patch b/patches/common/chromium/exclude-a-few-test-files-from-build.patch index 3add6cd806a..4f5684e006b 100644 --- a/patches/common/chromium/exclude-a-few-test-files-from-build.patch +++ b/patches/common/chromium/exclude-a-few-test-files-from-build.patch @@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68. Remove the patch during the Chromium 69 upgrade. diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 5a0c974d03b9106d2a41d10de236b6631444e198..8805db465774a292fd8236d345ae9e0cd1640a4f 100644 +index 99269e86e5b60e1191cc4bfef59f8fb3f8cb2f27..0c90eaaaa5b08e33ea7fce212429a4e9f7a49cf5 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1755,7 +1755,7 @@ jumbo_source_set("blink_platform_unittests_sources") { +@@ -1749,7 +1749,7 @@ jumbo_source_set("blink_platform_unittests_sources") { "graphics/paint/drawing_display_item_test.cc", "graphics/paint/drawing_recorder_test.cc", "graphics/paint/float_clip_rect_test.cc", diff --git a/patches/common/chromium/mas_no_private_api.patch b/patches/common/chromium/mas_no_private_api.patch index 4f52a059bf9..0809b9d1ef9 100644 --- a/patches/common/chromium/mas_no_private_api.patch +++ b/patches/common/chromium/mas_no_private_api.patch @@ -38,7 +38,7 @@ index 743d1364bcd13e24ecbe5ced730161d15b8c3e93..a7e81072194c00baa0aa3159a6bfe374 // is concerned. @property(nonatomic, readonly) NSString* subrole; diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm -index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef535290441598c9306a 100644 +index 237b07caa5ed7626c3b5b538cbb77f582f884203..cc4cb1ce9308ba8aecd6cc138954a1b5e04e6d29 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -141,6 +141,7 @@ @@ -85,7 +85,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1144,6 +1152,7 @@ - (NSNumber*)enabled { +@@ -1145,6 +1153,7 @@ - (NSNumber*)enabled { ax::mojom::Restriction::kDisabled]; } @@ -93,7 +93,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1154,6 +1163,7 @@ - (id)endTextMarker { +@@ -1155,6 +1164,7 @@ - (id)endTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -101,7 +101,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 - (NSNumber*)expanded { if (![self instanceActive]) -@@ -2030,6 +2040,7 @@ - (NSValue*)selectedTextRange { +@@ -2033,6 +2043,7 @@ - (NSValue*)selectedTextRange { return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -109,7 +109,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 - (id)selectedTextMarkerRange { if (![self instanceActive]) return nil; -@@ -2062,6 +2073,7 @@ - (id)selectedTextMarkerRange { +@@ -2065,6 +2076,7 @@ - (id)selectedTextMarkerRange { anchorAffinity, *focusObject, focusOffset, focusAffinity)); } @@ -117,7 +117,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 - (NSValue*)size { if (![self instanceActive]) -@@ -2094,6 +2106,7 @@ - (NSString*)sortDirection { +@@ -2097,6 +2109,7 @@ - (NSString*)sortDirection { return nil; } @@ -125,7 +125,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2104,6 +2117,7 @@ - (id)startTextMarker { +@@ -2107,6 +2120,7 @@ - (id)startTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -133,7 +133,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2404,12 +2418,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { +@@ -2407,12 +2421,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { NSMutableAttributedString* attributedValue = [[[NSMutableAttributedString alloc] initWithString:value] autorelease]; @@ -148,7 +148,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 return [attributedValue attributedSubstringFromRange:range]; } -@@ -2494,6 +2510,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2495,6 +2511,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return ToBrowserAccessibilityCocoa(cell); } @@ -156,7 +156,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) { BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); -@@ -2671,6 +2688,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2672,6 +2689,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute NSString* text = GetTextForTextMarkerRange(parameter); return [NSNumber numberWithInt:[text length]]; } @@ -164,7 +164,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -2704,6 +2722,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2705,6 +2723,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return nil; } @@ -172,7 +172,7 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -2784,6 +2803,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( +@@ -2785,6 +2804,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( return @(child->GetIndexInParent()); } @@ -233,7 +233,7 @@ index e59ac93d0e1554a2df5d8c74db2beba25d090228..6657c48664bdec4964b382f80309d1bf } // namespace diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm -index 6151c7b0ce1325402668a17d35be72fd953fcd2d..1836a0fac0cc3561151067d3482a58dc20b07559 100644 +index fcf50dc3bd9a94536d7fc457c4e7b413a83dc672..6252cb195ff77aa31295c4958fd6b80c8a0df8bd 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -36,6 +36,7 @@ @@ -252,7 +252,7 @@ index 6151c7b0ce1325402668a17d35be72fd953fcd2d..1836a0fac0cc3561151067d3482a58dc namespace { -@@ -122,8 +124,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -121,8 +123,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), @@ -263,7 +263,7 @@ index 6151c7b0ce1325402668a17d35be72fd953fcd2d..1836a0fac0cc3561151067d3482a58dc should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -321,8 +325,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -319,8 +323,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { diff --git a/patches/common/chromium/notification_provenance.patch b/patches/common/chromium/notification_provenance.patch index 5f03c7b2e57..8e21b68303f 100644 --- a/patches/common/chromium/notification_provenance.patch +++ b/patches/common/chromium/notification_provenance.patch @@ -109,10 +109,10 @@ index 3373171efb690863c70cd10bd465fc4b3dd5320c..64f2c0344eb9978e712f5c39e1f43d9b // Removes |service| from the list of owned services, for example because the diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc -index 71fbf9411d3d13ffef112b56d79443c91a1999b9..31dc4d18d453b34ab02dbca6784d9a9782e8ff2c 100644 +index c3955dd7250f0e608dc21e7b553d9b00af43286d..081d717c0bdffe04146e8cb854d0f52bfe644015 100644 --- a/content/browser/renderer_interface_binders.cc +++ b/content/browser/renderer_interface_binders.cc -@@ -220,7 +220,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { +@@ -207,7 +207,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { RenderProcessHost* host, const url::Origin& origin) { static_cast(host->GetStoragePartition()) ->GetPlatformNotificationContext() diff --git a/patches/common/chromium/render_widget_host_view_mac.patch b/patches/common/chromium/render_widget_host_view_mac.patch index 0e8e22172a2..3ddb0d8941c 100644 --- a/patches/common/chromium/render_widget_host_view_mac.patch +++ b/patches/common/chromium/render_widget_host_view_mac.patch @@ -66,7 +66,7 @@ index 8284524948c54c91e80e61c046ef7a8a7e66ba66..5e0218a0933df9440bcb86ac89373c41 return validAttributesForMarkedText_.get(); } diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm -index c6f096b1f58265b6dfe469d271e3decb96c14f14..819803a665e145565e2b71541835750983ebf8a5 100644 +index 605fe2face44403b470fb372fadb22c38b6d1068..e25d4e7abc435cf16522aa66a423f5c0b64eddb9 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -62,6 +62,7 @@ diff --git a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch index 603d5abbe2b..5da5825d816 100644 --- a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch @@ -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 af2a147ec4f62ca93b8d376bdaacbef6977eb7d6..45c7b31e9f8b678fac72c4a1b1e7246e63253121 100644 +index 763bec5cedfc44e59ccd40dcbcf7b3f9544cd56e..982b82ef2b517bd21f05f24efc8e0d78c111d495 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -418,6 +418,10 @@ class RendererSandboxedProcessLauncherDelegate diff --git a/patches/common/chromium/worker_context_will_destroy.patch b/patches/common/chromium/worker_context_will_destroy.patch index 74e7152ac7b..d99fcc14018 100644 --- a/patches/common/chromium/worker_context_will_destroy.patch +++ b/patches/common/chromium/worker_context_will_destroy.patch @@ -62,10 +62,10 @@ index f2a375b8fc9fd8ef808898ace40139f533c5dae4..083e94481c4c9f8a485984c849e5d296 const WebSecurityOrigin& script_origin) { return false; diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc -index 0da8aa29d7ddf6564d46fd1b439f040bc9491527..4c9163415298c2e766e0d64f8a2b0d9110a9032c 100644 +index 512c3335456016c6d9afebe607999cff3e9f4709..7c90cb0cd86f528895f6ffebfcde854acb7cd124 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -634,6 +634,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -637,6 +637,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { nested_runner_->QuitNow(); } diff --git a/patches/common/v8/add_realloc.patch b/patches/common/v8/add_realloc.patch index 68b7bae675d..5e08fc58f41 100644 --- a/patches/common/v8/add_realloc.patch +++ b/patches/common/v8/add_realloc.patch @@ -12,7 +12,7 @@ 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 8b23e02bf42ffdab5d8c6f36a4663ed0668531f7..742aaa1df005f28ba55b0c42a18d41e9a74a9b6a 100644 +index 29c32d5ab77db52e4e02f140ac38ef46ff7bfc41..0b517b7a469451952723e10ad834d94c2f17e3e3 100644 --- a/include/v8.h +++ b/include/v8.h @@ -4624,6 +4624,13 @@ class V8_EXPORT ArrayBuffer : public Object { @@ -30,10 +30,10 @@ index 8b23e02bf42ffdab5d8c6f36a4663ed0668531f7..742aaa1df005f28ba55b0c42a18d41e9 * 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 ca0707f96fc2563a40a038c762bd41b1dd6c4157..373a692d168fde744e41dbb4295e07d12038ff2c 100644 +index 3eb1db63bec192fd2f397f3c4951eaca896ea81c..dcd2a79adf1f1b685f7384208786a18d9f593384 100644 --- a/src/api/api.cc +++ b/src/api/api.cc -@@ -514,6 +514,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { +@@ -515,6 +515,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { i::V8::SetSnapshotBlob(snapshot_blob); } diff --git a/patches/common/v8/build_gn.patch b/patches/common/v8/build_gn.patch index 476d7cc5007..d02c4010671 100644 --- a/patches/common/v8/build_gn.patch +++ b/patches/common/v8/build_gn.patch @@ -5,10 +5,10 @@ Subject: build_gn.patch diff --git a/BUILD.gn b/BUILD.gn -index 086cb460be65f970b6a3c33d86dd1e2254251b9a..c681ae4b50e85f7a62941e6dcf90f9d59f7b83ed 100644 +index aafcdf3d178284c247f0f502f02b8dd8c1aafafd..62fb301fd3e708d093e052916da98af99ed76597 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -278,7 +278,7 @@ config("internal_config") { +@@ -273,7 +273,7 @@ config("internal_config") { ":v8_header_features", ] @@ -17,7 +17,7 @@ index 086cb460be65f970b6a3c33d86dd1e2254251b9a..c681ae4b50e85f7a62941e6dcf90f9d5 defines += [ "BUILDING_V8_SHARED" ] } } -@@ -3780,7 +3780,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -3776,7 +3776,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] diff --git a/patches/common/v8/dcheck.patch b/patches/common/v8/dcheck.patch index 8411634d4d5..fa42ed09cf9 100644 --- a/patches/common/v8/dcheck.patch +++ b/patches/common/v8/dcheck.patch @@ -5,10 +5,10 @@ Subject: dcheck.patch diff --git a/src/api/api.cc b/src/api/api.cc -index e3f930127c3133c954352100f98c5cff4a438314..e327588adc62c7f19b77e0d9cdcb4cd342ffdc13 100644 +index 56ef6b87cb7982deed05251d57b1008c54725f91..d0cc0b40be5f6219b6c6ccb8e3d9708734e7b14b 100644 --- a/src/api/api.cc +++ b/src/api/api.cc -@@ -8248,7 +8248,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { +@@ -8246,7 +8246,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { } void Isolate::RunMicrotasks() { @@ -18,10 +18,10 @@ index e3f930127c3133c954352100f98c5cff4a438314..e327588adc62c7f19b77e0d9cdcb4cd3 isolate->default_microtask_queue()->RunMicrotasks(isolate); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index 0a35533253b003f9626ace8fcbb85e9e25b51e01..a7ba98a7ded1d970b849f3295b026509077de61f 100644 +index 6ff808c76bc0905e5b42f3e9949631ff6a7fd300..07f7b61c78748614f5f8a6a3f72d7b5d20fae415 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc -@@ -4999,9 +4999,9 @@ void Heap::TearDown() { +@@ -5074,9 +5074,9 @@ void Heap::TearDown() { void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback, GCType gc_type, void* data) { DCHECK_NOT_NULL(callback); diff --git a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch index f8ebf217958..2d203e9cab3 100644 --- a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch +++ b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch @@ -22,7 +22,7 @@ Reviewed-By: Yang Guo Reviewed-By: Michaël Zasso diff --git a/include/v8.h b/include/v8.h -index 742aaa1df005f28ba55b0c42a18d41e9a74a9b6a..382a9eae997fbc399ee196d2fc58951a11675909 100644 +index 0b517b7a469451952723e10ad834d94c2f17e3e3..4d2dcde69f3e11a19df85eed015278db2f46dc95 100644 --- a/include/v8.h +++ b/include/v8.h @@ -1108,6 +1108,10 @@ class V8_EXPORT PrimitiveArray { @@ -143,7 +143,7 @@ index 742aaa1df005f28ba55b0c42a18d41e9a74a9b6a..382a9eae997fbc399ee196d2fc58951a Local ValueOf() const; -@@ -10370,6 +10411,29 @@ template Value* Value::Cast(T* value) { +@@ -10399,6 +10440,29 @@ template Value* Value::Cast(T* value) { } @@ -174,7 +174,7 @@ index 742aaa1df005f28ba55b0c42a18d41e9a74a9b6a..382a9eae997fbc399ee196d2fc58951a #ifdef V8_ENABLE_CHECKS CheckCast(value); diff --git a/src/api/api.cc b/src/api/api.cc -index 373a692d168fde744e41dbb4295e07d12038ff2c..e3f930127c3133c954352100f98c5cff4a438314 100644 +index dcd2a79adf1f1b685f7384208786a18d9f593384..56ef6b87cb7982deed05251d57b1008c54725f91 100644 --- a/src/api/api.cc +++ b/src/api/api.cc @@ -2179,6 +2179,10 @@ int PrimitiveArray::Length() const { @@ -301,7 +301,7 @@ index 373a692d168fde744e41dbb4295e07d12038ff2c..e3f930127c3133c954352100f98c5cff int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start, int length, int options) const { return WriteHelper(reinterpret_cast(isolate), this, buffer, -@@ -6142,6 +6210,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, +@@ -6140,6 +6208,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, return result; } @@ -313,8 +313,8 @@ index 373a692d168fde744e41dbb4295e07d12038ff2c..e3f930127c3133c954352100f98c5cff Local v8::String::Concat(Isolate* v8_isolate, Local left, Local right) { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -6411,6 +6484,10 @@ bool v8::BooleanObject::ValueOf() const { - return jsvalue->value()->IsTrue(isolate); +@@ -6409,6 +6482,10 @@ bool v8::BooleanObject::ValueOf() const { + return jsvalue->value().IsTrue(isolate); } +Local v8::StringObject::New(Local value) { @@ -324,7 +324,7 @@ index 373a692d168fde744e41dbb4295e07d12038ff2c..e3f930127c3133c954352100f98c5cff Local v8::StringObject::New(Isolate* v8_isolate, Local value) { i::Handle string = Utils::OpenHandle(*value); -@@ -8600,6 +8677,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) { +@@ -8598,6 +8675,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) { return microtask_queue->IsRunningMicrotasks(); } @@ -334,7 +334,7 @@ index 373a692d168fde744e41dbb4295e07d12038ff2c..e3f930127c3133c954352100f98c5cff String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) : str_(nullptr), length_(0) { if (obj.IsEmpty()) return; -@@ -8617,6 +8697,9 @@ String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) +@@ -8615,6 +8695,9 @@ String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); } diff --git a/patches/common/v8/export_symbols_needed_for_windows_build.patch b/patches/common/v8/export_symbols_needed_for_windows_build.patch index 6ee5f325b94..6bb95fef442 100644 --- a/patches/common/v8/export_symbols_needed_for_windows_build.patch +++ b/patches/common/v8/export_symbols_needed_for_windows_build.patch @@ -6,7 +6,7 @@ Subject: Export symbols needed for Windows build These symbols are required to build v8 with BUILD_V8_SHARED on Windows. diff --git a/src/objects.h b/src/objects.h -index 4f2939416890e7431452c75dc5527ae012dff34a..4b18d159a3b8624ecaf0b896a6854bd8cb255e75 100644 +index 16f5ff3d192016df9d3f8687a9978854fd916d64..5a2f0e02b2e4ab4c5ab8edd9d1dccfd7a2ad5e3a 100644 --- a/src/objects.h +++ b/src/objects.h @@ -803,7 +803,7 @@ enum class KeyCollectionMode { @@ -19,7 +19,7 @@ index 4f2939416890e7431452c75dc5527ae012dff34a..4b18d159a3b8624ecaf0b896a6854bd8 explicit inline Relocatable(Isolate* isolate); inline virtual ~Relocatable(); diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h -index 949c94f87708e64e39fb8de2131a5363d0d52b82..d20776b017fd57b9f9053b753a045c774e28496c 100644 +index 16db56818e5074e35cbb65b34219786c4cfe0d51..b14b8b44cedad707e99d175c9f63a1472ebe3c6e 100644 --- a/src/objects/ordered-hash-table.h +++ b/src/objects/ordered-hash-table.h @@ -60,7 +60,7 @@ namespace internal { diff --git a/patches/common/v8/expose_mksnapshot.patch b/patches/common/v8/expose_mksnapshot.patch index 120ab02fabf..58b404d40cc 100644 --- a/patches/common/v8/expose_mksnapshot.patch +++ b/patches/common/v8/expose_mksnapshot.patch @@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch Needed in order to target mksnapshot for mksnapshot zip. diff --git a/BUILD.gn b/BUILD.gn -index c681ae4b50e85f7a62941e6dcf90f9d59f7b83ed..72bca2c6719dd68b3a8158613d459f8f12b58626 100644 +index 62fb301fd3e708d093e052916da98af99ed76597..315c7079ed488461a456aff799b4d1f17b896150 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -3791,8 +3791,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -3787,8 +3787,6 @@ if (current_toolchain == v8_generator_toolchain) { if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { diff --git a/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch b/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch index f5eb0259fe3..6014f551869 100644 --- a/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch +++ b/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch @@ -313,7 +313,7 @@ index 54b927c3f407bfdaf69e8312360da9cd31c159d1..1da32ae6f4f0a9ee082a4e5c4e987125 template explicit CPURegList(CPURegister reg0, CPURegisters... regs) diff --git a/src/arm64/simulator-arm64.h b/src/arm64/simulator-arm64.h -index e8d06f90034c58f5fb293e3bd56171fa9ad3e20c..c11531f1ea682cb749f456eb375b261779c7890b 100644 +index 2a5e25518badddd77febee11debdfb90868f8b8b..673ff8710cabad467fc08556ab96d3737c6d3e03 100644 --- a/src/arm64/simulator-arm64.h +++ b/src/arm64/simulator-arm64.h @@ -656,11 +656,10 @@ class Simulator : public DecoderVisitor, public SimulatorBase { @@ -426,10 +426,10 @@ index db1b8de69b8d0efff6a7f72094e2298a34753b8b..a58702f0d6bb572a666c0261c84c68a5 } // namespace internal diff --git a/src/objects.cc b/src/objects.cc -index b2e8a3880f1969e426a52d4760701ae26385bca7..5bac83ff1fc1920c535cc2d53d76518fe6a521d4 100644 +index b29e37fa1cc451daafc80a53265fd02346e88220..f425ce8367e7edc050abb48fc2af9ede188ae1c8 100644 --- a/src/objects.cc +++ b/src/objects.cc -@@ -1239,7 +1239,7 @@ bool Object::ToInt32(int32_t* value) { +@@ -1238,7 +1238,7 @@ bool Object::ToInt32(int32_t* value) { // static constexpr object declarations need a definition to make the // compiler happy. constexpr Object Smi::kZero; @@ -457,7 +457,7 @@ index a23763d893bda0003016d84b8f6f8d2c21365fcb..a078d30f2d84e65b087a3bcaf88002f1 void DeoptimizeDependentCodeGroup(Isolate* isolate, DependencyGroup group); diff --git a/src/objects/shared-function-info.h b/src/objects/shared-function-info.h -index c7d583cf7e077ee2cf401c37eb44460d6ff97817..38d25fb5536caeaf3293aab023c9c33880e01cbc 100644 +index 40d40e182917e4c7b9b6afec70c4735c89d7c5bb..e06c9eb74a8c3b8bbcaab8fb0b1f29d9f981ae46 100644 --- a/src/objects/shared-function-info.h +++ b/src/objects/shared-function-info.h @@ -221,9 +221,7 @@ class InterpreterData : public Struct { @@ -472,10 +472,10 @@ index c7d583cf7e077ee2cf401c37eb44460d6ff97817..38d25fb5536caeaf3293aab023c9c338 // [name]: Returns shared name if it exists or an empty string otherwise. inline String Name() const; diff --git a/src/objects/string.cc b/src/objects/string.cc -index c5ae73b6273e8011fe4c80e34958f0b72c8862c4..8338876fba0cbef611f1e40d047d184d09e4c3dd 100644 +index 732dd38e21789c70ada0baa4d7d2bd2232dd83b7..5818701376b2754ffcef4aa4bf859c8b5145e25a 100644 --- a/src/objects/string.cc +++ b/src/objects/string.cc -@@ -1626,8 +1626,5 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) { +@@ -1624,8 +1624,5 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) { UNREACHABLE(); } @@ -520,7 +520,7 @@ index c7e9460904afe50613d811363d5d4c1281796fad..5b152501196c7aff9311f07e7262e491 public: inline SubStringRange(String string, const DisallowHeapAllocation& no_gc, diff --git a/src/regexp/jsregexp.h b/src/regexp/jsregexp.h -index 0a0b5c10d66d65054e4865d7e920c082daa93158..a44e9f95866ca93659cb3423284352e06d87b04d 100644 +index 9866caa900888273de74cfb012845748931d0fd0..4c7526a59342743f6068e5c61d24c8dad4efd43f 100644 --- a/src/regexp/jsregexp.h +++ b/src/regexp/jsregexp.h @@ -1513,8 +1513,7 @@ class RegExpEngine: public AllStatic { @@ -534,7 +534,7 @@ index 0a0b5c10d66d65054e4865d7e920c082daa93158..a44e9f95866ca93659cb3423284352e0 diff --git a/src/wasm/wasm-module.h b/src/wasm/wasm-module.h -index d31f5ff067c9b096a94705769c64586ffd546341..cce60d015af915e0984060dd2e84d6f7b46fc79a 100644 +index e1184c40b8482891352dbeaad8b49d2c29ec19e2..284e8fae87a90f7056346bc074388270af48914e 100644 --- a/src/wasm/wasm-module.h +++ b/src/wasm/wasm-module.h @@ -120,7 +120,7 @@ struct WasmElemSegment { @@ -547,12 +547,12 @@ index d31f5ff067c9b096a94705769c64586ffd546341..cce60d015af915e0984060dd2e84d6f7 uint32_t table_index; WasmInitExpr offset; diff --git a/test/cctest/parsing/test-parse-decision.cc b/test/cctest/parsing/test-parse-decision.cc -index 14b772cd4b72fb7fda13c1633b3c2371aa23485d..2146ca767a53efd3d9ae2f689918de16fd4cbea2 100644 +index 37ce657d44d09ce31506bb25fac25ae73fb6fc75..93bfb4776dee9f323b438bcce00194d75547f257 100644 --- a/test/cctest/parsing/test-parse-decision.cc +++ b/test/cctest/parsing/test-parse-decision.cc @@ -14,7 +14,6 @@ - #include "src/handles-inl.h" - #include "src/isolate.h" + #include "src/execution/isolate.h" + #include "src/handles/handles-inl.h" #include "src/objects-inl.h" -#include "src/objects/shared-function-info-inl.h" #include "src/utils.h" diff --git a/patches/common/v8/workaround_an_undefined_symbol_error.patch b/patches/common/v8/workaround_an_undefined_symbol_error.patch index 4adbbbcaa8d..40b6494e2fd 100644 --- a/patches/common/v8/workaround_an_undefined_symbol_error.patch +++ b/patches/common/v8/workaround_an_undefined_symbol_error.patch @@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file, this error no longer seems to happen. diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc -index 988259264aed79549dd2028d8565841500e401c8..b7ab517fd38426100559469dc547c7c9603bceac 100644 +index 4408a44770bcc5106bc2dd843ef4954dad7ff7df..df9683fd5e9720255ff6b83e47ec64e2f83f7722 100644 --- a/src/arm64/assembler-arm64.cc +++ b/src/arm64/assembler-arm64.cc @@ -4013,6 +4013,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,