From a9ab4c5039b15bfa29c3a0b436ba3828cf82ab76 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 4 Feb 2019 11:19:22 +0530 Subject: [PATCH] chore: roll 73.0.3683.10 --- DEPS | 2 +- patches/common/boringssl/expose_aes-cfb.patch | 2 +- .../chromium/allow_webview_file_url.patch | 4 +- .../common/chromium/blink_local_frame.patch | 2 +- .../common/chromium/boringssl_build_gn.patch | 2 +- .../common/chromium/can_create_window.patch | 12 +++--- .../common/chromium/command-ismediakey.patch | 12 +++--- .../common/chromium/compositor_delegate.patch | 4 +- .../chromium/content_browser_main_loop.patch | 4 +- ...cross_site_document_resource_handler.patch | 8 ++-- patches/common/chromium/dcheck.patch | 10 ++--- .../disable_color_correct_rendering.patch | 12 +++--- .../disable_detach_webview_frame.patch | 2 +- patches/common/chromium/disable_hidden.patch | 4 +- ...requirement_for_beforeunload_dialogs.patch | 4 +- .../exclude-a-few-test-files-from-build.patch | 2 +- .../common/chromium/frame_host_manager.patch | 4 +- patches/common/chromium/mas-cfisobjc.patch | 6 +-- .../common/chromium/mas_no_private_api.patch | 2 +- .../chromium/out_of_process_instance.patch | 4 +- patches/common/chromium/printing.patch | 40 +++++++++---------- .../render_widget_host_view_mac.patch | 6 +-- .../support_mixed_sandbox_with_zygote.patch | 2 +- patches/common/chromium/web_contents.patch | 2 +- .../common/chromium/webview_cross_drag.patch | 6 +-- patches/common/v8/add_realloc.patch | 6 +-- patches/common/v8/array_buffer.patch | 6 +-- ...ild-torque-with-x64-toolchain-on-arm.patch | 6 +-- patches/common/v8/build_gn.patch | 4 +- patches/common/v8/dcheck.patch | 8 ++-- ..._detailed_line_info_for_cpu_profiler.patch | 4 +- ...vide_more_v8_backwards_compatibility.patch | 30 +++++++------- ...ot_run_arm_arm64_mksnapshot_binaries.patch | 4 +- patches/common/v8/expose_mksnapshot.patch | 4 +- 34 files changed, 115 insertions(+), 115 deletions(-) diff --git a/DEPS b/DEPS index 7a65671e9dfa..c4cf797288af 100644 --- a/DEPS +++ b/DEPS @@ -10,7 +10,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '73.0.3679.0', + '73.0.3683.10', 'node_version': 'fac6d766c143db8db05bb3b0c0871df8f032363c', diff --git a/patches/common/boringssl/expose_aes-cfb.patch b/patches/common/boringssl/expose_aes-cfb.patch index 880550a64624..d5ee8d44de4e 100644 --- a/patches/common/boringssl/expose_aes-cfb.patch +++ b/patches/common/boringssl/expose_aes-cfb.patch @@ -71,7 +71,7 @@ index acc4719b7e9c4c4461fc6142f2ae9156b407915b..8b008a401ec2f2d0673f6876609dd578 callback(EVP_aes_256_ecb(), "aes-256-ecb", NULL, arg); callback(EVP_aes_256_ofb(), "aes-256-ofb", NULL, arg); diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h -index 59634138cb60237f008eb99e7d8df54da7629c1a..b30b8434b301fb5b8630ae954698b6fee255df77 100644 +index e9545c82ca7e663ae25d9e85d29acea2be54d38f..4902859cdb96012eae7956d9fc3b1dcd47a71c07 100644 --- a/include/openssl/cipher.h +++ b/include/openssl/cipher.h @@ -421,6 +421,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_ofb(void); diff --git a/patches/common/chromium/allow_webview_file_url.patch b/patches/common/chromium/allow_webview_file_url.patch index e0f8b83ef89d..354ecd32c42a 100644 --- a/patches/common/chromium/allow_webview_file_url.patch +++ b/patches/common/chromium/allow_webview_file_url.patch @@ -6,10 +6,10 @@ 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 8a67808f690a2baf526f39095dd5e1122319ee91..1ab079b1fe97c506dca39b5b175f045394abae62 100644 +index a206be71b8d9f28d659000cd2ea72cdb8f876e07..f4ad084900723a5c0cf78affae7744d8039a8395 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc -@@ -1449,6 +1449,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( +@@ -1447,6 +1447,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( !policy->IsWebSafeScheme(info.common_params.url.scheme()) && !is_external_protocol; diff --git a/patches/common/chromium/blink_local_frame.patch b/patches/common/chromium/blink_local_frame.patch index 830f8dbad28b..15f28df8b16d 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 e07ace500ef1dd60ce9833e7324e238de1018ae6..950c5ff5b14129ab2ca4b8c929ff583b5523b04b 100644 +index 9c8ffb99f78ef29df08e139551af984dc23e9de2..8196880b6da930557d22f4c29a6de35c1aa7a763 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -403,10 +403,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/common/chromium/boringssl_build_gn.patch b/patches/common/chromium/boringssl_build_gn.patch index a73248d1bb15..b36157a1c225 100644 --- a/patches/common/chromium/boringssl_build_gn.patch +++ b/patches/common/chromium/boringssl_build_gn.patch @@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn Build BoringSSL with some extra functions that nodejs needs. diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn -index 6e4fc85f124ed6dd4a7ac1812686fa59c4e50cdf..fd45cfcb50fb659ff8d5a07b06aeecc8f0ecd3ee 100644 +index 8d460717d4c5d2ee56a10689f3d4cead9740ae36..fe8753c128759b9b0421238cabf89a990e600735 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -45,6 +45,19 @@ config("no_asm_config") { diff --git a/patches/common/chromium/can_create_window.patch b/patches/common/chromium/can_create_window.patch index 22b8d817b1cf..c7914f142ab7 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 1a023385a3d27d9145f2a0a069ff6799c69ec66a..8289c09b9e3d30ae171942a987fbc1dca83f58d9 100644 +index a6c9e15b29af4ede177593db58a189153a392515..23ecf8e1a679676ef11ad82616bc68f845be1643 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -3697,6 +3697,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -3723,6 +3723,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -32,7 +32,7 @@ index e566a15b798e2586fa4fae3c4db97ce5f4f2f09f..08f52fd73bc9b6231a75f7804bb9b9f3 // Operation result when the renderer asks the browser to create a new window. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index bce9b68c989da1e287b7e593e1ae281923d1a557..e2f2b8e8d09d1f14b58eb8b093042b89141cdd35 100644 +index abc9829f296f26c2217066f68927861d032d9868..f43321b9f7513a1e51367bbd38006e7e2f930923 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -494,6 +494,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -45,7 +45,7 @@ index bce9b68c989da1e287b7e593e1ae281923d1a557..e2f2b8e8d09d1f14b58eb8b093042b89 bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 92425b0bded161d513a3e39b8f9631d4c98c143c..5dc21230970fe23a25ad6e811d65c434760d1d1b 100644 +index 694796bf8dbba514ae9f09e51186e53be14ae50e..73ea7c49ee5993536902f21a51c8cd3bbe30e3f2 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -171,6 +171,7 @@ class RenderFrameHost; @@ -66,7 +66,7 @@ index 92425b0bded161d513a3e39b8f9631d4c98c143c..5dc21230970fe23a25ad6e811d65c434 bool opener_suppressed, bool* no_javascript_access); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc -index ad23a9040c21a674c1b011e7120d4288a722f2bb..ffe7e5d4b2359d8490c514b8abee91c885ac973b 100644 +index 77b93bd04c8b7887f9fc5e9dc7d5f42c034e3bfa..468e9ed1d7c24b7b3a1e4e37239c42b75be4e7a9 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -76,6 +76,7 @@ @@ -77,7 +77,7 @@ index ad23a9040c21a674c1b011e7120d4288a722f2bb..ffe7e5d4b2359d8490c514b8abee91c8 #include "content/renderer/media/audio/audio_device_factory.h" #include "content/renderer/media/stream/media_stream_device_observer.h" #include "content/renderer/media/video_capture_impl_manager.h" -@@ -1345,6 +1346,8 @@ WebView* RenderViewImpl::CreateView( +@@ -1343,6 +1344,8 @@ WebView* RenderViewImpl::CreateView( } params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features); diff --git a/patches/common/chromium/command-ismediakey.patch b/patches/common/chromium/command-ismediakey.patch index dae5cfef6968..afc6abbdb13d 100644 --- a/patches/common/chromium/command-ismediakey.patch +++ b/patches/common/chromium/command-ismediakey.patch @@ -15,10 +15,10 @@ and electron/electron@d2368d2d3b3de9eec4cc32b6aaf035cc89921bf1 as patches. diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/browser/extensions/global_shortcut_listener_mac.mm -index 5ab71f9a7632f0211f2efd7be2298203f32fa83d..e99f55c82e1d59e919fbab65b9cbe833dfa79771 100644 +index befe726af9c10b1563a7fc0bb77cc55f65943d5c..46c6fe08bab8471007f78d3ef227e5195bfdf0e1 100644 --- a/chrome/browser/extensions/global_shortcut_listener_mac.mm +++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm -@@ -20,6 +20,26 @@ +@@ -21,6 +21,26 @@ namespace extensions { @@ -46,10 +46,10 @@ index 5ab71f9a7632f0211f2efd7be2298203f32fa83d..e99f55c82e1d59e919fbab65b9cbe833 GlobalShortcutListener* GlobalShortcutListener::GetInstance() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc -index e5cfd70cc2effcbfd75e60357a44ce467e35fbc9..41d3ebd0628b4a8b5966b2b573d5feac4a19dc82 100644 +index eb58c51eb768bb013e293649e0308786c5482e21..e469e5115fce12fe5d382bd75d9c6f41fa24293e 100644 --- a/chrome/browser/extensions/global_shortcut_listener_win.cc +++ b/chrome/browser/extensions/global_shortcut_listener_win.cc -@@ -60,6 +60,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd, +@@ -62,6 +62,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd, modifiers |= (LOWORD(lparam) & MOD_SHIFT) ? ui::EF_SHIFT_DOWN : 0; modifiers |= (LOWORD(lparam) & MOD_ALT) ? ui::EF_ALT_DOWN : 0; modifiers |= (LOWORD(lparam) & MOD_CONTROL) ? ui::EF_CONTROL_DOWN : 0; @@ -80,7 +80,7 @@ index 392cf3d58c64c088596e8d321a2ce37b0ec60b6e..43e30f47240dc10a3a9b950255d4e487 ui::Accelerator accelerator( ui::KeyboardCodeFromXKeyEvent(x_event), modifiers); diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm -index 2320015f9d38f3313bee1de6872910e27cd259d1..33f2ac9c021b69fe17c1857b6dfaa9808e90136b 100644 +index b48fa8e63867021bdd77bf585a0e02c366980d91..bae9e24e7bcf7615be243bcb5629cc5981a31b06 100644 --- a/ui/base/accelerators/media_keys_listener_mac.mm +++ b/ui/base/accelerators/media_keys_listener_mac.mm @@ -31,6 +31,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) { @@ -96,7 +96,7 @@ index 2320015f9d38f3313bee1de6872910e27cd259d1..33f2ac9c021b69fe17c1857b6dfaa980 } return VKEY_UNKNOWN; } -@@ -189,7 +195,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy, +@@ -190,7 +196,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy, int key_code = (data1 & 0xFFFF0000) >> 16; if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT && key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST && diff --git a/patches/common/chromium/compositor_delegate.patch b/patches/common/chromium/compositor_delegate.patch index b4a22fd789eb..3219b6905042 100644 --- a/patches/common/chromium/compositor_delegate.patch +++ b/patches/common/chromium/compositor_delegate.patch @@ -32,7 +32,7 @@ index 5aeda7bd9caf6b5b9e2a95293e4409dc7f9a6d2d..d15e1462babe97b5d68014f4d6723665 } else { DCHECK(context_provider); diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h -index a445b569ede1cd9331003e21b0427971d98ef924..087802fc0d47276c1449b4d9153756f6beb39bad 100644 +index 313431f82ee7e181dad2c48dd27950129afbb223..b8c2632e49b7b96adbb06a03678961823f0790f6 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -25,6 +25,7 @@ @@ -69,7 +69,7 @@ index a445b569ede1cd9331003e21b0427971d98ef924..087802fc0d47276c1449b4d9153756f6 // Sets the root of the layer tree drawn by this Compositor. The root layer // must have no parent. The compositor's root layer is reset if the root layer // is destroyed. NULL can be passed to reset the root layer, in which case the -@@ -440,6 +453,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, +@@ -442,6 +455,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, ui::ContextFactory* context_factory_; ui::ContextFactoryPrivate* context_factory_private_; diff --git a/patches/common/chromium/content_browser_main_loop.patch b/patches/common/chromium/content_browser_main_loop.patch index 442ace6273cf..9a4b09910516 100644 --- a/patches/common/chromium/content_browser_main_loop.patch +++ b/patches/common/chromium/content_browser_main_loop.patch @@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously in atom::CommonWebContentsDelegate::ResetManageWebContents. diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc -index a69d86afff84745e1b0cd85ae6eec48f10127ab5..0782f0e890ee86c4f051e3102e3d20bee8276479 100644 +index 81d99cb7f9e200e2b8b487eae9292cc61adcbccc..9948a2621ade7b227cbed7d82e885a63197a2ed4 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc -@@ -1543,7 +1543,7 @@ void BrowserMainLoop::MainMessageLoopRun() { +@@ -1550,7 +1550,7 @@ void BrowserMainLoop::MainMessageLoopRun() { } base::RunLoop run_loop; diff --git a/patches/common/chromium/cross_site_document_resource_handler.patch b/patches/common/chromium/cross_site_document_resource_handler.patch index 3c85d5304fd8..5838d6569bae 100644 --- a/patches/common/chromium/cross_site_document_resource_handler.patch +++ b/patches/common/chromium/cross_site_document_resource_handler.patch @@ -8,10 +8,10 @@ this patch can be removed once we switch to network service, where the embedders have a chance to design their URLLoaders. diff --git a/content/browser/loader/cross_site_document_resource_handler.cc b/content/browser/loader/cross_site_document_resource_handler.cc -index 7d5a3367774f558583ea69e60c46ab8636a19a81..190565b067ef869a332b77322dc62403c36c1a00 100644 +index bd62ed07876ad4a2a7c6e8309843281719dbefb6..13e67994997caf175ba1b30ba8070718a697588d 100644 --- a/content/browser/loader/cross_site_document_resource_handler.cc +++ b/content/browser/loader/cross_site_document_resource_handler.cc -@@ -631,6 +631,9 @@ bool CrossSiteDocumentResourceHandler::ShouldBlockBasedOnHeaders( +@@ -673,6 +673,9 @@ bool CrossSiteDocumentResourceHandler::ShouldBlockBasedOnHeaders( return false; } @@ -22,7 +22,7 @@ index 7d5a3367774f558583ea69e60c46ab8636a19a81..190565b067ef869a332b77322dc62403 } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 84b324992f22a65030b8badc05f6ce542929dea6..5703236f5ea937ebe3111fe79cf30f9ffb172a04 100644 +index 2d1eb5e9f7c9494920e626a1c89cb3417627d12d..d10724466f8802d434b868da769379f49fe115bc 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -58,6 +58,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should @@ -37,7 +37,7 @@ index 84b324992f22a65030b8badc05f6ce542929dea6..5703236f5ea937ebe3111fe79cf30f9f const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 031332e91cf38cb3d69cd73778a9e4a0701f7645..108c1e2f57b4fd86bbf819452da37da3cc96e5bb 100644 +index de03cae23d8c9e93181562f9d09f215ce8eddc2f..cc29e2795477e3ace7c57a04502c8c3dc7b04fb4 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -237,6 +237,9 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/common/chromium/dcheck.patch b/patches/common/chromium/dcheck.patch index c854b6278dcc..a8b6b2686a09 100644 --- a/patches/common/chromium/dcheck.patch +++ b/patches/common/chromium/dcheck.patch @@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index 63f520bae169ecdcc311bf038b962b1ff3e30126..734e51af5ecbf5faa210255a1fae3efda5293ac8 100644 +index 5249401e58a57f0278665f2c6648c7e6e8e1bf77..518b1279714888121095af9bdb077f3622c1255d 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc -@@ -1153,8 +1153,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( +@@ -1170,8 +1170,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( return NAVIGATION_TYPE_NEW_SUBFRAME; } @@ -33,7 +33,7 @@ index 63f520bae169ecdcc311bf038b962b1ff3e30126..734e51af5ecbf5faa210255a1fae3efd if (rfh->GetParent()) { // All manual subframes would be did_create_new_entry and handled above, so -@@ -1395,7 +1397,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( +@@ -1412,7 +1414,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon(); } @@ -46,10 +46,10 @@ index 63f520bae169ecdcc311bf038b962b1ff3e30126..734e51af5ecbf5faa210255a1fae3efd // navigation. Now we know that the renderer has updated its state accordingly // and it is safe to also clear the browser side history. diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc -index 1857bfa07ce3d8656105e696363a760889794e77..c25d8c241907fb166218670533a3b6e1e2f32769 100644 +index 49654c95675e0240d82232eb971f85ab3611ab29..8f0737841f70144770dc4dfd7353f7bdba3ffcfd 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc -@@ -913,9 +913,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap, +@@ -726,9 +726,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap, } void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) { diff --git a/patches/common/chromium/disable_color_correct_rendering.patch b/patches/common/chromium/disable_color_correct_rendering.patch index da9cb0d15797..fb1ae31e9f44 100644 --- a/patches/common/chromium/disable_color_correct_rendering.patch +++ b/patches/common/chromium/disable_color_correct_rendering.patch @@ -19,7 +19,7 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index bc110bfd003e41b1b170c4d8cd404ab0a88240e3..8979c777978216b6e0f7f89f19200afc57f08012 100644 +index 6a44080f30936c8383f575c8c65c5582d9ed7fc3..b4394286e0a54357973d23ed94731ae7e830b2a8 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -1569,6 +1569,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( @@ -218,10 +218,10 @@ index 6ee04d0919d9b4ae5e2d6719f1417f00a3d600fa..62c0b5da24e02102b268429b1d8e3654 + +#undef PATCH_CS diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc -index 54e1614d979ef2afa5e23404541cfc2d1227e17d..97190566b60140cbdac43a5c57deb03e1fc48982 100644 +index 5a757c437d36f98d6d813ef2af81b46434cdc5de..86ed034d207fe5cdf6810de085cc34ea8981169c 100644 --- a/components/viz/service/display/skia_renderer.cc +++ b/components/viz/service/display/skia_renderer.cc -@@ -707,9 +707,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad, +@@ -708,9 +708,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad, std::unique_ptr color_transform_canvas; // TODO(enne): color transform needs to be replicated in gles2_cmd_decoder @@ -268,7 +268,7 @@ index 4aa391a6bfe2408b84da4ffe5b3dc27a0544d0ca..649efb7ed16e6f4850010c8b9df5d0b7 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 ecbfc65e474409a0d073362d6734047b098d2c7f..2aa5ba9d51adda083a5eeac2c200b2ffba106b21 100644 +index 5759d527ecc355a88cb8632a2cebdf2e76ab3940..2c9d59feb24caf009dfd909f19334486ab87177d 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -221,6 +221,7 @@ @@ -288,10 +288,10 @@ index ecbfc65e474409a0d073362d6734047b098d2c7f..2aa5ba9d51adda083a5eeac2c200b2ff network::switches::kExplicitlyAllowedPorts, service_manager::switches::kDisableInProcessStackTraces, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index 6d5833dc1bef727aba4c012563c3e161a9dab9ae..3215ab16ad51e7d519baa1e82fd0a9c489b8e31a 100644 +index 3eb59602364dc178fc783867c5dff036c8be70d3..4f4f4c08bf62752df1a47d5e8c91452365b8ea5b 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -2641,6 +2641,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( +@@ -2658,6 +2658,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); diff --git a/patches/common/chromium/disable_detach_webview_frame.patch b/patches/common/chromium/disable_detach_webview_frame.patch index 9178ee7f9828..750b3c45edf9 100644 --- a/patches/common/chromium/disable_detach_webview_frame.patch +++ b/patches/common/chromium/disable_detach_webview_frame.patch @@ -12,7 +12,7 @@ this patch was introduced in Chrome 66. Update(zcbenz): The bug is still in Chrome 72. diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc -index 656498fdbad93c8fcc758e08653f5417e7406345..476db3bdc90a6bf014e0a2ab4f2b47651ef8e1cc 100644 +index f075640df52ca30b29b03eed1ac5ffdbba995957..09877293148fa486c4b48cbd8d6554f92a330ddc 100644 --- a/content/browser/frame_host/render_frame_proxy_host.cc +++ b/content/browser/frame_host/render_frame_proxy_host.cc @@ -263,6 +263,12 @@ void RenderFrameProxyHost::SetDestructionCallback( diff --git a/patches/common/chromium/disable_hidden.patch b/patches/common/chromium/disable_hidden.patch index e4b0bb93786e..47e355ace3f7 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 801517c670e4cfb5adcfa0a14d2626c2be90e833..e63f00a1c4013f1e07f3b1adcdb34ea24eac3916 100644 +index 316e7cf9819c0ffe3a15a55e6bcada781d6d7832..d90f50ed29740b14e6259c4d6d14434222ddbfb4 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -763,6 +763,9 @@ void RenderWidgetHostImpl::WasHidden() { +@@ -760,6 +760,9 @@ void RenderWidgetHostImpl::WasHidden() { if (is_hidden_) return; 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 4110fae10ff5..ef542f66713d 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 09418dad61316ad4534e8f9c71cc153ffc5e0ffd..20e90ed973b0de71c07cbcd21578d7eee8cab06e 100644 +index 21ef6fd598dfedb5d443fc7162d08af19c137bf1..b3d157158db866aaa8f5132d71453ced61553577 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -3675,7 +3675,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, +@@ -3665,7 +3665,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 17862e37d7d6..d7476dc9d989 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,7 +7,7 @@ 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 145086ca57c6b72512c01e612087d4e994991bcb..2ccb86380fa944a783e8f7c131ebe71db7022f2d 100644 +index 1277dd8a03d1a5931b751781f219b617542be500..09809f43489711b117b0751f322d081b7ea1c3c8 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn @@ -1741,7 +1741,7 @@ jumbo_source_set("blink_platform_unittests_sources") { diff --git a/patches/common/chromium/frame_host_manager.patch b/patches/common/chromium/frame_host_manager.patch index 3b4ad54443b4..87a979ffbb27 100644 --- a/patches/common/chromium/frame_host_manager.patch +++ b/patches/common/chromium/frame_host_manager.patch @@ -108,7 +108,7 @@ index 53586512b68f79ebf9addf0d344a5a0785d89877..1417ce14d9e976da08c8924e32d2cb8e } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index e2f2b8e8d09d1f14b58eb8b093042b89141cdd35..84b324992f22a65030b8badc05f6ce542929dea6 100644 +index f43321b9f7513a1e51367bbd38006e7e2f930923..2d1eb5e9f7c9494920e626a1c89cb3417627d12d 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -48,6 +48,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info, @@ -129,7 +129,7 @@ index e2f2b8e8d09d1f14b58eb8b093042b89141cdd35..84b324992f22a65030b8badc05f6ce54 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 5dc21230970fe23a25ad6e811d65c434760d1d1b..031332e91cf38cb3d69cd73778a9e4a0701f7645 100644 +index 73ea7c49ee5993536902f21a51c8cd3bbe30e3f2..de03cae23d8c9e93181562f9d09f215ce8eddc2f 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -206,8 +206,37 @@ CONTENT_EXPORT void OverrideOnBindInterface( diff --git a/patches/common/chromium/mas-cfisobjc.patch b/patches/common/chromium/mas-cfisobjc.patch index 7757b2f9b688..b2f9271fddeb 100644 --- a/patches/common/chromium/mas-cfisobjc.patch +++ b/patches/common/chromium/mas-cfisobjc.patch @@ -6,7 +6,7 @@ Subject: mas-cfisobjc.patch Removes usage of the _CFIsObjC private API. diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm -index 38954c89527012ec72503240b0197bc24110d3ad..aebb6ec5815220f47a79dac59443e3b4bf3f0416 100644 +index 5046eedeb4391903e661c93d855035069c0d8e90..e96337ed71ce64d4172878d682cdea79f80f03ae 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm @@ -26,7 +26,6 @@ @@ -17,7 +17,7 @@ index 38954c89527012ec72503240b0197bc24110d3ad..aebb6ec5815220f47a79dac59443e3b4 #endif } // extern "C" -@@ -325,8 +324,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) { +@@ -326,8 +325,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) { const_cast(reinterpret_cast(cf_val)); DCHECK(!cf_val || CTFontGetTypeID() == CFGetTypeID(cf_val) || @@ -27,7 +27,7 @@ index 38954c89527012ec72503240b0197bc24110d3ad..aebb6ec5815220f47a79dac59443e3b4 return ns_val; } -@@ -394,9 +392,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) { +@@ -395,9 +393,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) { return (CTFontRef)(cf_val); } diff --git a/patches/common/chromium/mas_no_private_api.patch b/patches/common/chromium/mas_no_private_api.patch index 316757d4cf6e..9e0fecdb982e 100644 --- a/patches/common/chromium/mas_no_private_api.patch +++ b/patches/common/chromium/mas_no_private_api.patch @@ -38,7 +38,7 @@ index d38fa48b8b890d90f2911995a2a51c249005c827..5fe68c71fe101a307ef565013a91b109 // 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 9e5070bd034c16905ec29c7aba6471b41b5f16f4..9bf52f660b61c1a42c051d610318f6f2443ae91f 100644 +index d1e716429cd96588c2df06d7c55ed6053d190f64..e1f41179b1cb3f9c68900ad0f0b0dbad6e989746 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -135,6 +135,7 @@ diff --git a/patches/common/chromium/out_of_process_instance.patch b/patches/common/chromium/out_of_process_instance.patch index ebb6d09e5301..78da4ba0464b 100644 --- a/patches/common/chromium/out_of_process_instance.patch +++ b/patches/common/chromium/out_of_process_instance.patch @@ -5,10 +5,10 @@ Subject: out_of_process_instance.patch diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc -index aa9db1908a00e89a88d2ea27b0e05184ac3e5aeb..86c299624bcd83847a4b651c1f0d53f7f6df1cd5 100644 +index 7ef9271e59d7e6841150975f8b74b3565a6aaae5..23502ff1f08b7332eb32121f52f040520241b084 100644 --- a/pdf/out_of_process_instance.cc +++ b/pdf/out_of_process_instance.cc -@@ -461,7 +461,9 @@ bool OutOfProcessInstance::Init(uint32_t argc, +@@ -462,7 +462,9 @@ bool OutOfProcessInstance::Init(uint32_t argc, std::string document_url = document_url_var.AsString(); base::StringPiece document_url_piece(document_url); is_print_preview_ = IsPrintPreviewUrl(document_url_piece); diff --git a/patches/common/chromium/printing.patch b/patches/common/chromium/printing.patch index 0b169b4de044..12f2bd8ed296 100644 --- a/patches/common/chromium/printing.patch +++ b/patches/common/chromium/printing.patch @@ -27,7 +27,7 @@ index 961e1560aa914942c01372c354059d6d6b72c50f..aa51b2b2b0e1950f7a660d48bda5e61e #include "printing/printed_document.h" #include "printing/printing_utils.h" diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc -index cfd13b0ac5956fe28ab81bb3cd3d71ab6fdcb747..6d4d1e2e4478bb60a1c53458a3dc7d84cd28125c 100644 +index 007b003dd58d44acd6e1351c237fca6463d90602..4ddbf18e335609623aba42cc39a7c977fe8c5229 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -27,10 +27,7 @@ @@ -49,7 +49,7 @@ index cfd13b0ac5956fe28ab81bb3cd3d71ab6fdcb747..6d4d1e2e4478bb60a1c53458a3dc7d84 #include "mojo/public/cpp/system/buffer.h" #include "printing/buildflags/buildflags.h" #include "printing/metafile_skia.h" -@@ -67,6 +65,8 @@ using PrintSettingsCallback = +@@ -64,6 +62,8 @@ using PrintSettingsCallback = base::OnceCallback)>; void ShowWarningMessageBox(const base::string16& message) { @@ -58,7 +58,7 @@ index cfd13b0ac5956fe28ab81bb3cd3d71ab6fdcb747..6d4d1e2e4478bb60a1c53458a3dc7d84 // Runs always on the UI thread. static bool is_dialog_shown = false; if (is_dialog_shown) -@@ -75,6 +75,7 @@ void ShowWarningMessageBox(const base::string16& message) { +@@ -72,6 +72,7 @@ void ShowWarningMessageBox(const base::string16& message) { base::AutoReset auto_reset(&is_dialog_shown, true); chrome::ShowWarningMessageBox(nullptr, base::string16(), message); @@ -121,7 +121,7 @@ index cfd13b0ac5956fe28ab81bb3cd3d71ab6fdcb747..6d4d1e2e4478bb60a1c53458a3dc7d84 #endif ReleasePrinterQuery(); -@@ -585,6 +590,9 @@ void PrintViewManagerBase::ReleasePrintJob() { +@@ -594,6 +599,9 @@ void PrintViewManagerBase::ReleasePrintJob() { content::RenderFrameHost* rfh = printing_rfh_; printing_rfh_ = nullptr; @@ -166,7 +166,7 @@ index a2569836d04ff968e690215f56f6de3b6d884874..6ddec22641b74d5484c2e0d4f62e5d71 bool printing_succeeded_; diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc -index 8cf82aafd3fd2b8546b8fabfd8b2cc107846681d..07274855cf8311eb4f71a57b171cc04d66edbf31 100644 +index df6cdee86c1bc34eef013f7d36deb77a8dfa7ecb..2692f831de4699b68a5b79982d440c318e40da69 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -22,6 +22,7 @@ @@ -177,7 +177,7 @@ index 8cf82aafd3fd2b8546b8fabfd8b2cc107846681d..07274855cf8311eb4f71a57b171cc04d #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/child_process_host.h" -@@ -100,20 +101,23 @@ PrintViewManager* GetPrintViewManager(int render_process_id, +@@ -82,20 +83,23 @@ PrintViewManager* GetPrintViewManager(int render_process_id, } // namespace @@ -204,7 +204,7 @@ index 8cf82aafd3fd2b8546b8fabfd8b2cc107846681d..07274855cf8311eb4f71a57b171cc04d } PrintingMessageFilter::~PrintingMessageFilter() { -@@ -194,11 +198,13 @@ void PrintingMessageFilter::OnTempFileForPrintingWritten(int render_frame_id, +@@ -131,11 +135,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) { void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { DCHECK_CURRENTLY_ON(BrowserThread::IO); scoped_refptr printer_query; @@ -218,7 +218,7 @@ index 8cf82aafd3fd2b8546b8fabfd8b2cc107846681d..07274855cf8311eb4f71a57b171cc04d printer_query = queue_->PopPrinterQuery(0); if (!printer_query.get()) { printer_query = -@@ -309,11 +315,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie, +@@ -221,11 +227,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie, base::Value job_settings, IPC::Message* reply_msg) { scoped_refptr printer_query; @@ -232,7 +232,7 @@ index 8cf82aafd3fd2b8546b8fabfd8b2cc107846681d..07274855cf8311eb4f71a57b171cc04d printer_query = queue_->PopPrinterQuery(document_cookie); if (!printer_query.get()) { printer_query = queue_->CreatePrinterQuery( -@@ -372,7 +380,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply( +@@ -284,7 +292,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply( #if BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids, bool* cancel) { @@ -242,12 +242,12 @@ index 8cf82aafd3fd2b8546b8fabfd8b2cc107846681d..07274855cf8311eb4f71a57b171cc04d #endif diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h -index 63b71257e4ad25fa27b461969ffec0afb9505203..e18dfc55a02db46300fe96fda00199271d07ba7a 100644 +index c4d586e62f14c3002993a2dbc7e478027d8f9b02..85d5fc55e93bea0080cd03316f29856bcaf27b59 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h -@@ -29,6 +29,10 @@ struct FileDescriptor; - } - #endif +@@ -23,6 +23,10 @@ struct PrintHostMsg_PreviewIds; + struct PrintHostMsg_ScriptedPrint_Params; + class Profile; +namespace content { +class BrowserContext; @@ -256,7 +256,7 @@ index 63b71257e4ad25fa27b461969ffec0afb9505203..e18dfc55a02db46300fe96fda0019927 namespace printing { class PrintQueriesQueue; -@@ -38,7 +42,8 @@ class PrinterQuery; +@@ -32,7 +36,8 @@ class PrinterQuery; // renderer process on the IPC thread. class PrintingMessageFilter : public content::BrowserMessageFilter { public: @@ -264,10 +264,10 @@ index 63b71257e4ad25fa27b461969ffec0afb9505203..e18dfc55a02db46300fe96fda0019927 + PrintingMessageFilter(int render_process_id, + content::BrowserContext* browser_context); - // content::BrowserMessageFilter methods. - void OverrideThreadForMessage(const IPC::Message& message, + // content::BrowserMessageFilter: + bool OnMessageReceived(const IPC::Message& message) override; diff --git a/components/printing/common/print_messages.h b/components/printing/common/print_messages.h -index 7dd892feb181293d3c52fb6a3fd9600c899ee2d3..1ca51744e1046e5dfbedf5af8c6f75358e84acb7 100644 +index 1802034a6e15a6ad8b0d9591cfb79ba5873dc982..a827091facdb4f6b1d74ce826c3492ced27c008e 100644 --- a/components/printing/common/print_messages.h +++ b/components/printing/common/print_messages.h @@ -368,7 +368,10 @@ IPC_MESSAGE_ROUTED0(PrintMsg_PrintNodeUnderContextMenu) @@ -283,7 +283,7 @@ index 7dd892feb181293d3c52fb6a3fd9600c899ee2d3..1ca51744e1046e5dfbedf5af8c6f7535 // Like PrintMsg_PrintPages, but using the print preview document's frame/node. IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog) diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index 0af11fbfa50e334af7926f7e98304960869415d3..d747dd0f2e162b1b4efa89a99ccc0f417202e8e8 100644 +index cd9306860bba75602109959c93817471e119fb50..5255d4cea70e959fae9035e091d7a60f470fc1aa 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -1115,7 +1115,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { @@ -390,7 +390,7 @@ index 0af11fbfa50e334af7926f7e98304960869415d3..d747dd0f2e162b1b4efa89a99ccc0f41 if (print_settings.params.dpi.IsEmpty() || !print_settings.params.document_cookie) { DidFinishPrinting(OK); // Release resources and fail silently on failure. -@@ -1868,10 +1884,24 @@ std::vector PrintRenderFrameHelper::GetPrintedPages( +@@ -1866,10 +1882,24 @@ std::vector PrintRenderFrameHelper::GetPrintedPages( return printed_pages; } @@ -418,7 +418,7 @@ index 0af11fbfa50e334af7926f7e98304960869415d3..d747dd0f2e162b1b4efa89a99ccc0f41 // Check if the printer returned any settings, if the settings is empty, we // can safely assume there are no printer drivers configured. So we safely // terminate. -@@ -1891,12 +1921,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { +@@ -1889,12 +1919,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { return result; } diff --git a/patches/common/chromium/render_widget_host_view_mac.patch b/patches/common/chromium/render_widget_host_view_mac.patch index 2b511921e763..811c5f3ee1cc 100644 --- a/patches/common/chromium/render_widget_host_view_mac.patch +++ b/patches/common/chromium/render_widget_host_view_mac.patch @@ -5,7 +5,7 @@ Subject: render_widget_host_view_mac.patch diff --git a/content/browser/renderer_host/render_widget_host_view_cocoa.mm b/content/browser/renderer_host/render_widget_host_view_cocoa.mm -index 57a608c1a1d4463ba813e1d9132e7f565be85305..be122f9ce470519e630d418550a60324c73a3f42 100644 +index 673c7dacfa323462af4cc53843294e512d342dc7..8e8fae2db94886f4fab190151427e74d627a52ca 100644 --- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm +++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm @@ -144,6 +144,11 @@ void ExtractUnderlines(NSAttributedString* string, @@ -41,7 +41,7 @@ index 57a608c1a1d4463ba813e1d9132e7f565be85305..be122f9ce470519e630d418550a60324 // We only handle key down events and just simply forward other events. if (eventType != NSKeyDown) { clientHelper_->ForwardKeyboardEvent(event, latency_info); -@@ -1506,9 +1518,11 @@ - (id)accessibilityFocusedUIElement { +@@ -1513,9 +1525,11 @@ - (id)accessibilityFocusedUIElement { // Since this implementation doesn't have to wait any IPC calls, this doesn't // make any key-typing jank. --hbono 7/23/09 // @@ -53,7 +53,7 @@ index 57a608c1a1d4463ba813e1d9132e7f565be85305..be122f9ce470519e630d418550a60324 - (NSArray*)validAttributesForMarkedText { // This code is just copied from WebKit except renaming variables. -@@ -1517,7 +1531,10 @@ - (NSArray*)validAttributesForMarkedText { +@@ -1524,7 +1538,10 @@ - (NSArray*)validAttributesForMarkedText { initWithObjects:NSUnderlineStyleAttributeName, NSUnderlineColorAttributeName, NSMarkedClauseSegmentAttributeName, diff --git a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch index baf6bad3c1b5..b27bdd72f93e 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 e27ad6494834c9948f1b85fcef894372d62c5c23..ecbfc65e474409a0d073362d6734047b098d2c7f 100644 +index 2841e44002e7458e71a32a5ab470469af21c629c..5759d527ecc355a88cb8632a2cebdf2e76ab3940 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -470,6 +470,10 @@ class RendererSandboxedProcessLauncherDelegate diff --git a/patches/common/chromium/web_contents.patch b/patches/common/chromium/web_contents.patch index 1594991940c8..f7f4ce710109 100644 --- a/patches/common/chromium/web_contents.patch +++ b/patches/common/chromium/web_contents.patch @@ -5,7 +5,7 @@ Subject: web_contents.patch diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 9e41df626aa90ad9afbadcaca76c02dbaec4d719..9d9d16afd710153eac4fe70e87d1b7eecbce831f 100644 +index bdc3ae99f2b3031dbfd8f347e01681b459ea819b..6df5aa205b034789ad19daae960babb8eb2e4304 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2033,6 +2033,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { diff --git a/patches/common/chromium/webview_cross_drag.patch b/patches/common/chromium/webview_cross_drag.patch index 3e01cd519756..9520f92a1221 100644 --- a/patches/common/chromium/webview_cross_drag.patch +++ b/patches/common/chromium/webview_cross_drag.patch @@ -5,7 +5,7 @@ Subject: webview_cross_drag.patch diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc -index 8e02ca39a947abc26b001f230f4e568fa9e61a89..dfed57b3f79ad359a3807567765fa70214771a3a 100644 +index 68fb77a4a2f6528e9344741e25bfc2ce60069ecb..3b06cee64b4400ca57f24b52384bb2b60649cff7 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -676,6 +676,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { @@ -17,10 +17,10 @@ index 8e02ca39a947abc26b001f230f4e568fa9e61a89..dfed57b3f79ad359a3807567765fa702 GetRenderViewHostID(web_contents_->GetRenderViewHost()) != drag_start_view_id_; diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm -index 576d60b4718e7742ee3eab31904590ed0b447e88..c28be0a78759b48954298cd9bbfdae37a0b72fb8 100644 +index 9423f9c8a225f9d18f6dcd0b9f7de033cbe495df..e7fe311327f698a760c09db2c7677a10c59f5224 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm -@@ -335,6 +335,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { +@@ -336,6 +336,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { } - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH { diff --git a/patches/common/v8/add_realloc.patch b/patches/common/v8/add_realloc.patch index 10d8c13aada6..88bcaa2b944d 100644 --- a/patches/common/v8/add_realloc.patch +++ b/patches/common/v8/add_realloc.patch @@ -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 c56c31b31f13dd55dc528afb2b3468f48fbfa177..4d513fc2e28ce60ae4c0e50a56e4e59084a017cf 100644 +index b23114f4ff8bfadffb35df4d92a832a2320c718e..fc20cf50c3a6dc66c37b8b46d06db7a2f0f558ce 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -4608,6 +4608,13 @@ class V8_EXPORT ArrayBuffer : public Object { +@@ -4610,6 +4610,13 @@ class V8_EXPORT ArrayBuffer : public Object { */ virtual void* AllocateUninitialized(size_t length) = 0; @@ -30,7 +30,7 @@ index c56c31b31f13dd55dc528afb2b3468f48fbfa177..4d513fc2e28ce60ae4c0e50a56e4e590 * 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.cc b/src/api.cc -index 3d8611671fe8aabc939c62b9c9b5169ec9245456..95d242de7d11b1ea990d277d2f09c23749401f5e 100644 +index 23b496706a310f03331d0cefe85ea1ca94778d7a..55b2a1a2da257924eba7e3757994d68c1b508367 100644 --- a/src/api.cc +++ b/src/api.cc @@ -512,6 +512,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { diff --git a/patches/common/v8/array_buffer.patch b/patches/common/v8/array_buffer.patch index 8c8c3575450e..4fe7cbc12b79 100644 --- a/patches/common/v8/array_buffer.patch +++ b/patches/common/v8/array_buffer.patch @@ -5,10 +5,10 @@ Subject: array_buffer.patch diff --git a/include/v8.h b/include/v8.h -index 4d513fc2e28ce60ae4c0e50a56e4e59084a017cf..fd061fde06956418373ded038f6f37e4488ac1a3 100644 +index fc20cf50c3a6dc66c37b8b46d06db7a2f0f558ce..f23567c1429ae0bbc5f916e4ee0a1190dae8d88f 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -7705,6 +7705,9 @@ class V8_EXPORT Isolate { +@@ -7707,6 +7707,9 @@ class V8_EXPORT Isolate { */ void SetIdle(bool is_idle); @@ -19,7 +19,7 @@ index 4d513fc2e28ce60ae4c0e50a56e4e59084a017cf..fd061fde06956418373ded038f6f37e4 bool InContext(); diff --git a/src/api.cc b/src/api.cc -index 95d242de7d11b1ea990d277d2f09c23749401f5e..d963a10525dbdeb60c9d762f1fa5038c4d410010 100644 +index 55b2a1a2da257924eba7e3757994d68c1b508367..279edffbcc283ebfd11faf263d60f5a20c121d87 100644 --- a/src/api.cc +++ b/src/api.cc @@ -7966,6 +7966,13 @@ void Isolate::SetIdle(bool is_idle) { diff --git a/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch b/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch index ca1aaa1391ae..d33166cb4054 100644 --- a/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch +++ b/patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch @@ -6,7 +6,7 @@ Subject: build-torque-with-x64-toolchain-on-arm.patch torque binary has to be run during the build. diff --git a/BUILD.gn b/BUILD.gn -index 8bdc4ac595e82e1272ade2f715188bcb07653c82..b593ac20ef722146ca0c50ba01d6ee6b8d6d3035 100644 +index b70c09aa34aa7547e7d26d9e35795904a17c092f..0fa207082101165ec5d888cd21e4ca916ee458a9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -184,7 +184,8 @@ declare_args() { @@ -19,7 +19,7 @@ index 8bdc4ac595e82e1272ade2f715188bcb07653c82..b593ac20ef722146ca0c50ba01d6ee6b v8_generator_toolchain = "//build/toolchain/linux:clang_x64" } -@@ -3351,7 +3352,7 @@ if (v8_monolithic) { +@@ -3352,7 +3353,7 @@ if (v8_monolithic) { # Executables # @@ -28,7 +28,7 @@ index 8bdc4ac595e82e1272ade2f715188bcb07653c82..b593ac20ef722146ca0c50ba01d6ee6b v8_executable("bytecode_builtins_list_generator") { visibility = [ ":*" ] # Only targets in this file can depend on this. -@@ -3401,7 +3402,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { +@@ -3402,7 +3403,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { } } diff --git a/patches/common/v8/build_gn.patch b/patches/common/v8/build_gn.patch index 85e396e8d56b..e988d15f4ae5 100644 --- a/patches/common/v8/build_gn.patch +++ b/patches/common/v8/build_gn.patch @@ -5,7 +5,7 @@ Subject: build_gn.patch diff --git a/BUILD.gn b/BUILD.gn -index cc9b7a906a111451eff86e8f78571617256136f1..139a777e304ab0449693664feb248a714995aa26 100644 +index 16e0b60ca784417321871cb2e192b74fba3b3131..ee2607fad94220c6390b129ee2f069775b00a5d2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -236,7 +236,7 @@ config("internal_config") { @@ -17,7 +17,7 @@ index cc9b7a906a111451eff86e8f78571617256136f1..139a777e304ab0449693664feb248a71 defines = [ "BUILDING_V8_SHARED" ] } } -@@ -3386,6 +3386,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { +@@ -3387,6 +3387,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/common/v8/dcheck.patch b/patches/common/v8/dcheck.patch index 3a3c3b79b67c..49cc078d853b 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.cc b/src/api.cc -index 63538cc4ab571f9be27ea8e0d1e7df94ff3dac71..5b8948425fd9f9db2f175eb2d0f435f4c045be0c 100644 +index c796a6ee6426ff88b6a08bf1d858b720e1526b86..ea0727bc4cd746c14b0fb94513c32b70e286bb44 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -8613,7 +8613,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { +@@ -8611,7 +8611,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { void Isolate::RunMicrotasks() { @@ -18,10 +18,10 @@ index 63538cc4ab571f9be27ea8e0d1e7df94ff3dac71..5b8948425fd9f9db2f175eb2d0f435f4 isolate->default_microtask_queue()->RunMicrotasks(isolate); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index 6a277353d721feb9f76b70e4e18f17f1deb5e281..d3f403555669838124d6720186230b01b18d6092 100644 +index d399d070b84b948840de84a92c64e366e5aa42bb..413e18d9cdf6c947c86752a86473d095cc29c011 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc -@@ -4719,9 +4719,9 @@ void Heap::TearDown() { +@@ -4773,9 +4773,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_backport_detailed_line_info_for_cpu_profiler.patch b/patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch index a7c9f39a3456..82fe3a340cb5 100644 --- a/patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch +++ b/patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch @@ -20,10 +20,10 @@ Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater diff --git a/src/flag-definitions.h b/src/flag-definitions.h -index 82729fe9a3e8ac4c7ea7ec984421d2af055d4922..b5de2854a6ff348b44f0bae8169b1d16a0209d71 100644 +index d262fb70129fe93cab35fffbca01f38dac461a30..deec6d034505ca531db6acc711bce7bff62190b3 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h -@@ -1289,7 +1289,7 @@ DEFINE_BOOL(log_function_events, false, +@@ -1290,7 +1290,7 @@ DEFINE_BOOL(log_function_events, false, DEFINE_BOOL(prof, false, "Log statistical profiling information (implies --log-code).") 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 dfea700f3f75..caf17d248fad 100644 --- a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch +++ b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch @@ -22,10 +22,10 @@ Reviewed-By: Yang Guo Reviewed-By: Michaël Zasso diff --git a/include/v8.h b/include/v8.h -index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83dbd57eb4 100644 +index f23567c1429ae0bbc5f916e4ee0a1190dae8d88f..f2e12dcfd68e3fc92024a6631d54b85294e9ffae 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -994,6 +994,10 @@ class V8_EXPORT PrimitiveArray { +@@ -996,6 +996,10 @@ class V8_EXPORT PrimitiveArray { public: static Local New(Isolate* isolate, int length); int Length() const; @@ -36,7 +36,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 void Set(Isolate* isolate, int index, Local item); Local Get(Isolate* isolate, int index); }; -@@ -1697,6 +1701,8 @@ class V8_EXPORT StackTrace { +@@ -1699,6 +1703,8 @@ class V8_EXPORT StackTrace { /** * Returns a StackFrame at a particular index. */ @@ -45,7 +45,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 Local GetFrame(Isolate* isolate, uint32_t index) const; /** -@@ -2405,6 +2411,13 @@ class V8_EXPORT Value : public Data { +@@ -2407,6 +2413,13 @@ class V8_EXPORT Value : public Data { V8_DEPRECATE_SOON("Use maybe version", Local ToInt32(Isolate* isolate) const); @@ -59,7 +59,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 /** * Attempts to convert a string to an array index. * Returns an empty handle if the conversion fails. -@@ -2424,7 +2437,14 @@ class V8_EXPORT Value : public Data { +@@ -2426,7 +2439,14 @@ class V8_EXPORT Value : public Data { Local context) const; V8_WARN_UNUSED_RESULT Maybe Int32Value(Local context) const; @@ -74,7 +74,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 V8_WARN_UNUSED_RESULT Maybe Equals(Local context, Local that) const; bool StrictEquals(Local that) const; -@@ -2531,6 +2551,8 @@ class V8_EXPORT String : public Name { +@@ -2533,6 +2553,8 @@ class V8_EXPORT String : public Name { * Returns the number of bytes in the UTF-8 encoded * representation of this string. */ @@ -83,7 +83,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 int Utf8Length(Isolate* isolate) const; /** -@@ -2587,12 +2609,23 @@ class V8_EXPORT String : public Name { +@@ -2589,12 +2611,23 @@ class V8_EXPORT String : public Name { // 16-bit character codes. int Write(Isolate* isolate, uint16_t* buffer, int start = 0, int length = -1, int options = NO_OPTIONS) const; @@ -107,7 +107,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 /** * A zero length string. -@@ -2784,6 +2817,9 @@ class V8_EXPORT String : public Name { +@@ -2786,6 +2819,9 @@ class V8_EXPORT String : public Name { */ static Local Concat(Isolate* isolate, Local left, Local right); @@ -117,7 +117,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 /** * Creates a new external string using the data defined in the given -@@ -2852,6 +2888,8 @@ class V8_EXPORT String : public Name { +@@ -2854,6 +2890,8 @@ class V8_EXPORT String : public Name { */ class V8_EXPORT Utf8Value { public: @@ -126,7 +126,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 Utf8Value(Isolate* isolate, Local obj); ~Utf8Value(); char* operator*() { return str_; } -@@ -2875,6 +2913,7 @@ class V8_EXPORT String : public Name { +@@ -2877,6 +2915,7 @@ class V8_EXPORT String : public Name { */ class V8_EXPORT Value { public: @@ -134,7 +134,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 Value(Isolate* isolate, Local obj); ~Value(); uint16_t* operator*() { return str_; } -@@ -5269,6 +5308,8 @@ class V8_EXPORT BooleanObject : public Object { +@@ -5271,6 +5310,8 @@ class V8_EXPORT BooleanObject : public Object { class V8_EXPORT StringObject : public Object { public: static Local New(Isolate* isolate, Local value); @@ -143,7 +143,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 Local ValueOf() const; -@@ -10123,6 +10164,30 @@ template Value* Value::Cast(T* value) { +@@ -10127,6 +10168,30 @@ template Value* Value::Cast(T* value) { } @@ -175,7 +175,7 @@ index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83 #ifdef V8_ENABLE_CHECKS CheckCast(value); diff --git a/src/api.cc b/src/api.cc -index d963a10525dbdeb60c9d762f1fa5038c4d410010..63538cc4ab571f9be27ea8e0d1e7df94ff3dac71 100644 +index 279edffbcc283ebfd11faf263d60f5a20c121d87..c796a6ee6426ff88b6a08bf1d858b720e1526b86 100644 --- a/src/api.cc +++ b/src/api.cc @@ -2181,6 +2181,10 @@ int PrimitiveArray::Length() const { @@ -330,7 +330,7 @@ index d963a10525dbdeb60c9d762f1fa5038c4d410010..63538cc4ab571f9be27ea8e0d1e7df94 Local v8::StringObject::New(Isolate* v8_isolate, Local value) { i::Handle string = Utils::OpenHandle(*value); -@@ -8927,6 +9009,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) { +@@ -8925,6 +9007,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) { return isolate->default_microtask_queue()->IsRunningMicrotasks(); } @@ -340,7 +340,7 @@ index d963a10525dbdeb60c9d762f1fa5038c4d410010..63538cc4ab571f9be27ea8e0d1e7df94 String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) : str_(nullptr), length_(0) { if (obj.IsEmpty()) return; -@@ -8946,6 +9031,9 @@ String::Utf8Value::~Utf8Value() { +@@ -8944,6 +9029,9 @@ String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); } diff --git a/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch b/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch index 2b7800208019..b40980e2318e 100644 --- a/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch +++ b/patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch @@ -10,10 +10,10 @@ Electron does, so this patch makes sure that the build doesn't try to run the mksnapshot binary if it was built for arm or arm64. diff --git a/BUILD.gn b/BUILD.gn -index b593ac20ef722146ca0c50ba01d6ee6b8d6d3035..da0d7810547ab1205f7ad768b76ce27b197f6505 100644 +index 0fa207082101165ec5d888cd21e4ca916ee458a9..129b6ce1ba23089254fb0da8a67e4bdfd95cb4d1 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -1240,9 +1240,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) { +@@ -1241,9 +1241,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) { ] public_deps = [ ":natives_blob", diff --git a/patches/common/v8/expose_mksnapshot.patch b/patches/common/v8/expose_mksnapshot.patch index 8b0d9f255aff..55559c93e8c7 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 build mksnapshot on arm. diff --git a/BUILD.gn b/BUILD.gn -index 139a777e304ab0449693664feb248a714995aa26..8bdc4ac595e82e1272ade2f715188bcb07653c82 100644 +index ee2607fad94220c6390b129ee2f069775b00a5d2..b70c09aa34aa7547e7d26d9e35795904a17c092f 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -3376,8 +3376,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -3377,8 +3377,6 @@ if (current_toolchain == v8_generator_toolchain) { if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") {