From 724554627467df068291466ec55ceb6a39f64c3d Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 26 Feb 2019 13:31:29 -0800 Subject: [PATCH] update chromium patches --- patches/common/chromium/add_realloc.patch | 10 +-- .../chromium/allow_webview_file_url.patch | 2 +- patches/common/chromium/blink_file_path.patch | 4 +- .../common/chromium/blink_local_frame.patch | 6 +- .../common/chromium/blink_world_context.patch | 8 +- .../common/chromium/boringssl_build_gn.patch | 2 +- .../common/chromium/can_create_window.patch | 16 ++-- .../common/chromium/command-ismediakey.patch | 6 +- .../chromium/content_browser_main_loop.patch | 4 +- ...cross_site_document_resource_handler.patch | 6 +- .../common/chromium/desktop_media_list.patch | 2 +- .../common/chromium/disable-redraw-lock.patch | 4 +- .../disable_color_correct_rendering.patch | 78 +++++-------------- patches/common/chromium/disable_hidden.patch | 6 +- ...requirement_for_beforeunload_dialogs.patch | 4 +- .../exclude-a-few-test-files-from-build.patch | 4 +- .../common/chromium/frame_host_manager.patch | 4 +- patches/common/chromium/gtk_visibility.patch | 2 +- ...launchservicesserverconnectionstatus.patch | 2 +- .../common/chromium/mas_no_private_api.patch | 17 ++-- .../chromium/out_of_process_instance.patch | 2 +- patches/common/chromium/pepper_flash.patch | 2 +- patches/common/chromium/printing.patch | 12 +-- .../common/chromium/scroll_bounce_flag.patch | 4 +- .../ssl_security_state_tab_helper.patch | 26 +++---- .../support_mixed_sandbox_with_zygote.patch | 10 +-- patches/common/chromium/tts.patch | 2 +- patches/common/chromium/web_contents.patch | 6 +- .../worker_context_will_destroy.patch | 6 +- 29 files changed, 106 insertions(+), 151 deletions(-) diff --git a/patches/common/chromium/add_realloc.patch b/patches/common/chromium/add_realloc.patch index 513288dc26be..7918e7d9625f 100644 --- a/patches/common/chromium/add_realloc.patch +++ b/patches/common/chromium/add_realloc.patch @@ -39,7 +39,7 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f GIN_EXPORT static ArrayBufferAllocator* SharedInstance(); diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc -index ef4641ff78f6e6961f54a043f2ec391f5e8d6209..9142940bebbc500a23391f5b50f5db451e6fa0be 100644 +index f8a93785435888f4d2d22976a2b7003cf5d14f15..9c2a95c611dace86620d07686f5d43dfe5a5b546 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc @@ -650,6 +650,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { @@ -54,10 +54,10 @@ index ef4641ff78f6e6961f54a043f2ec391f5e8d6209..9142940bebbc500a23391f5b50f5db45 WTF::ArrayBufferContents::FreeMemory(data); } diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc -index 5a8dbf109f4f7eb682c23bf24c391b70a7717a0c..e0b33e815f2eb98aa494a8489543acdb873e1597 100644 +index 0031242152ce5190b0dfc77b53af2d984e5fad82..a6370ec793ce6c38eb7dab189583ea11cca51c1f 100644 --- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc +++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc -@@ -122,6 +122,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size, +@@ -130,6 +130,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size, return AllocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull); } @@ -70,10 +70,10 @@ index 5a8dbf109f4f7eb682c23bf24c391b70a7717a0c..e0b33e815f2eb98aa494a8489543acdb Partitions::ArrayBufferPartition()->Free(data); } diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h -index 3cc1abe8e48c8e45d1f3ebb98a6a6ea1a4e3fbd9..1e2438cc6da97a89fefc86148bb1037d3c84f765 100644 +index 98bda6647e7b1516ab6114ebc63f5c60da3ebbb7..37dacadc262e15714f8e3e090b780c8abf22283e 100644 --- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h +++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h -@@ -134,6 +134,7 @@ class WTF_EXPORT ArrayBufferContents { +@@ -135,6 +135,7 @@ class WTF_EXPORT ArrayBufferContents { void CopyTo(ArrayBufferContents& other); static void* AllocateMemoryOrNull(size_t, InitializationPolicy); diff --git a/patches/common/chromium/allow_webview_file_url.patch b/patches/common/chromium/allow_webview_file_url.patch index cf6179ca15e6..f7b37209df8c 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 6d60ec680c244cfbc2d9cc0b96f4a86f6fe28f15..766bbe91e1f4a481d951c3a574991aa9c473da0c 100644 +index bd2d517223623ded88e0b15f601e473059895b83..a8c1de1ebc3022cb3644ea3375a83b6d266d1600 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -1439,6 +1439,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( diff --git a/patches/common/chromium/blink_file_path.patch b/patches/common/chromium/blink_file_path.patch index 21a762857c9d..0426dd7c323a 100644 --- a/patches/common/chromium/blink_file_path.patch +++ b/patches/common/chromium/blink_file_path.patch @@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See documentation at https://electronjs.org/docs/api/file-object diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h -index 4a2b3a42364b57e3a0e4514ac40f5576ba5d6689..b89dd3b2ad409b3c23a3a05de241a6c8358fedb1 100644 +index 474c226bcd74a4f9d0d3e2bc2373ccfb1970fc24..5ee32f4b4ffebe4a9824726d2f06f509ded9dcb5 100644 --- a/third_party/blink/renderer/core/fileapi/file.h +++ b/third_party/blink/renderer/core/fileapi/file.h -@@ -201,6 +201,9 @@ class CORE_EXPORT File final : public Blob { +@@ -202,6 +202,9 @@ class CORE_EXPORT File final : public Blob { } const String& name() const { return name_; } diff --git a/patches/common/chromium/blink_local_frame.patch b/patches/common/chromium/blink_local_frame.patch index b128bb4ffb0c..75bef3c08470 100644 --- a/patches/common/chromium/blink_local_frame.patch +++ b/patches/common/chromium/blink_local_frame.patch @@ -14,10 +14,10 @@ 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 daf6c8f000dd3087852810c35ff5f31eb224fd05..fbba0cbb2dadcff71c72188f21a7bdc1b867ed6d 100644 +index 95ce90f711a1d8817ae0930d79b11451b508ddd0..f37598cb954e0312f92b4b2f5454785d8badfc04 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) { +@@ -401,10 +401,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index daf6c8f000dd3087852810c35ff5f31eb224fd05..fbba0cbb2dadcff71c72188f21a7bdc1 if (!Client()) return; -@@ -424,6 +420,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -422,6 +418,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { // Notify ScriptController that the frame is closing, since its cleanup ends // up calling back to LocalFrameClient via WindowProxy. GetScriptController().ClearForClose(); diff --git a/patches/common/chromium/blink_world_context.patch b/patches/common/chromium/blink_world_context.patch index 18605a23c482..3335997d1f17 100644 --- a/patches/common/chromium/blink_world_context.patch +++ b/patches/common/chromium/blink_world_context.patch @@ -5,10 +5,10 @@ Subject: blink_world_context.patch diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h -index 6fa653b04cf6613cd1fbde502731be27216a9140..97cdb13e8129dae1fa6fc390b63d738ff5d71ed0 100644 +index 72fb1b51ded3b6e090b475641cefb1af4e3803c3..82b57892350adeb7f65ea17882f0b1b08090eebe 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h -@@ -342,6 +342,9 @@ class WebLocalFrame : public WebFrame { +@@ -344,6 +344,9 @@ class WebLocalFrame : public WebFrame { // be calling this API. virtual v8::Local MainWorldScriptContext() const = 0; @@ -19,7 +19,7 @@ index 6fa653b04cf6613cd1fbde502731be27216a9140..97cdb13e8129dae1fa6fc390b63d738f // that the script evaluated to with callback. Script execution can be // suspend. diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc -index ae240d4c7d998256f3ca73a0fd37aad64d68da4d..256e5021b2402d9899f5c0b103668b731e1ed454 100644 +index c059f16582ecd6310bf523bc315b6107c69c34f8..b0dc3cde086ad53e5432406c2ce44cc5693b9310 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc @@ -889,6 +889,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { @@ -37,7 +37,7 @@ index ae240d4c7d998256f3ca73a0fd37aad64d68da4d..256e5021b2402d9899f5c0b103668b73 return BindingSecurity::ShouldAllowAccessToFrame( CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()), diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h -index eeafc634da8688033bbad20f0a0fb67e3ac92e44..9f606f407f112ad5cf9f1bfccd548719121b02df 100644 +index 9074fabf2d2fb199cbd3f6d73f11ff8c9239a847..24ab8fc628815d94d420f9ec7f9b979010831dea 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h @@ -147,6 +147,8 @@ class CORE_EXPORT WebLocalFrameImpl final diff --git a/patches/common/chromium/boringssl_build_gn.patch b/patches/common/chromium/boringssl_build_gn.patch index eeacc1daa067..95ff17d4db4a 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 1afad406841033bda987f64f81fb73bbe66e3a0d..79e18e388cc0bd62ab796855609399c5e1e97a62 100644 +index 051b3ed07fa7d4ec2e5f9200dab6843176e55d56..edf567e79c88fbe66acf4aabd3952cb8adcab4af 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 82a0287a9405..507590b9ab15 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 24b06a7a2123d1295e16db5e97a470b17421d155..0e03c97d94ef4db1a6b7b4539683e7ebd6d25a56 100644 +index 3d4741bff391e2596730665c98986e5cc0773a4c..024651b9ec3b90d38607cffe7b73d8d53901fa52 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -3621,6 +3621,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -3631,6 +3631,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,10 +32,10 @@ index f660470b2c612f89a3ad9f0ada4ab13710705b57..45c38198e8fcc44d71ef9440e38d301f // 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 07dafe9d761951084b5a3201d48c715066e80b62..0d81568785aa06d5c15a02f569f13aa06178af50 100644 +index 2426808759bfa7e0eabb2e9de6925bf59902055a..09a2a50fdbd76d24d547bf5e22f9a0a93bd9a126 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -497,6 +497,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -501,6 +501,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -45,7 +45,7 @@ index 07dafe9d761951084b5a3201d48c715066e80b62..0d81568785aa06d5c15a02f569f13aa0 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 6999eb057f737d07d43e2e6be58c2488fc13b593..5cdf8a997c12fe5bb9685f92f98b0f90c756b469 100644 +index 8b47fdebe3efb1022a4602422dbffd39f983cfcc..a70f357b97da1a24b02e9a7b29504c63b2c780fb 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -175,6 +175,7 @@ class RenderFrameHost; @@ -56,7 +56,7 @@ index 6999eb057f737d07d43e2e6be58c2488fc13b593..5cdf8a997c12fe5bb9685f92f98b0f90 class SerialDelegate; class ServiceManagerConnection; class SiteInstance; -@@ -771,6 +772,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -775,6 +776,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -66,7 +66,7 @@ index 6999eb057f737d07d43e2e6be58c2488fc13b593..5cdf8a997c12fe5bb9685f92f98b0f90 bool opener_suppressed, bool* no_javascript_access); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc -index e961678e73fa6e4555bdc764d77ecab8bbc1bc9c..889cc359a3ddbf914457271af76b4b58aef4e593 100644 +index bccdec835985e74b450a220969e5db744a812466..422601a02d5891c9f443869059885ce798c75384 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -76,6 +76,7 @@ @@ -77,7 +77,7 @@ index e961678e73fa6e4555bdc764d77ecab8bbc1bc9c..889cc359a3ddbf914457271af76b4b58 #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( +@@ -1346,6 +1347,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 7f09a4ec11e4..aa8c59b5dcdd 100644 --- a/patches/common/chromium/command-ismediakey.patch +++ b/patches/common/chromium/command-ismediakey.patch @@ -80,10 +80,10 @@ 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 b48fa8e63867021bdd77bf585a0e02c366980d91..bae9e24e7bcf7615be243bcb5629cc5981a31b06 100644 +index fe6aa25cc8cc372ef450e5d6658a52a2b87eabcb..e960d601062b644c0b25b657e128e06584c45b54 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) { +@@ -32,6 +32,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) { case NX_KEYTYPE_NEXT: case NX_KEYTYPE_FAST: return VKEY_MEDIA_NEXT_TRACK; @@ -96,7 +96,7 @@ index b48fa8e63867021bdd77bf585a0e02c366980d91..bae9e24e7bcf7615be243bcb5629cc59 } return VKEY_UNKNOWN; } -@@ -190,7 +196,10 @@ CGEventRef MediaKeysListenerImpl::EventTapCallback(CGEventTapProxy proxy, +@@ -191,7 +197,10 @@ CGEventRef MediaKeysListenerImpl::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/content_browser_main_loop.patch b/patches/common/chromium/content_browser_main_loop.patch index 68d5e7be4fcc..a1a72653412e 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 0b8d10a0932c9807b8f799c624a53f7c31d4f139..e72e60ccf30d39576d1e8d38b766afe4fe572cbe 100644 +index f16849bac024fbdfe7fd907143903cdf2ebe4f70..c932bfbb94d2301ca1522421b89d8a7289155926 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc -@@ -1539,7 +1539,7 @@ void BrowserMainLoop::MainMessageLoopRun() { +@@ -1544,7 +1544,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 1971ba3eff45..81384a1cec3a 100644 --- a/patches/common/chromium/cross_site_document_resource_handler.patch +++ b/patches/common/chromium/cross_site_document_resource_handler.patch @@ -8,7 +8,7 @@ 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 bd62ed07876ad4a2a7c6e8309843281719dbefb6..13e67994997caf175ba1b30ba8070718a697588d 100644 +index f86a9167ac1ec5e7b082e474eb4b5f217d06df92..47df32ecb078a8f18e474f5c38faf2c7bdab30a1 100644 --- a/content/browser/loader/cross_site_document_resource_handler.cc +++ b/content/browser/loader/cross_site_document_resource_handler.cc @@ -673,6 +673,9 @@ bool CrossSiteDocumentResourceHandler::ShouldBlockBasedOnHeaders( @@ -22,7 +22,7 @@ index bd62ed07876ad4a2a7c6e8309843281719dbefb6..13e67994997caf175ba1b30ba8070718 } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 925cc7dbe126ebb4eded12de34b93cb1a35ee8c4..4ade8f40c24409dfaf822d5ba1fcc3493eccaacd 100644 +index fb1f74b71c9e51c5d8c12adfff586bb57a7b6407..07afb123e6d2bdad4d1e15fdc7fe24bf267ce2f6 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -61,6 +61,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should @@ -37,7 +37,7 @@ index 925cc7dbe126ebb4eded12de34b93cb1a35ee8c4..4ade8f40c24409dfaf822d5ba1fcc349 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 63496fd120aeb0168787cf33deecb5e53bb96f32..fd6628c4d2c1e1abb4fbf6cfec0c06d9ad3ceb81 100644 +index 08089579500c860880b9c1bd32816095ca05ed27..e2ab0b2c7819bb437b50d25909ef915373b21de7 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -241,6 +241,9 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/common/chromium/desktop_media_list.patch b/patches/common/chromium/desktop_media_list.patch index ad49ea773e3d..9f57f3b0a0a7 100644 --- a/patches/common/chromium/desktop_media_list.patch +++ b/patches/common/chromium/desktop_media_list.patch @@ -133,7 +133,7 @@ index 47401abc984e6fe26c7f4c5399aa565c687060b0..ca6a527ffac877c27aac94337ec5a7b5 protected: virtual ~DesktopMediaListObserver() {} diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc -index d9fd23d0a6cd8789d6324400e08950084acfcd6c..af9b3887b5b809104fcc695cbf5e60ba9c8ab489 100644 +index 9d8fa1185972c4d8660d47f13238658e1facc5ef..e1973ddb0a7f0517cc66d914aa562aec5918ca1e 100644 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc @@ -7,14 +7,15 @@ diff --git a/patches/common/chromium/disable-redraw-lock.patch b/patches/common/chromium/disable-redraw-lock.patch index af50f11adcd9..b5a19a0b202f 100644 --- a/patches/common/chromium/disable-redraw-lock.patch +++ b/patches/common/chromium/disable-redraw-lock.patch @@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue can be found at https://github.com/electron/electron/issues/1821 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index a71728f78327a51dcfde785e6674ea47cefa058f..3ef4ae0aca4c3e419e1e010b6ec9b0ebde32918f 100644 +index 6fa8cd0846d253d2bf2c3ff07ff0234ee31a270a..2f7ebbb8453a5f55f07b9ee4cff9eb7ef29dc2e4 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -290,6 +290,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500; @@ -49,7 +49,7 @@ index a71728f78327a51dcfde785e6674ea47cefa058f..3ef4ae0aca4c3e419e1e010b6ec9b0eb // HWNDMessageHandler, gfx::WindowImpl overrides: diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h -index ab1377184b4e26760ab67032342ccd125a6151ce..956db108c48ed86ad889112b7c04df8c5df3e992 100644 +index 925996e356994bf27939565beb9663c4416de1bc..8c2b5fc09da64a4766c1918eee34d4cfe651958d 100644 --- a/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h @@ -183,6 +183,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl, diff --git a/patches/common/chromium/disable_color_correct_rendering.patch b/patches/common/chromium/disable_color_correct_rendering.patch index f853cc9c0430..dd7992ef85c2 100644 --- a/patches/common/chromium/disable_color_correct_rendering.patch +++ b/patches/common/chromium/disable_color_correct_rendering.patch @@ -19,10 +19,10 @@ 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 ace6be4c7e0009af28d739f5905f8c6ac65acfb7..1d056a6767ffeaa78577950a2d3f33d9aa046a78 100644 +index c1d49e1a7567d179134543d25b662b3d685beb87..88bba037538efc9facc3a06ee7e1edae11342ce2 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -1577,6 +1577,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( +@@ -1574,6 +1574,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( } RasterColorSpace LayerTreeHostImpl::GetRasterColorSpace() const { @@ -80,7 +80,7 @@ index a2355806937474c36cdf0089b86f9d80235684a1..dce6119c44af3259a37b727d4947fac5 !command_line->HasSwitch(switches::kUIDisablePartialSwap); #if defined(OS_WIN) diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144dbd367905 100644 +index 2a3368f2b44b37eac54db343b1f645d0456def54..b199ca2d6ef94eb3bf577d92c6b011276e5a2cec 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc @@ -79,6 +79,9 @@ @@ -93,7 +93,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d namespace viz { namespace { -@@ -521,8 +524,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, +@@ -529,8 +532,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) { SetBlendEnabled(quad->ShouldDrawWithBlending()); @@ -105,7 +105,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d // Use the full quad_rect for debug quads to not move the edges based on // partial swaps. -@@ -1324,7 +1328,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, +@@ -1332,7 +1336,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, tex_coord_precision, sampler_type, shader_blend_mode, params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background, params->use_color_matrix, tint_gl_composited_content_), @@ -115,7 +115,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d } void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) { -@@ -1787,8 +1792,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, +@@ -1795,8 +1800,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB(); SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA, tint_gl_composited_content_), @@ -126,7 +126,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d SetShaderColor(color, opacity); if (current_program_->tint_color_matrix_location() != -1) { -@@ -1938,8 +1943,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, +@@ -1946,8 +1951,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, quad->is_premultiplied ? PREMULTIPLIED_ALPHA : NON_PREMULTIPLIED_ALPHA, false, false, tint_gl_composited_content_), @@ -137,7 +137,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2027,8 +2032,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, +@@ -2035,8 +2040,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, : NON_PREMULTIPLIED_ALPHA, !quad->ShouldDrawWithBlending(), has_tex_clamp_rect, tint_gl_composited_content_), @@ -148,7 +148,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2123,7 +2128,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, +@@ -2131,7 +2136,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB()); gfx::ColorSpace dst_color_space = @@ -157,7 +157,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d // Force sRGB output on Windows for overlay candidate video quads to match // DirectComposition behavior in case these switch between overlays and // compositing. See https://crbug.com/811118 for details. -@@ -2271,8 +2276,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, +@@ -2279,8 +2284,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, quad->resource_id()); SetUseProgram(ProgramKey::VideoStream(tex_coord_precision), @@ -168,7 +168,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id()); -@@ -2329,8 +2334,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { +@@ -2337,8 +2342,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR); // Bind the program to the GL state. @@ -179,7 +179,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); gl_->BindTexture(locked_quad.target(), locked_quad.texture_id()); -@@ -2985,7 +2990,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { +@@ -2993,7 +2998,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color, const gfx::ColorSpace& src_color_space, const gfx::ColorSpace& dst_color_space) { @@ -190,7 +190,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d ProgramKey program_key = program_key_no_color; const gfx::ColorTransform* color_transform = -@@ -3339,7 +3346,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( +@@ -3347,7 +3354,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( *overlay_texture = FindOrCreateOverlayTexture( params.quad->render_pass_id, iosurface_width, iosurface_height, @@ -199,7 +199,7 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d *new_bounds = gfx::RectF(updated_dst_rect.origin(), gfx::SizeF((*overlay_texture)->texture.size())); -@@ -3543,8 +3550,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { +@@ -3551,8 +3558,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { PrepareGeometry(SHARED_BINDING); @@ -211,50 +211,12 @@ index 7d50893228df7c23b3776eabb3aaa7bd28e70d8b..a83c1e833278e5a6826db681db43144d gfx::Transform render_matrix; render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), -@@ -3704,3 +3712,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( +@@ -3712,3 +3720,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( } } // namespace viz + +#undef PATCH_CS -diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc -index 494442a9c5a03dae8daa166296e32b13460adc4f..173df8422c358a8ba32e5aa32021ee21f1cd557d 100644 ---- a/components/viz/service/display/skia_renderer.cc -+++ b/components/viz/service/display/skia_renderer.cc -@@ -716,9 +716,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 -- color_transform_canvas = SkCreateColorSpaceXformCanvas( -- current_canvas_, gfx::ColorSpace::CreateSRGB().ToSkColorSpace()); -- raster_canvas = color_transform_canvas.get(); -+ if (settings_->enable_color_correct_rendering) { -+ color_transform_canvas = SkCreateColorSpaceXformCanvas( -+ current_canvas_, gfx::ColorSpace::CreateSRGB().ToSkColorSpace()); -+ raster_canvas = color_transform_canvas.get(); -+ } - - base::Optional opacity_canvas; - if (needs_transparency || disable_image_filtering) { -diff --git a/components/viz/service/display/software_renderer.cc b/components/viz/service/display/software_renderer.cc -index d66a94ce6c26d1717d8d65bc179dc8f72bf2c2e3..23231cb6c4285654bf2b27d80ae70a88ea2cbf0b 100644 ---- a/components/viz/service/display/software_renderer.cc -+++ b/components/viz/service/display/software_renderer.cc -@@ -334,9 +334,11 @@ void SoftwareRenderer::DrawPictureQuad(const PictureDrawQuad* quad) { - - std::unique_ptr color_transform_canvas; - // TODO(enne): color transform needs to be replicated in gles2_cmd_decoder -- color_transform_canvas = SkCreateColorSpaceXformCanvas( -- current_canvas_, gfx::ColorSpace::CreateSRGB().ToSkColorSpace()); -- raster_canvas = color_transform_canvas.get(); -+ if (settings_->enable_color_correct_rendering) { -+ color_transform_canvas = SkCreateColorSpaceXformCanvas( -+ current_canvas_, gfx::ColorSpace::CreateSRGB().ToSkColorSpace()); -+ raster_canvas = color_transform_canvas.get(); -+ } - - base::Optional opacity_canvas; - if (needs_transparency || disable_image_filtering) { diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index e5e73d61a5bd26799935f08b77a520b066a2da7e..dbfb89533b84d3226f096d9af26d7aeb44c267d4 100644 --- a/content/browser/gpu/gpu_process_host.cc @@ -268,10 +230,10 @@ index e5e73d61a5bd26799935f08b77a520b066a2da7e..dbfb89533b84d3226f096d9af26d7aeb 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 ff7055422d086c0006f45561f17a80d116266234..53546c1d1e18011d921e8579cbcdb185f3a05a2e 100644 +index 24945f4ae42441ad0c0f58f8a1574afde832aa99..dd960ae24c74ea98389925fba9828b7f939341fc 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -220,6 +220,7 @@ +@@ -221,6 +221,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_switches_util.h" #include "ui/display/display_switches.h" @@ -279,7 +241,7 @@ index ff7055422d086c0006f45561f17a80d116266234..53546c1d1e18011d921e8579cbcdb185 #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" -@@ -2944,6 +2945,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -2952,6 +2953,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( // Propagate the following switches to the renderer command line (along // with any associated values) if present in the browser command line. static const char* const kSwitchNames[] = { @@ -288,10 +250,10 @@ index ff7055422d086c0006f45561f17a80d116266234..53546c1d1e18011d921e8579cbcdb185 network::switches::kExplicitlyAllowedPorts, service_manager::switches::kDisableInProcessStackTraces, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index 6e9192ef4971407044907a6e03e74d027a42bbe4..367e9b2e639d4afb444f7dc046f1af8d31f54dd1 100644 +index 82907ab82b3001b523380b0e6e5deec02eac9877..b1041569ceb3555b4b53d1349934990cbaeb9d15 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -2762,6 +2762,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( +@@ -2753,6 +2753,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); diff --git a/patches/common/chromium/disable_hidden.patch b/patches/common/chromium/disable_hidden.patch index fbc7f29e8ce3..8bb98593bd0e 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 71921db88ea355a75a639e054ec620e7598a31dd..e5218e55cbde7fba664b50af8e3502d635efd66e 100644 +index 40307f946099ea7ff1f438860f5d70acd9b979d1..1515dcfff07c6483217bc37e6897b3385eba1343 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -760,6 +760,9 @@ void RenderWidgetHostImpl::WasHidden() { +@@ -766,6 +766,9 @@ void RenderWidgetHostImpl::WasHidden() { if (is_hidden_) return; @@ -19,7 +19,7 @@ index 71921db88ea355a75a639e054ec620e7598a31dd..e5218e55cbde7fba664b50af8e3502d6 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 0029b0741fb0c4c06f64c6ef11346bcdb734b482..49387134a707ea860e845e67348ef3d8947023ef 100644 +index b6a90bdd0122bbf25b89e3b38032ff86b1fdf1e0..125c6bf091ce2b2eca308e72b31f5aec6351f827 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -153,6 +153,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 7c1cea65dbf3..3599571f4383 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 79137c8fd5dc6ec797947c686377c67a596d5292..f651c04ec2550fd90a460e74534cdcd7030cc308 100644 +index 240fe379aac8bb128b54d43cc948cf74dff20371..e43d7f8af16d0bebd0852b769b4d52973fca7aea 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -3661,7 +3661,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, +@@ -3664,7 +3664,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 7a3bac698896..e6240a2275a6 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 ae2ac6f53e8a8b4eaa0558ede73820046cb8daf1..ca3eecd80816de19cebdc84d61ecefb25272c9e1 100644 +index b2a004631a2bc40cd2b3c354deb4815cfe66fdec..861130f88dbe2fba111fa27195dcdb74e21f37ea 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1751,7 +1751,7 @@ jumbo_source_set("blink_platform_unittests_sources") { +@@ -1738,7 +1738,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/frame_host_manager.patch b/patches/common/chromium/frame_host_manager.patch index df5cec0b1a36..ac926d0fc88c 100644 --- a/patches/common/chromium/frame_host_manager.patch +++ b/patches/common/chromium/frame_host_manager.patch @@ -108,7 +108,7 @@ index 11643f592deea8ae4a399ab650420d525fc4d13c..2058c5a4a1e0622c94f12e6aa2000c0e } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 0d81568785aa06d5c15a02f569f13aa06178af50..925cc7dbe126ebb4eded12de34b93cb1a35ee8c4 100644 +index 09a2a50fdbd76d24d547bf5e22f9a0a93bd9a126..fb1f74b71c9e51c5d8c12adfff586bb57a7b6407 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -51,6 +51,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info, @@ -129,7 +129,7 @@ index 0d81568785aa06d5c15a02f569f13aa06178af50..925cc7dbe126ebb4eded12de34b93cb1 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 5cdf8a997c12fe5bb9685f92f98b0f90c756b469..63496fd120aeb0168787cf33deecb5e53bb96f32 100644 +index a70f357b97da1a24b02e9a7b29504c63b2c780fb..08089579500c860880b9c1bd32816095ca05ed27 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -210,8 +210,37 @@ CONTENT_EXPORT void OverrideOnBindInterface( diff --git a/patches/common/chromium/gtk_visibility.patch b/patches/common/chromium/gtk_visibility.patch index 76a06572036b..9112f8691b81 100644 --- a/patches/common/chromium/gtk_visibility.patch +++ b/patches/common/chromium/gtk_visibility.patch @@ -6,7 +6,7 @@ Subject: gtk_visibility.patch Allow electron to depend on GTK in the GN build. diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn -index 6624d138e14ad0af8c90f91f27c6495c4f07d64d..d5ddbfe6f4dd4255cd0ad487d4546c546c201b16 100644 +index d78f7407c179fe44180800a234e9461c56849402..dae8fa63037803ebaf2e04fb2b9547d2db7ba29c 100644 --- a/build/config/linux/gtk/BUILD.gn +++ b/build/config/linux/gtk/BUILD.gn @@ -26,6 +26,7 @@ group("gtk") { diff --git a/patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch b/patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch index 0dcdffc24ebd..78d6871d9c47 100644 --- a/patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch +++ b/patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch @@ -7,7 +7,7 @@ Removes usage of the _LSSetApplicationLaunchServicesServerConnectionStatus private API. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc -index a9ce636e512a7f013ff8d258d7eeddee1ec2a490..b8ec4e1c966b54a2a0a2bba154b5813313f6ddf6 100644 +index dbd925422894096998c8d4b45a40a4fd2331985c..f1f7f12a1deb9dba045c0a93a5249b48bfa4855e 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -278,8 +278,10 @@ int GpuMain(const MainFunctionParams& parameters) { diff --git a/patches/common/chromium/mas_no_private_api.patch b/patches/common/chromium/mas_no_private_api.patch index de67ed4330af..2a0345315e36 100644 --- a/patches/common/chromium/mas_no_private_api.patch +++ b/patches/common/chromium/mas_no_private_api.patch @@ -38,10 +38,10 @@ 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 d5278b6183dcc9f52d179deea44c1421d63d80d0..2779bdb9caf44797fd99ce54b2c04a0078090e66 100644 +index aa15efe9a195a0b46cf95125dd9259b6df21377e..375ab8bed85a3d8966053bee2111c04132be61fb 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm -@@ -135,6 +135,7 @@ NSDictionary* attributeToMethodNameMap = nil; +@@ -140,6 +140,7 @@ NSDictionary* attributeToMethodNameMap = nil; // VoiceOver uses -1 to mean "no limit" for AXResultsLimit. const int kAXResultsLimitNoLimit = -1; @@ -49,7 +49,7 @@ index d5278b6183dcc9f52d179deea44c1421d63d80d0..2779bdb9caf44797fd99ce54b2c04a00 extern "C" { // The following are private accessibility APIs required for cursor navigation -@@ -341,6 +342,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange( +@@ -344,6 +345,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange( AddMisspelledTextAttributes(text_only_objects, attributed_text); return [attributed_text attributedSubstringFromRange:range]; } @@ -60,6 +60,7 @@ index d5278b6183dcc9f52d179deea44c1421d63d80d0..2779bdb9caf44797fd99ce54b2c04a00 @@ -595,7 +597,9 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; {NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"}, {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, + {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, +#ifndef MAS_BUILD {NSAccessibilityEndTextMarkerAttribute, @"endTextMarker"}, @@ -85,7 +86,7 @@ index d5278b6183dcc9f52d179deea44c1421d63d80d0..2779bdb9caf44797fd99ce54b2c04a00 {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1052,6 +1060,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; +@@ -1143,6 +1151,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; ax::mojom::Restriction::kDisabled]; } @@ -181,7 +182,7 @@ index d5278b6183dcc9f52d179deea44c1421d63d80d0..2779bdb9caf44797fd99ce54b2c04a00 return nil; } diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm -index ab88c41570171c5105218a4f2dc38f07caf7e1d8..a030824642277cb11ae7da874d33797c506e94ad 100644 +index 7fe7130abd6a4844dd503b9cee198c8204cb0985..3e6b0ad576d3aa9951f84f6ce4175d84ffd67036 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm @@ -463,6 +463,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: @@ -201,7 +202,7 @@ index ab88c41570171c5105218a4f2dc38f07caf7e1d8..a030824642277cb11ae7da874d33797c } diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm -index b7142c2871faf4a0ba8be79266e9515d81585bdd..3d80c332e9af280a166612f6be54b6f767d729a1 100644 +index d6e9a7064687abfcf5fa874ee0a454806586db04..7c7db44d8d66ca1f9ad570abf552b6454cc0eac0 100644 --- a/content/renderer/renderer_main_platform_delegate_mac.mm +++ b/content/renderer/renderer_main_platform_delegate_mac.mm @@ -23,9 +23,11 @@ @@ -211,7 +212,7 @@ index b7142c2871faf4a0ba8be79266e9515d81585bdd..3d80c332e9af280a166612f6be54b6f7 +#ifndef MAS_BUILD extern "C" { CGError CGSSetDenyWindowServerConnections(bool); - }; + } +#endif namespace content { @@ -347,7 +348,7 @@ index e524aa7b851022abed1edac39e18d8d92e5349b4..718d3f963da5c1a15a1bdb0e6043f89b } diff --git a/sandbox/mac/seatbelt.cc b/sandbox/mac/seatbelt.cc -index dfba0bded9e34be276ed111cbab44210a95b9875..876f96999f53b4666508f783a33cea245d1bc03e 100644 +index e0c31170acd13c9997c6b1d04c6de1420feaf422..0e561f97b33380bfbe52e64c2c4a6988095e8074 100644 --- a/sandbox/mac/seatbelt.cc +++ b/sandbox/mac/seatbelt.cc @@ -64,7 +64,11 @@ void Seatbelt::FreeError(char* errorbuf) { diff --git a/patches/common/chromium/out_of_process_instance.patch b/patches/common/chromium/out_of_process_instance.patch index 78da4ba0464b..4756642edea3 100644 --- a/patches/common/chromium/out_of_process_instance.patch +++ b/patches/common/chromium/out_of_process_instance.patch @@ -5,7 +5,7 @@ Subject: out_of_process_instance.patch diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc -index 7ef9271e59d7e6841150975f8b74b3565a6aaae5..23502ff1f08b7332eb32121f52f040520241b084 100644 +index 109f45633e2ccc1f6c6c8e65176b97b86caad7c4..eb706c59d4e7a9fc270f502a43fc038f21c455a1 100644 --- a/pdf/out_of_process_instance.cc +++ b/pdf/out_of_process_instance.cc @@ -462,7 +462,9 @@ bool OutOfProcessInstance::Init(uint32_t argc, diff --git a/patches/common/chromium/pepper_flash.patch b/patches/common/chromium/pepper_flash.patch index 52b777f7fff7..3b6f61da2801 100644 --- a/patches/common/chromium/pepper_flash.patch +++ b/patches/common/chromium/pepper_flash.patch @@ -179,7 +179,7 @@ index 154120ce5156d77dd302b85cb17e2f14fb69cc2d..5152fd847c012fc2f40017687db426fa DISALLOW_COPY_AND_ASSIGN(PepperFlashBrowserHost); diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc -index 1644f1233e2ae3142f7c9b450b0af97ae7325abc..bac25204c3afa7b87ed9e2861f96b5168b3e8aa6 100644 +index b007195efb9202f2cc8aeeb20821afbf5e8af74d..50b50a5eb48cc4efb71ffa0719bcd1f0363853e1 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc @@ -20,6 +20,7 @@ diff --git a/patches/common/chromium/printing.patch b/patches/common/chromium/printing.patch index 424752fbac30..7d9cd837992a 100644 --- a/patches/common/chromium/printing.patch +++ b/patches/common/chromium/printing.patch @@ -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 df6cdee86c1bc34eef013f7d36deb77a8dfa7ecb..2692f831de4699b68a5b79982d440c318e40da69 100644 +index a864d0b52c7c00689508454bcdcab9f018c9ac0a..0baf39c25bbcfa3c4987c0be60992315f33631b0 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -22,6 +22,7 @@ @@ -283,7 +283,7 @@ index 1802034a6e15a6ad8b0d9591cfb79ba5873dc982..a827091facdb4f6b1d74ce826c3492ce // 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 56e2dd5faf2b8db0b1dc9da41b310600d9298267..ea0e7243e09ef8664d61a73033e55b11ea5cdba1 100644 +index 560a6e4d12c90958c3dbe858c446e50f8ff0d020..7c4be124adeaf0535191da9ff339e9bf33b378a0 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -1109,7 +1109,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { @@ -438,10 +438,10 @@ index 56e2dd5faf2b8db0b1dc9da41b310600d9298267..ea0e7243e09ef8664d61a73033e55b11 Send(new PrintHostMsg_ShowInvalidPrinterSettingsError(routing_id())); return false; diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h -index 34690801675c8b049d195e37f4fa400c6b30a644..2587534c550612809a4235f4ff92cc6fa962765c 100644 +index c4effb05d16cd67acf3d8140d25eb33fb4814dc3..0660062708438a2de7132b1a39dcbac85f8b8cbf 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h -@@ -192,7 +192,9 @@ class PrintRenderFrameHelper +@@ -193,7 +193,9 @@ class PrintRenderFrameHelper bool OnMessageReceived(const IPC::Message& message) override; // Message handlers --------------------------------------------------------- @@ -452,7 +452,7 @@ index 34690801675c8b049d195e37f4fa400c6b30a644..2587534c550612809a4235f4ff92cc6f void OnPrintForSystemDialog(); #if BUILDFLAG(ENABLE_PRINT_PREVIEW) void OnInitiatePrintPreview(bool has_selection); -@@ -243,7 +245,10 @@ class PrintRenderFrameHelper +@@ -244,7 +246,10 @@ class PrintRenderFrameHelper // WARNING: |this| may be gone after this method returns. void Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -464,7 +464,7 @@ index 34690801675c8b049d195e37f4fa400c6b30a644..2587534c550612809a4235f4ff92cc6f // Notification when printing is done - signal tear-down/free resources. void DidFinishPrinting(PrintingResult result); -@@ -252,12 +257,14 @@ class PrintRenderFrameHelper +@@ -253,12 +258,14 @@ class PrintRenderFrameHelper // Initialize print page settings with default settings. // Used only for native printing workflow. diff --git a/patches/common/chromium/scroll_bounce_flag.patch b/patches/common/chromium/scroll_bounce_flag.patch index c47489aba8bf..1dc0569288c6 100644 --- a/patches/common/chromium/scroll_bounce_flag.patch +++ b/patches/common/chromium/scroll_bounce_flag.patch @@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch Patch to make scrollBounce option work. diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 907515941950118a72c9b5d2e742c702e2f7a029..452e70befa2c02635d7f7c4827d38d910bc985fd 100644 +index 44d963793f143530704a0a06273e51d7c68766cc..5cea319fea51e27f6bd5be7221bafb186b2a3973 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1543,7 +1543,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { +@@ -1535,7 +1535,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/common/chromium/ssl_security_state_tab_helper.patch b/patches/common/chromium/ssl_security_state_tab_helper.patch index 1b6430519559..84406e32177b 100644 --- a/patches/common/chromium/ssl_security_state_tab_helper.patch +++ b/patches/common/chromium/ssl_security_state_tab_helper.patch @@ -6,10 +6,10 @@ Subject: ssl_security_state_tab_helper.patch Allows populating security tab info for devtools in Electron. diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc -index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae5747fc994f 100644 +index d27ed1f62bfa6f550f88acd97638fc51f666e38c..186bc75254e81309a8cd33364916b4f8db3d5937 100644 --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc -@@ -12,16 +12,20 @@ +@@ -12,10 +12,12 @@ #include "base/strings/pattern.h" #include "base/strings/string_util.h" #include "build/build_config.h" @@ -22,15 +22,7 @@ index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae57 #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/secure_origin_whitelist.h" - #include "components/omnibox/browser/omnibox_field_trial.h" - #include "components/prefs/pref_service.h" -+#if 0 - #include "components/safe_browsing/features.h" -+#endif - #include "components/security_state/content/content_utils.h" - #include "content/public/browser/browser_context.h" - #include "content/public/browser/navigation_entry.h" -@@ -42,7 +46,7 @@ +@@ -41,7 +43,7 @@ #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" #endif // defined(OS_CHROMEOS) @@ -39,7 +31,7 @@ index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae57 #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #endif -@@ -78,7 +82,9 @@ bool IsOriginSecureWithWhitelist( +@@ -77,7 +79,9 @@ bool IsOriginSecureWithWhitelist( } // namespace @@ -49,7 +41,7 @@ index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae57 SecurityStateTabHelper::SecurityStateTabHelper( content::WebContents* web_contents) -@@ -138,6 +144,7 @@ void SecurityStateTabHelper::DidFinishNavigation( +@@ -137,6 +141,7 @@ void SecurityStateTabHelper::DidFinishNavigation( UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true); } @@ -57,7 +49,7 @@ index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae57 // Security indicator UI study (https://crbug.com/803501): Show a message in // the console to reduce developer confusion about the experimental UI // treatments for HTTPS pages with EV certificates. -@@ -165,6 +172,7 @@ void SecurityStateTabHelper::DidFinishNavigation( +@@ -164,6 +169,7 @@ void SecurityStateTabHelper::DidFinishNavigation( "Validation is still valid."); } } @@ -65,7 +57,7 @@ index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae57 } void SecurityStateTabHelper::DidChangeVisibleSecurityState() { -@@ -190,6 +198,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { +@@ -189,6 +195,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { web_contents()->GetController().GetVisibleEntry(); if (!entry) return security_state::MALICIOUS_CONTENT_STATUS_NONE; @@ -73,7 +65,7 @@ index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae57 safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -259,6 +268,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { +@@ -256,6 +263,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { break; } } @@ -81,7 +73,7 @@ index 254f203e4db90b9ad09022409defc82a6dfa6100..3f121d32629920284ed45201f423ae57 return security_state::MALICIOUS_CONTENT_STATUS_NONE; } -@@ -277,15 +287,19 @@ std::vector SecurityStateTabHelper::GetSecureOriginsAndPatterns() +@@ -274,15 +282,19 @@ std::vector SecurityStateTabHelper::GetSecureOriginsAndPatterns() const { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); diff --git a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch index 1da673ef7b94..bb012e0ff3b8 100644 --- a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,10 +22,10 @@ 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 7298233ed0d7cac416219e724c12f06d1ff89d2f..ff7055422d086c0006f45561f17a80d116266234 100644 +index 1c602b87aed88a2487384e345b413cfcb951b278..24945f4ae42441ad0c0f58f8a1574afde832aa99 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -423,6 +423,10 @@ class RendererSandboxedProcessLauncherDelegate +@@ -424,6 +424,10 @@ class RendererSandboxedProcessLauncherDelegate : public SandboxedProcessLauncherDelegate { public: RendererSandboxedProcessLauncherDelegate() {} @@ -36,7 +36,7 @@ index 7298233ed0d7cac416219e724c12f06d1ff89d2f..ff7055422d086c0006f45561f17a80d1 ~RendererSandboxedProcessLauncherDelegate() override {} -@@ -442,6 +446,9 @@ class RendererSandboxedProcessLauncherDelegate +@@ -443,6 +447,9 @@ class RendererSandboxedProcessLauncherDelegate #if BUILDFLAG(USE_ZYGOTE_HANDLE) service_manager::ZygoteHandle GetZygote() override { @@ -46,7 +46,7 @@ index 7298233ed0d7cac416219e724c12f06d1ff89d2f..ff7055422d086c0006f45561f17a80d1 const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); base::CommandLine::StringType renderer_prefix = -@@ -455,6 +462,11 @@ class RendererSandboxedProcessLauncherDelegate +@@ -456,6 +463,11 @@ class RendererSandboxedProcessLauncherDelegate service_manager::SandboxType GetSandboxType() override { return service_manager::SANDBOX_TYPE_RENDERER; } @@ -58,7 +58,7 @@ index 7298233ed0d7cac416219e724c12f06d1ff89d2f..ff7055422d086c0006f45561f17a80d1 }; const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey"; -@@ -1745,11 +1757,18 @@ bool RenderProcessHostImpl::Init() { +@@ -1749,11 +1761,18 @@ bool RenderProcessHostImpl::Init() { cmd_line->PrependWrapper(renderer_prefix); AppendRendererCommandLine(cmd_line.get()); diff --git a/patches/common/chromium/tts.patch b/patches/common/chromium/tts.patch index a05f05976be4..b3281607da9b 100644 --- a/patches/common/chromium/tts.patch +++ b/patches/common/chromium/tts.patch @@ -30,7 +30,7 @@ index 0390cfe18859a4b7086b275b62121199473434fb..b9adf92701546ea8f8fa8258d987fa0c } diff --git a/chrome/browser/speech/tts_message_filter.cc b/chrome/browser/speech/tts_message_filter.cc -index 404cdf05dab2262b001a4088666b27da175b65ac..d1cb67ef188b093cb75f37ac1258c2841c171d00 100644 +index 4bcd4347ccf2640069d025cbcd2a0f5ce6e1a8b6..f73d197ac527cd6626fd992dd75e1ba8157e4514 100644 --- a/chrome/browser/speech/tts_message_filter.cc +++ b/chrome/browser/speech/tts_message_filter.cc @@ -10,8 +10,11 @@ diff --git a/patches/common/chromium/web_contents.patch b/patches/common/chromium/web_contents.patch index 0defb470df16..f17428460c1c 100644 --- a/patches/common/chromium/web_contents.patch +++ b/patches/common/chromium/web_contents.patch @@ -5,10 +5,10 @@ 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 11ee9803f85e3b9fb2a33d670bf261f825304f3e..17e543a5933d3399c6427b536dce9d27200c7484 100644 +index 69498d1369aa2722fafaeecdebd27edf2d00e34b..55a43dc6dd9d0d046693902dd25cd771dcc56a79 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -2041,6 +2041,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2049,6 +2049,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -21,7 +21,7 @@ index 11ee9803f85e3b9fb2a33d670bf261f825304f3e..17e543a5933d3399c6427b536dce9d27 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -2056,6 +2062,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2064,6 +2070,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { &render_view_host_delegate_view_); } } diff --git a/patches/common/chromium/worker_context_will_destroy.patch b/patches/common/chromium/worker_context_will_destroy.patch index 130e98da4b52..3f1ef5b8579b 100644 --- a/patches/common/chromium/worker_context_will_destroy.patch +++ b/patches/common/chromium/worker_context_will_destroy.patch @@ -5,7 +5,7 @@ Subject: worker_context_will_destroy.patch diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index 0bca8dc6a55ef6035aa680bff406390c61babb68..15f4eaba8f4a751018ebc41a6d198fcb669a0774 100644 +index fd33e51221676c6315aec8db4aa469d4805dab8a..af15512b6d26bf79413e34a590d664a56d78828d 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -379,6 +379,11 @@ class CONTENT_EXPORT ContentRendererClient { @@ -62,10 +62,10 @@ index d7ac7d96ad5c3e20075948c329a6d5ede0ae7a38..66881ba9b2511ef39e58c983907ec189 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 b7d47b3b7df0948ee98ae75c7ea3997da48a43ff..6ce656df9602d3d88c6f4e451cbb5eee830a0e23 100644 +index e55b99843fa42056197875b883a944f6de4ad79d..eb1508065eee7235816e2d6047220291007324e4 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -556,6 +556,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -559,6 +559,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { SetExitCode(ExitCode::kGracefullyTerminated); }