From 33129c9ecb1d03f493ce2f396d3281957cb48c00 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sun, 20 Oct 2019 20:45:11 -0700 Subject: [PATCH] chore: update chromium patches --- patches/chromium/.patches | 4 - ...client_precreatemessageloop_callback.patch | 6 +- patches/chromium/add_realloc.patch | 4 +- ...dd_zoom_limit_setters_to_webcontents.patch | 14 +-- patches/chromium/blink_local_frame.patch | 6 +- patches/chromium/blink_world_context.patch | 18 ++-- .../build_add_electron_tracing_category.patch | 4 +- ...n_building_with_enable_plugins_false.patch | 74 --------------- .../build_win_disable_zc_twophase.patch | 36 -------- patches/chromium/can_create_window.patch | 30 +++--- .../chromium/content_browser_main_loop.patch | 4 +- patches/chromium/dcheck.patch | 10 +- patches/chromium/disable-redraw-lock.patch | 8 +- .../disable_color_correct_rendering.patch | 72 +++++++-------- .../disable_compositor_recycling.patch | 4 +- patches/chromium/disable_hidden.patch | 8 +- ...requirement_for_beforeunload_dialogs.patch | 4 +- .../exclude-a-few-test-files-from-build.patch | 4 +- ...xpose_setuseragent_on_networkcontext.patch | 16 ++-- ..._usage_of_setapplicationisdaemon_and.patch | 6 +- patches/chromium/frame_host_manager.patch | 26 +++--- .../gin_enable_disable_v8_platform.patch | 2 +- .../chromium/gritsettings_resource_ids.patch | 4 +- patches/chromium/ignore_rc_check.patch | 25 ----- patches/chromium/libgtkui_export.patch | 65 +------------ .../mas-cgdisplayusesforcetogray.patch | 10 +- ...launchservicesserverconnectionstatus.patch | 23 ----- .../chromium/mas_blink_no_private_api.patch | 8 +- patches/chromium/mas_no_private_api.patch | 40 ++++---- ...emote_certificate_verification_logic.patch | 42 ++++----- .../chromium/notification_provenance.patch | 12 +-- .../chromium/out_of_process_instance.patch | 4 +- patches/chromium/printing.patch | 91 +++++++++---------- patches/chromium/proxy_config_monitor.patch | 13 +-- ...put_back_deleted_colors_for_autofill.patch | 2 +- .../render_widget_host_view_mac.patch | 2 +- patches/chromium/resource_file_conflict.patch | 6 +- patches/chromium/scroll_bounce_flag.patch | 4 +- .../ssl_security_state_tab_helper.patch | 16 ++-- .../support_mixed_sandbox_with_zygote.patch | 10 +- .../chromium/ui_views_fix_jumbo_build.patch | 4 +- ...andboxed_ppapi_processes_skip_zygote.patch | 4 +- patches/chromium/web_contents.patch | 8 +- .../worker_context_will_destroy.patch | 16 ++-- 44 files changed, 274 insertions(+), 495 deletions(-) delete mode 100644 patches/chromium/build_fix_when_building_with_enable_plugins_false.patch delete mode 100644 patches/chromium/build_win_disable_zc_twophase.patch delete mode 100644 patches/chromium/ignore_rc_check.patch delete mode 100644 patches/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 9c3096bf8e50b..a0c1bd473f2b1 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -34,8 +34,6 @@ scroll_bounce_flag.patch mas-cfisobjc.patch mas-cgdisplayusesforcetogray.patch mas-audiodeviceduck.patch -mas-lssetapplicationlaunchservicesserverconnectionstatus.patch -ignore_rc_check.patch chrome_key_systems.patch allow_nested_error_trackers.patch blink_initialization_order.patch @@ -68,7 +66,6 @@ crashpad_pid_check.patch preconnect_feature.patch network_service_allow_remote_certificate_verification_logic.patch put_back_deleted_colors_for_autofill.patch -build_win_disable_zc_twophase.patch disable_color_correct_rendering.patch add_contentgpuclient_precreatemessageloop_callback.patch picture-in-picture.patch @@ -79,5 +76,4 @@ feat_add_set_theme_source_to_allow_apps_to.patch revert_cleanup_remove_menu_subtitles_sublabels.patch ui_views_fix_jumbo_build.patch export_fetchapi_mojo_traits_to_fix_component_build.patch -build_fix_when_building_with_enable_plugins_false.patch add_zoom_limit_setters_to_webcontents.patch diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch index e043bfc175f90..f55cf15774016 100644 --- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch +++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch @@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set. This should be upstreamed. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc -index 4373f508964cb1e9fd51c952122ac2f41fb35ae9..065a7a57b77f1e3bf5e03fac900f1936d48ad4ff 100644 +index 0de66bc85b1d392fba44858e3a478d918e538393..a21e318b2108223bb4ca6a74d3c654c3ad7ba77a 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc -@@ -236,6 +236,10 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -228,6 +228,10 @@ int GpuMain(const MainFunctionParams& parameters) { logging::SetLogMessageHandler(GpuProcessLogMessageHandler); @@ -24,7 +24,7 @@ index 4373f508964cb1e9fd51c952122ac2f41fb35ae9..065a7a57b77f1e3bf5e03fac900f1936 // We are experiencing what appear to be memory-stomp issues in the GPU // process. These issues seem to be impacting the task executor and listeners // registered to it. Create the task executor on the heap to guard against -@@ -349,7 +353,6 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -336,7 +340,6 @@ int GpuMain(const MainFunctionParams& parameters) { GpuProcess gpu_process(io_thread_priority); #endif diff --git a/patches/chromium/add_realloc.patch b/patches/chromium/add_realloc.patch index 0ed46e26c4649..db7091954550c 100644 --- a/patches/chromium/add_realloc.patch +++ b/patches/chromium/add_realloc.patch @@ -70,10 +70,10 @@ index ac76d127b96b80c8260a7e2cda0b669cd98787ad..dcab64586700a8740262aede8dba2755 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 ee7c89a4950d6b3c97a810c41a62fee7e372018d..c2b60f20a72cca46d05af369f33d9c19395b34ef 100644 +index 4b398f937d106a004d8988507c9de29aef3893cc..2fac2b40ff96f9109622536b295e7bfd474a5507 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 -@@ -140,6 +140,7 @@ class WTF_EXPORT ArrayBufferContents { +@@ -142,6 +142,7 @@ class WTF_EXPORT ArrayBufferContents { void CopyTo(ArrayBufferContents& other); static void* AllocateMemoryOrNull(size_t, InitializationPolicy); diff --git a/patches/chromium/add_zoom_limit_setters_to_webcontents.patch b/patches/chromium/add_zoom_limit_setters_to_webcontents.patch index 56a923402aed2..c4e0ec23dadab 100644 --- a/patches/chromium/add_zoom_limit_setters_to_webcontents.patch +++ b/patches/chromium/add_zoom_limit_setters_to_webcontents.patch @@ -8,10 +8,10 @@ This is needed by Electron to allow apps to limit how much an app can zoom in or out. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 8586f71224f1cae6a5e9b4005a6acfef9ff64d4d..4d4dce8124312d46f90db8d2fc59bd0b7acd498d 100644 +index f86de74bd99a3d4442c48e4f7a939a224d5e7880..6eb9812b1fb6db330e9d78a950945a71a2a5d386 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4142,10 +4142,18 @@ bool WebContentsImpl::GetClosedByUserGesture() { +@@ -4114,10 +4114,18 @@ bool WebContentsImpl::GetClosedByUserGesture() { return closed_by_user_gesture_; } @@ -31,10 +31,10 @@ index 8586f71224f1cae6a5e9b4005a6acfef9ff64d4d..4d4dce8124312d46f90db8d2fc59bd0b return maximum_zoom_percent_; } diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 72f7570ed92886e97629116fec98c1c4dcf95f52..e876929be3df7ba7251886a56acf9b84bbe62e32 100644 +index 00784b26b0550f165da2ccd759d5b4969654322a..4b8ba57528922f301973ab0e063faeb2d857ac0a 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -450,7 +450,9 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -448,7 +448,9 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void SystemDragEnded(RenderWidgetHost* source_rwh) override; void SetClosedByUserGesture(bool value) override; bool GetClosedByUserGesture() override; @@ -44,7 +44,7 @@ index 72f7570ed92886e97629116fec98c1c4dcf95f52..e876929be3df7ba7251886a56acf9b84 int GetMaximumZoomPercent() override; void SetPageScale(float page_scale_factor) override; gfx::Size GetPreferredSize() override; -@@ -1714,8 +1716,8 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -1700,8 +1702,8 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, bool closed_by_user_gesture_; // Minimum/maximum zoom percent. @@ -56,10 +56,10 @@ index 72f7570ed92886e97629116fec98c1c4dcf95f52..e876929be3df7ba7251886a56acf9b84 // Used to correctly handle integer zooming through a smooth scroll device. float zoom_scroll_remainder_; diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index 94a5b87ca72998729f1fca14f247914bb81d60d1..3af575d51d0a36f9586a3cfc00575e83e70a46b9 100644 +index 750de66b8002ba66d0f2247d0075da1e51ac764c..1a57feeb1dfe08f8ce1113cb5d8c8ab57d761094 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h -@@ -808,8 +808,10 @@ class WebContents : public PageNavigator, +@@ -812,8 +812,10 @@ class WebContents : public PageNavigator, virtual void SetClosedByUserGesture(bool value) = 0; virtual bool GetClosedByUserGesture() = 0; diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index c69553951b524..12035dcb39500 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/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 0c69b3af9d2144b5d4d61e2d4add7edec839d0b5..acfba2544f6329348f60dd92ca5d9865960db371 100644 +index b763d49df0f489b109429be79466dc285d05e82a..c4ad53f34f9824175c4407d728da0a85d43dfec6 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -325,10 +325,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -333,10 +333,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index 0c69b3af9d2144b5d4d61e2d4add7edec839d0b5..acfba2544f6329348f60dd92ca5d9865 if (!Client()) return; -@@ -346,6 +342,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -354,6 +350,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/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index eec47c64f99bb..c84be9d929269 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/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 900c1e97bd5b8ad113def9001be495cae94bbcdf..6cec8d0bdfce94fd3980eb7509dfced79903f0d6 100644 +index 110c9cb161a091d7fc34b562c6be6677f059bee4..e923eb17d8293cc60982766153c90a3405e94829 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h -@@ -356,6 +356,9 @@ class WebLocalFrame : public WebFrame { +@@ -346,6 +346,9 @@ class WebLocalFrame : public WebFrame { // be calling this API. virtual v8::Local MainWorldScriptContext() const = 0; @@ -19,10 +19,10 @@ index 900c1e97bd5b8ad113def9001be495cae94bbcdf..6cec8d0bdfce94fd3980eb7509dfced7 // 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 bb640f13de34de5d966d97cf617faa3cb3fd54c2..686cddd0755ee219eaf367b3ce84320aeeb5053d 100644 +index 8141b17a4aa595288837ab006be9b5a09837e6ab..664baf8849f35411a70230b72d047391face9015 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 -@@ -879,6 +879,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { +@@ -880,6 +880,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { return MainWorldScriptContext()->Global(); } @@ -37,15 +37,15 @@ index bb640f13de34de5d966d97cf617faa3cb3fd54c2..686cddd0755ee219eaf367b3ce84320a 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 ab52cef219785766b1315ec7e17d15c2ba2d6138..cf12b32172a0dc814a1478c275d1b5c067d5eaeb 100644 +index c9dbed953b494e39a31f33340450efbc99cc973a..66957c0503087ad39d1a153a9f9511a238395aac 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 -@@ -150,6 +150,8 @@ class CORE_EXPORT WebLocalFrameImpl final +@@ -171,6 +171,8 @@ class CORE_EXPORT WebLocalFrameImpl final int argc, v8::Local argv[]) override; v8::Local MainWorldScriptContext() const override; + v8::Local WorldScriptContext( + v8::Isolate* isolate, int world_id) const override; - v8::Local GlobalProxy() const override; - void StartReload(WebFrameLoadType) override; - void ReloadImage(const WebNode&) override; + void RequestExecuteScriptAndReturnValue(const WebScriptSource&, + bool user_gesture, + WebScriptExecutionCallback*) override; diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch index b2a02cd8f7542..a60b298671fd0 100644 --- a/patches/chromium/build_add_electron_tracing_category.patch +++ b/patches/chromium/build_add_electron_tracing_category.patch @@ -8,10 +8,10 @@ categories in use are known / declared. This patch is required for us to introduce a new Electron category for Electron-specific tracing. diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index dcb32a5eadb7fc3c431099107bdfdfba8764a187..e1a343fdbdc6098189bce9fc1d81e6df5555e7ab 100644 +index 14fd70d103a707a4aa217f662037908178daf9cf..30011a1bda4ba3c11aa1811649730e781ccb5cbf 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -63,6 +63,7 @@ +@@ -66,6 +66,7 @@ X("dwrite") \ X("DXVA Decoding") \ X("EarlyJava") \ diff --git a/patches/chromium/build_fix_when_building_with_enable_plugins_false.patch b/patches/chromium/build_fix_when_building_with_enable_plugins_false.patch deleted file mode 100644 index 7c7d3ce54d20f..0000000000000 --- a/patches/chromium/build_fix_when_building_with_enable_plugins_false.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: deepak1556 -Date: Tue, 8 Oct 2019 15:40:50 +0000 -Subject: build: fix when building with enable_plugins=false - -Bug: none -Change-Id: If878b3a7f5bb051c6e99c617418475c12754ae90 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1845624 -Reviewed-by: Robert Sesek -Commit-Queue: Robert Sesek -Cr-Commit-Position: refs/heads/master@{#703739} - -diff --git a/AUTHORS b/AUTHORS -index 6714e69599bc87c47663bec740b91e352ef92780..41aa5584412e4a325d2360691b00c43d7b08f1bb 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -223,6 +223,7 @@ Debashish Samantaray - Debug Wang - Deepak Dilip Borade - Deepak Mittal -+Deepak Mohan - Deepak Sharma - Deepak Singla - Deokjin Kim -diff --git a/content/browser/sandbox_parameters_mac.mm b/content/browser/sandbox_parameters_mac.mm -index 5eead918eb9d9df03c86b5201b3f924643707f4b..a12cc8734c45a4ebb29672306da3a695a883eb9b 100644 ---- a/content/browser/sandbox_parameters_mac.mm -+++ b/content/browser/sandbox_parameters_mac.mm -@@ -25,12 +25,16 @@ - #include "content/public/common/content_client.h" - #include "content/public/common/content_features.h" - #include "content/public/common/content_switches.h" --#include "content/public/common/pepper_plugin_info.h" -+#include "ppapi/buildflags/buildflags.h" - #include "sandbox/mac/seatbelt_exec.h" - #include "services/service_manager/sandbox/mac/sandbox_mac.h" - #include "services/service_manager/sandbox/sandbox_type.h" - #include "services/service_manager/sandbox/switches.h" - -+#if BUILDFLAG(ENABLE_PLUGINS) -+#include "content/public/common/pepper_plugin_info.h" -+#endif -+ - namespace content { - - namespace { -@@ -148,6 +152,7 @@ void SetupNetworkSandboxParameters(sandbox::SeatbeltExecClient* client) { - } - } - -+#if BUILDFLAG(ENABLE_PLUGINS) - void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) { - SetupCommonSandboxParameters(client); - -@@ -172,6 +177,7 @@ void SetupPPAPISandboxParameters(sandbox::SeatbeltExecClient* client) { - // to n+1 more than the plugins added. - CHECK(index <= 5); - } -+#endif - - void SetupCDMSandboxParameters(sandbox::SeatbeltExecClient* client) { - SetupCommonSandboxParameters(client); -@@ -212,9 +218,11 @@ void SetupSandboxParameters(service_manager::SandboxType sandbox_type, - case service_manager::SANDBOX_TYPE_NETWORK: - SetupNetworkSandboxParameters(client); - break; -+#if BUILDFLAG(ENABLE_PLUGINS) - case service_manager::SANDBOX_TYPE_PPAPI: - SetupPPAPISandboxParameters(client); - break; -+#endif - case service_manager::SANDBOX_TYPE_PROFILING: - case service_manager::SANDBOX_TYPE_UTILITY: - SetupUtilitySandboxParameters(client, command_line); diff --git a/patches/chromium/build_win_disable_zc_twophase.patch b/patches/chromium/build_win_disable_zc_twophase.patch deleted file mode 100644 index 4fd433a7c4118..0000000000000 --- a/patches/chromium/build_win_disable_zc_twophase.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: deepak1556 -Date: Tue, 16 Jul 2019 14:38:52 -0700 -Subject: build_win_disable_zc_twophase.patch - -Temporarily disable /Zc:twoPhase when libcxx is not used on -Windows. This is to workaround the bug in crbug.com/969698#c10 -until fixes have landed in upstream. - -diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn -index a3a164b41b45381061c7fceb7d7ec1fdb4907792..8de0cb6a8d1987f84aaca5c3bb30ead0a2019bef 100644 ---- a/build/config/win/BUILD.gn -+++ b/build/config/win/BUILD.gn -@@ -2,6 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import("//build/config/c++/c++.gni") - import("//build/config/chrome_build.gni") - import("//build/config/clang/clang.gni") - import("//build/config/compiler/compiler.gni") -@@ -61,9 +62,13 @@ config("compiler") { - "/FS", # Preserve previous PDB behavior. - "/bigobj", # Some of our files are bigger than the regular limits. - "/utf-8", # Assume UTF-8 by default to avoid code page dependencies. -- "/Zc:twoPhase", - ] - -+ if (use_custom_libcxx) { -+ # Work around crbug.com/969698#c6, bug in MSSTL . -+ cflags += [ "/Zc:twoPhase" ] -+ } -+ - # Force C/C++ mode for the given GN detected file type. This is necessary - # for precompiled headers where the same source file is compiled in both - # modes. diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 22f266df2a042..30c031a9e4877 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/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 d6d88e7b66f2de4b6733ea454fc45bb804f13a0e..30e9eabf785a0f241e9581ea38f55dd779acd8ce 100644 +index fd3e99fad21564f50ca90645a122cfa621e98be9..46010d284602af98d6c91964325044a6c621d20c 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4054,6 +4054,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4354,6 +4354,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -17,10 +17,10 @@ index d6d88e7b66f2de4b6733ea454fc45bb804f13a0e..30e9eabf785a0f241e9581ea38f55dd7 &no_javascript_access); diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index f0d9cafca7efb0ae0440619b821b1976d8460396..e34e0e6387b907960d234da93a3e90a390488d02 100644 +index b7ef3588dcf10fe07448fc760693d3897b294593..d14bfc454e522982dc09793abbc9da88928e3f09 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom -@@ -313,6 +313,10 @@ struct CreateNewWindowParams { +@@ -314,6 +314,10 @@ struct CreateNewWindowParams { // The window features to use for the new window. blink.mojom.WindowFeatures features; @@ -32,10 +32,10 @@ index f0d9cafca7efb0ae0440619b821b1976d8460396..e34e0e6387b907960d234da93a3e90a3 // 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 a9fddd7dd2d3f5c07a3b15925209a396c9aa096d..da7eca5f443e2ecdcb3f0819848735aafeb43a00 100644 +index 696db8d4b5f0c6c8e333626fb0fd38d6e15ca1c9..398adadff5c00a4d39d1ea5f2e7eb32699e4f736 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -502,6 +502,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -506,6 +506,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -45,10 +45,10 @@ index a9fddd7dd2d3f5c07a3b15925209a396c9aa096d..da7eca5f443e2ecdcb3f0819848735aa 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 4e18dfd0dc8d4be9b59f12e7010b7f2be70d6cf0..07fa16953d6167a5a381b28a5da3c08a78de4306 100644 +index 73179d6d9e90daf0dd88b62002e6b03de20ac602..858fee141d6e8f53526c0a9d0502cb61177a9ba2 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -178,6 +178,7 @@ class RenderFrameHost; +@@ -184,6 +184,7 @@ class RenderFrameHost; class RenderProcessHost; class RenderViewHost; class ResourceContext; @@ -56,7 +56,7 @@ index 4e18dfd0dc8d4be9b59f12e7010b7f2be70d6cf0..07fa16953d6167a5a381b28a5da3c08a class SerialDelegate; class SiteInstance; class SpeechRecognitionManagerDelegate; -@@ -801,6 +802,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -812,6 +813,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -66,7 +66,7 @@ index 4e18dfd0dc8d4be9b59f12e7010b7f2be70d6cf0..07fa16953d6167a5a381b28a5da3c08a bool opener_suppressed, bool* no_javascript_access); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc -index 4a3c760000fca5f53244a03b9a2074991bc0c382..c5ab8ad81bf11d0ec151b9585a4f1a7f5397ae4b 100644 +index 899cf3b78c462c0e657bfc1e32a57d4804ad02d0..99e8b85f0348e3e96673e46585520026277730f3 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -71,6 +71,7 @@ @@ -75,9 +75,9 @@ index 4a3c760000fca5f53244a03b9a2074991bc0c382..c5ab8ad81bf11d0ec151b9585a4f1a7f #include "content/renderer/loader/request_extra_data.h" +#include "content/renderer/loader/web_url_request_util.h" #include "content/renderer/media/audio/audio_device_factory.h" - #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" #include "content/renderer/media/webrtc/rtc_peer_connection_handler.h" -@@ -1367,6 +1368,8 @@ WebView* RenderViewImpl::CreateView( + #include "content/renderer/render_frame_impl.h" +@@ -1344,6 +1345,8 @@ WebView* RenderViewImpl::CreateView( } params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features); @@ -87,10 +87,10 @@ index 4a3c760000fca5f53244a03b9a2074991bc0c382..c5ab8ad81bf11d0ec151b9585a4f1a7f // moved on send. bool is_background_tab = diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc -index 5faaea374484d51b1af261ff93fb96aec2eaa4e1..786d3a904a765b5cb53859c35a045b9e04b6250b 100644 +index c7ff828a8424ca9e42af900813e4348d3613957f..19c589caed5b5df80288c3cb828423e6a0d094d7 100644 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc -@@ -312,6 +312,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -314,6 +314,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -100,7 +100,7 @@ index 5faaea374484d51b1af261ff93fb96aec2eaa4e1..786d3a904a765b5cb53859c35a045b9e bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h -index 435f204a364e54b59c0bd651b760bf350ea94d11..1e6bee1fa08fa2d2a396678838d475e0e7e4ce0c 100644 +index 987f2228a312a3cb9c9a04dd682987d1af3f3fe0..30cde8a73a4ca67edd8f898ff63cf446f62bfc64 100644 --- a/content/shell/browser/web_test/web_test_content_browser_client.h +++ b/content/shell/browser/web_test/web_test_content_browser_client.h @@ -68,6 +68,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { diff --git a/patches/chromium/content_browser_main_loop.patch b/patches/chromium/content_browser_main_loop.patch index 6aa026772f6f0..86711d1e945d4 100644 --- a/patches/chromium/content_browser_main_loop.patch +++ b/patches/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 82f291613ac9682ddf414699046393125eb102eb..440681987b4d6420be93fe2f17180cb42adc8d2c 100644 +index 3ccddc6e9a4ec9a8dde30ba530e958b45265a976..7dc906ef0dc49000c0511d7d5cef63ddf51dd1d3 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc -@@ -1505,7 +1505,7 @@ void BrowserMainLoop::MainMessageLoopRun() { +@@ -1516,7 +1516,7 @@ void BrowserMainLoop::MainMessageLoopRun() { NOTREACHED(); #else base::RunLoop run_loop; diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index fe838a2e7f471..2643ca26343fe 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/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 f383b8ee13881b66144ca12e284e1ead4376a27f..42375cd33bb9759ef1c264672b250638a472fe7e 100644 +index 6d52381b3cb1aa290d33ae07c6e4c499e007b928..60e8705fb3afe5e7712a159d79fee2efa4bd3587 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc -@@ -1209,8 +1209,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( +@@ -1226,8 +1226,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( return NAVIGATION_TYPE_NEW_SUBFRAME; } @@ -33,7 +33,7 @@ index f383b8ee13881b66144ca12e284e1ead4376a27f..42375cd33bb9759ef1c264672b250638 if (rfh->GetParent()) { // All manual subframes would be did_create_new_entry and handled above, so -@@ -1462,7 +1464,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( +@@ -1483,7 +1485,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon(); } @@ -46,10 +46,10 @@ index f383b8ee13881b66144ca12e284e1ead4376a27f..42375cd33bb9759ef1c264672b250638 // 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 34c13c28117fe5fced5ca3190c5f948168cd010f..554ddabee8952e578a61a9b9c3f358b2475abd69 100644 +index 00a096c43f13d8addcf202545ac2aef97ef9c556..0145c63c41ba67b260b5df273d04e5b87c22af23 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc -@@ -730,9 +730,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap, +@@ -744,9 +744,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap, } void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) { diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch index 9b79945abae5f..0e3a29c02d2aa 100644 --- a/patches/chromium/disable-redraw-lock.patch +++ b/patches/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 5a60f89ef1cb766a7b06ef80c4bee16c7de593e2..4a96f076a200e59289cbb1f152ec9d3d266f4214 100644 +index b06c12c2e17c9c4e0e40f92ef89b5e8f688d676c..a6c71d3cdb92e272652b11dd16daa4016d633c68 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -348,6 +348,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500; @@ -37,7 +37,7 @@ index 5a60f89ef1cb766a7b06ef80c4bee16c7de593e2..4a96f076a200e59289cbb1f152ec9d3d (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) || !ui::win::IsAeroGlassEnabled())) { if (should_lock_) -@@ -1022,6 +1027,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() { +@@ -1020,6 +1025,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() { return scoped_enable; } @@ -49,7 +49,7 @@ index 5a60f89ef1cb766a7b06ef80c4bee16c7de593e2..4a96f076a200e59289cbb1f152ec9d3d // HWNDMessageHandler, gfx::WindowImpl overrides: diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h -index 4044afcc0fd1f076fc392d34417e3ccaa1347031..2bd5fcdf0293a07938d22902121517a458bd3e88 100644 +index cbc7961c3a8da7edaf4aa0bc2bacee7c89e7a5f5..cac3eb5ee3c96813e7f22f88b78511960fd53f3b 100644 --- a/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h @@ -202,6 +202,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl, @@ -62,7 +62,7 @@ index 4044afcc0fd1f076fc392d34417e3ccaa1347031..2bd5fcdf0293a07938d22902121517a4 HICON GetDefaultWindowIcon() const override; HICON GetSmallWindowIcon() const override; diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h -index ddc640e7a5d278e08c056f1989ac258c9ae8bfae..a5d050dadad3c565b0151ee945e5d17f42255aa3 100644 +index 45c4e5b29d05ea0323596fa2c5034c2e30a68f70..e25aac69b09954fbc267309beba98ec0877fa2ac 100644 --- a/ui/views/win/hwnd_message_handler_delegate.h +++ b/ui/views/win/hwnd_message_handler_delegate.h @@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate { diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 16a76ae587f6d..5041b2956f18d 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,10 +20,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 8d8d18e2c62dbabfaa81d79f0555954b0b319d3d..298bfe91b9c9f4cbb3b07fe9bc368a1e84433ed1 100644 +index 49782ad3604d594bdf1a5aa02298e987851b7dbb..afb9181cc70a9511f3b7cb1dc976b57b977e6489 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -1815,6 +1815,12 @@ const gfx::ColorSpace& LayerTreeHostImpl::GetRasterColorSpace() const { +@@ -1821,6 +1821,12 @@ const gfx::ColorSpace& LayerTreeHostImpl::GetRasterColorSpace() const { const gfx::ColorSpace& LayerTreeHostImpl::GetRasterColorSpaceAndId( int* id) const { @@ -37,7 +37,7 @@ index 8d8d18e2c62dbabfaa81d79f0555954b0b319d3d..298bfe91b9c9f4cbb3b07fe9bc368a1e // The pending tree will have the most recently updated color space, so // prefer that. diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h -index b6dd56de7cde72051caeedeef3ee413b8f24eba6..0da3f40ebc81170f63e61d8dc5714df5dd72c049 100644 +index 182eb5f68731afdaba5ce71d0fa67ea1051eb0dc..3dd350583c3f23445841c3e46122ae6e809508b2 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -96,6 +96,8 @@ class CC_EXPORT LayerTreeSettings { @@ -83,7 +83,7 @@ index f17aa1fa451f1b99d7f083e07edd49b11f7639e4..09f7c5d6a92d89c199b296771a8ff60c !command_line->HasSwitch(switches::kUIDisablePartialSwap); #if defined(OS_MACOSX) diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa659941a68 100644 +index cf811dcdec761ce6825cb1bffb83249b5e144cae..6303a6b2ab37548e580abe946be33ae75e5a0abe 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc @@ -83,6 +83,9 @@ @@ -108,7 +108,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 // Use the full quad_rect for debug quads to not move the edges based on // partial swaps. -@@ -1428,7 +1432,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, +@@ -1476,7 +1480,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, params->use_color_matrix, tint_gl_composited_content_, params->apply_shader_based_rounded_corner && ShouldApplyRoundedCorner(params->quad)), @@ -118,7 +118,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 } void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) { -@@ -1899,8 +1904,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, +@@ -1947,8 +1952,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -129,7 +129,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 SetShaderColor(color, opacity); if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -2055,8 +2060,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, +@@ -2103,8 +2108,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, : NON_PREMULTIPLIED_ALPHA, false, false, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -140,7 +140,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2152,8 +2157,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, +@@ -2200,8 +2205,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, !quad->ShouldDrawWithBlending(), has_tex_clamp_rect, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -151,7 +151,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2256,7 +2261,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, +@@ -2304,7 +2309,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB()); gfx::ColorSpace dst_color_space = @@ -160,7 +160,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 // 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. -@@ -2412,8 +2417,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, +@@ -2460,8 +2465,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, SetUseProgram(ProgramKey::VideoStream(tex_coord_precision, ShouldApplyRoundedCorner(quad)), @@ -171,7 +171,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id()); -@@ -2475,8 +2480,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { +@@ -2523,8 +2528,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR); // Bind the program to the GL state. @@ -182,7 +182,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -3185,7 +3190,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { +@@ -3233,7 +3238,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) { @@ -193,7 +193,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 gfx::ColorSpace adjusted_color_space = src_color_space; float sdr_white_level = current_frame()->sdr_white_level; -@@ -3564,7 +3571,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( +@@ -3612,7 +3619,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( *overlay_texture = FindOrCreateOverlayTexture( params.quad->render_pass_id, iosurface_width, iosurface_height, @@ -202,7 +202,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 *new_bounds = gfx::RectF(updated_dst_rect.origin(), gfx::SizeF((*overlay_texture)->texture.size())); -@@ -3782,8 +3789,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { +@@ -3830,8 +3837,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { PrepareGeometry(SHARED_BINDING); @@ -213,7 +213,7 @@ index 9eb0276cbedd99b41e537720ea159cdaac7ce705..fbc49a3aa2a5458050acf0280f6caaa6 gfx::Transform render_matrix; render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), -@@ -3943,3 +3950,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( +@@ -3991,3 +3998,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( } } // namespace viz @@ -232,10 +232,10 @@ index e42a2f780170f01edce84753d60b1fba3a429aeb..3cb62924adf93c4d437c8fa81529efc5 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 0408a35db18ecdcad1521e4123aed4bd12bcf2c8..94898420ab1b93f61c830e19cd31ed0a1716922e 100644 +index 9cb8d6a3c48257049be1a1a68ed80c4887c38081..cb080e5ca644aceace808c643c8ad4d30acadd1b 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -225,6 +225,7 @@ +@@ -224,6 +224,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_switches_util.h" #include "ui/display/display_switches.h" @@ -243,7 +243,7 @@ index 0408a35db18ecdcad1521e4123aed4bd12bcf2c8..94898420ab1b93f61c830e19cd31ed0a #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" #include "url/url_constants.h" -@@ -3015,6 +3016,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3002,6 +3003,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[] = { @@ -252,10 +252,10 @@ index 0408a35db18ecdcad1521e4123aed4bd12bcf2c8..94898420ab1b93f61c830e19cd31ed0a service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableSeccompFilterSandbox, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index 74cdb6031587640946ed08f37f1579ea4e68414c..68a5ec2d04dc3ec1c81d8f62fa067416f2faee29 100644 +index 7d74c4e57e676b7b2e33b1ff29cf2a5a15efdb35..01c7ae0a6665ffa7667dda29edcc15df16545483 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -2930,6 +2930,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( +@@ -2975,6 +2975,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); @@ -302,7 +302,7 @@ index 1aedba288aed698fd1b7ac6a4ef1a67fc892f84a..df2b5b120483225c2bd21a337e6085db gfx::ColorSpace::TransferID transfer_id = diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc -index 41f7fcbdd63af315f4b4e768bfef3b5004807a0b..398a4fdea3cc0ab4f5132deeb9365189f9c928c3 100644 +index c383d42c986aa29fcdfc2009901ed452ef480b55..1b8d0818155a407eb42c3f785e9609fe7bfa3dc7 100644 --- a/ui/gfx/mac/io_surface.cc +++ b/ui/gfx/mac/io_surface.cc @@ -16,6 +16,7 @@ @@ -313,19 +313,19 @@ index 41f7fcbdd63af315f4b4e768bfef3b5004807a0b..398a4fdea3cc0ab4f5132deeb9365189 namespace gfx { -@@ -186,6 +187,11 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size, - - // Ensure that all IOSurfaces start as sRGB. - CGColorSpaceRef color_space = base::mac::GetSRGBColorSpace(); -+ auto* cmd_line = base::CommandLine::ForCurrentProcess(); -+ if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) { -+ color_space = base::mac::GetSystemColorSpace(); -+ } +@@ -261,6 +262,11 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size, + IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB); + } else { + CGColorSpaceRef color_space = base::mac::GetSRGBColorSpace(); ++ auto* cmd_line = base::CommandLine::ForCurrentProcess(); ++ if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) { ++ color_space = base::mac::GetSystemColorSpace(); ++ } + - base::ScopedCFTypeRef color_space_icc( - CGColorSpaceCopyICCProfile(color_space)); - IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), color_space_icc); -@@ -197,6 +203,14 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size, + base::ScopedCFTypeRef color_space_icc( + CGColorSpaceCopyICCProfile(color_space)); + IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), color_space_icc); +@@ -277,6 +283,14 @@ bool IOSurfaceCanSetColorSpace(const ColorSpace& color_space) { void IOSurfaceSetColorSpace(IOSurfaceRef io_surface, const ColorSpace& color_space) { @@ -337,9 +337,9 @@ index 41f7fcbdd63af315f4b4e768bfef3b5004807a0b..398a4fdea3cc0ab4f5132deeb9365189 + return; + } + - // Special-case sRGB. - if (color_space == ColorSpace::CreateSRGB()) { - base::ScopedCFTypeRef srgb_icc( + if (!internal::IOSurfaceSetColorSpace(io_surface, color_space)) { + DLOG(ERROR) << "Failed to set color space for IOSurface: " + << color_space.ToString(); diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc index ba3dbf23d1df7a3b0cc199054f36a88014daa0e7..f8a563a78cee2856da0f2ad556beba19b01a2e59 100644 --- a/ui/gfx/switches.cc diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index 9eba6a0a603fb..02986572d9169 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron. diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm -index 18019d5794f688ca07b35a665cc9800bb1d3047a..60c7e980dd322ba012c564fca68848c3188ca5dc 100644 +index 8ddd790decc43af9820c97121a3b359e7cbb49ee..41269301e92d96757066229842333c8981994234 100644 --- a/content/browser/renderer_host/browser_compositor_view_mac.mm +++ b/content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -209,7 +209,7 @@ +@@ -203,7 +203,7 @@ } void BrowserCompositorMac::SetRenderWidgetHostIsHidden(bool hidden) { diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 84354422416c3..ee8b7cd26b449 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/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 55c13fa06f7c6a5e7b3bd072ed7ffc452fd24438..09b6a881a5644859eafb216eee1172aeb8d086b2 100644 +index 0cdd74174258c377239d7138290ac05253247305..4b43c6cca0f3fd9c137ab8e5918839839857d56e 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -683,6 +683,9 @@ void RenderWidgetHostImpl::WasHidden() { +@@ -675,6 +675,9 @@ void RenderWidgetHostImpl::WasHidden() { if (is_hidden_) return; @@ -19,10 +19,10 @@ index 55c13fa06f7c6a5e7b3bd072ed7ffc452fd24438..09b6a881a5644859eafb216eee1172ae 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 71bfb5e5e6e0aba5615bc76cae1b551ac1880d09..c5175b7fd5c5394703fca85e57b4be5faf618b63 100644 +index 889284ba932b03cc15199990bd70a98a0aa3fe7e..fc527c0f5a2479c4d565ceaa8c2a3070cd747798 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h -@@ -200,6 +200,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl +@@ -186,6 +186,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl // RenderWidgetHostImpl. static RenderWidgetHostImpl* From(RenderWidgetHost* rwh); diff --git a/patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch b/patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch index 93fd00eba0358..76a75e1b60f12 100644 --- a/patches/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch +++ b/patches/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 3c8e5db44c4174d5e876a8874fc702cc3233fc7b..31d45afae965efeb15b83d9f4259cc50abe987dd 100644 +index 9926239f254a3f106d1be0c8693e956637e8c8d5..a73750ec7d19ca6088d969710e3e29817335ed7c 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -4181,7 +4181,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, +@@ -4150,7 +4150,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/chromium/exclude-a-few-test-files-from-build.patch b/patches/chromium/exclude-a-few-test-files-from-build.patch index 132130f618f06..736ccadf323c1 100644 --- a/patches/chromium/exclude-a-few-test-files-from-build.patch +++ b/patches/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 854d6c6b9763cbec3a4dd74635726e2c0e7c6944..4fe9ee97104c2b021d00a661ff7dbb7fe9a6f681 100644 +index 955f89ef28400b0c1e92bf6b62ed0952c16d76ea..40a718e1f9b5b1930623f2faa3e3a330ec23b30d 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1781,7 +1781,7 @@ jumbo_source_set("blink_platform_unittests_sources") { +@@ -1808,7 +1808,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/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index bff46f47af4bf..ca6a4efb52348 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch @@ -33,10 +33,10 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970 DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings); }; diff --git a/services/network/network_context.cc b/services/network/network_context.cc -index b9a8a12b8abb386fec548a26e4686af2e3822b8c..18af342553139669e485e5c34961de231f927f4c 100644 +index f7998cce9e21e50d2643e1594bad3db4727a30bd..f6b0b3695db7724e25ef55a8ec62841866ba8882 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -928,6 +928,13 @@ void NetworkContext::SetNetworkConditions( +@@ -938,6 +938,13 @@ void NetworkContext::SetNetworkConditions( std::move(network_conditions)); } @@ -51,10 +51,10 @@ index b9a8a12b8abb386fec548a26e4686af2e3822b8c..18af342553139669e485e5c34961de23 // This may only be called on NetworkContexts created with the constructor // that calls MakeURLRequestContext(). diff --git a/services/network/network_context.h b/services/network/network_context.h -index e98063a71435ee8828f3b5a21b569325965f7c58..dd34e65752d54b193965b7e7fea2cae324782204 100644 +index db00747c9992b660ef848a37a77eb70bb34d42f8..815de456636c3d9d2e7cf048a93cf856cbdeeda2 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -222,6 +222,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -226,6 +226,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext void CloseIdleConnections(CloseIdleConnectionsCallback callback) override; void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id, mojom::NetworkConditionsPtr conditions) override; @@ -63,10 +63,10 @@ index e98063a71435ee8828f3b5a21b569325965f7c58..dd34e65752d54b193965b7e7fea2cae3 void SetEnableReferrers(bool enable_referrers) override; #if defined(OS_CHROMEOS) diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 4691fde53fd7d6ff6e89c55a7fec88d77b39701c..33021fcda6d2cbe46225ba8cf56e137ee7ef9912 100644 +index e62831485c4f0a36e44759c67c70d9353a02195e..97054f4d106963dc61667cd15a6561247f5fc041 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom -@@ -912,6 +912,9 @@ interface NetworkContext { +@@ -925,6 +925,9 @@ interface NetworkContext { SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id, NetworkConditions? conditions); @@ -77,10 +77,10 @@ index 4691fde53fd7d6ff6e89c55a7fec88d77b39701c..33021fcda6d2cbe46225ba8cf56e137e SetAcceptLanguage(string new_accept_language); diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h -index 4fe68bb40d8e009e9765ed884bbf898a10b86124..a84cf0a1b07751bbcad9b193a4a3a1683e0db80c 100644 +index 046b2df5a9687748734528f61159a5b7f62b7ae3..4514b28407948263b125f87e8e9613a1f9550ea1 100644 --- a/services/network/test/test_network_context.h +++ b/services/network/test/test_network_context.h -@@ -98,6 +98,7 @@ class TestNetworkContext : public mojom::NetworkContext { +@@ -99,6 +99,7 @@ class TestNetworkContext : public mojom::NetworkContext { void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {} void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id, mojom::NetworkConditionsPtr conditions) override {} diff --git a/patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch b/patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch index acb1b6c16f9fe..c5093b25818ea 100644 --- a/patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch +++ b/patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch @@ -7,10 +7,10 @@ Disable usage of SetApplicationIsDaemon and _LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc -index 9b0759ab820ddb0e2a9e609b88bbc1673607c4e3..2392fd01736550f404304df324da9d81dfb3d446 100644 +index 2c1c7f992f2a40509d2d8854fcd7a023d7e06b6d..4c3f2dc2e1e1bf4c06764c97f9be5b5331e311bb 100644 --- a/content/utility/utility_service_factory.cc +++ b/content/utility/utility_service_factory.cc -@@ -196,7 +196,7 @@ void UtilityServiceFactory::RunService( +@@ -162,7 +162,7 @@ void UtilityServiceFactory::RunService( std::unique_ptr UtilityServiceFactory::CreateAudioService( mojo::PendingReceiver receiver) { @@ -18,7 +18,7 @@ index 9b0759ab820ddb0e2a9e609b88bbc1673607c4e3..2392fd01736550f404304df324da9d81 +#if defined(OS_MACOSX) && !defined(MAS_BUILD) // Don't connect to launch services when running sandboxed // (https://crbug.com/874785). - if (base::FeatureList::IsEnabled( + if (service_manager::IsAudioSandboxEnabled()) { diff --git a/sandbox/mac/system_services.cc b/sandbox/mac/system_services.cc index caa30bb378b30331f90057fe7ce3aec724104bf8..a766daa808495f7872051e129c6ad9f76f54e4fe 100644 --- a/sandbox/mac/system_services.cc diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index c32dd9d83cd22..0b1bb7185ea18 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 906a1ee4ac58b0744a32153bbaafeac4322a60e4..c90f4aead36cbf3767dc5094728963c2 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index b1be27659d80a3199242d43ec80ccd28a43059b1..f475ec2301011a0840e76dd0e8e40bf65fdf6106 100644 +index 8f40905132b1b55d75a187470047132f9daaff05..23a195531c5ce9e9785bf61d10f5ae98e7bf2b24 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc -@@ -2250,6 +2250,21 @@ bool RenderFrameHostManager::InitRenderView( +@@ -2194,6 +2194,21 @@ bool RenderFrameHostManager::InitRenderView( scoped_refptr RenderFrameHostManager::GetSiteInstanceForNavigationRequest( NavigationRequest* request) { @@ -67,7 +67,7 @@ index b1be27659d80a3199242d43ec80ccd28a43059b1..f475ec2301011a0840e76dd0e8e40bf6 SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance(); // All children of MHTML documents must be MHTML documents. They all live in -@@ -2293,6 +2308,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2237,6 +2252,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->common_params().url); no_renderer_swap_allowed |= request->from_begin_navigation() && !can_renderer_initiate_transfer; @@ -127,7 +127,7 @@ index b1be27659d80a3199242d43ec80ccd28a43059b1..f475ec2301011a0840e76dd0e8e40bf6 } else { // Subframe navigations will use the current renderer, unless specifically // allowed to swap processes. -@@ -2304,23 +2372,28 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2248,23 +2316,28 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( if (no_renderer_swap_allowed && !should_swap_for_error_isolation) return scoped_refptr(current_site_instance); @@ -144,7 +144,7 @@ index b1be27659d80a3199242d43ec80ccd28a43059b1..f475ec2301011a0840e76dd0e8e40bf6 + } scoped_refptr dest_site_instance = GetSiteInstanceForNavigation( - request->common_params().url, request->source_site_instance(), + request->common_params().url, request->GetSourceSiteInstance(), - request->dest_site_instance(), candidate_site_instance, + request->dest_site_instance(), candidate_site_instance.get(), request->common_params().transition, @@ -159,10 +159,10 @@ index b1be27659d80a3199242d43ec80ccd28a43059b1..f475ec2301011a0840e76dd0e8e40bf6 } diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc -index 2cee6bf52088a378a7c53343864d27aa78bdc106..4aca3c9724f8192a4f6e70e38473b408cadc6675 100644 +index 1d7865f011307787081b52fcdf6120ade2bfd5d4..913a7242072af737dff2b26c0a436f5882158ab1 100644 --- a/content/browser/site_instance_impl.cc +++ b/content/browser/site_instance_impl.cc -@@ -368,6 +368,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const GURL& url) { +@@ -369,6 +369,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const GURL& url) { return browsing_instance_->HasSiteInstance(url); } @@ -174,10 +174,10 @@ index 2cee6bf52088a378a7c53343864d27aa78bdc106..4aca3c9724f8192a4f6e70e38473b408 const GURL& url) { return browsing_instance_->GetSiteInstanceForURL( diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h -index 1edb9fd6b0c383f291735dd1a952fcb7b17cc87f..23967f040eb346be265faa2a92562e1fed190b8d 100644 +index 5784da180252793b587b9d227805d8e4a3bba0d3..5dbb53432d12b39be8035c23fdc9155bcd712635 100644 --- a/content/browser/site_instance_impl.h +++ b/content/browser/site_instance_impl.h -@@ -83,6 +83,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance, +@@ -84,6 +84,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance, BrowserContext* GetBrowserContext() override; const GURL& GetSiteURL() override; scoped_refptr GetRelatedSiteInstance(const GURL& url) override; @@ -186,10 +186,10 @@ index 1edb9fd6b0c383f291735dd1a952fcb7b17cc87f..23967f040eb346be265faa2a92562e1f size_t GetRelatedActiveContentsCount() override; bool RequiresDedicatedProcess() override; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index da7eca5f443e2ecdcb3f0819848735aafeb43a00..ee14a76bf705c41082c78f7f0fcce968acf3a3b7 100644 +index 398adadff5c00a4d39d1ea5f2e7eb32699e4f736..e026da455790b2131fc8652c8bc298d83d07bc12 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -44,6 +44,21 @@ +@@ -49,6 +49,21 @@ namespace content { @@ -212,10 +212,10 @@ index da7eca5f443e2ecdcb3f0819848735aafeb43a00..ee14a76bf705c41082c78f7f0fcce968 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 07fa16953d6167a5a381b28a5da3c08a78de4306..fe6864b5ba4c77a6694510db2f1add479241b156 100644 +index 858fee141d6e8f53526c0a9d0502cb61177a9ba2..d592fdf267cfe27d1f6fc9811815801272f7efff 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -205,8 +205,45 @@ struct WebPreferences; +@@ -215,8 +215,45 @@ struct WebPreferences; // the observer interfaces.) class CONTENT_EXPORT ContentBrowserClient { public: diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch index 22329ebf6cc7e..756c85bdd8bb2 100644 --- a/patches/chromium/gin_enable_disable_v8_platform.patch +++ b/patches/chromium/gin_enable_disable_v8_platform.patch @@ -36,7 +36,7 @@ index 413e6c5bcc74cd01730c5d4dc66eb92aaf7df8de..6c5d101fef97e880bee20d2f76e4b339 v8::Isolate* isolate() { return isolate_; } diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index aab46a000c5e9081440298ecef4844ead7a40b28..2cee8dee3f70148570613dc17827da19b193ff62 100644 +index 5a028d946cb51aad1507149e44f5c93b5d53d19f..eef45f3e38490419dc2aec3dbbfe81edd228bd41 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -204,12 +204,14 @@ enum LoadV8FileResult { diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index 1382606e1f29c..022cec8e337be 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/chromium/gritsettings_resource_ids.patch @@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids -index be4d09028b1232594f90159fa11f67708a55afe8..9a3ae55c11a37ce00c19b63d882afd8c4548a6d9 100644 +index 60aa21e9e2705c91ab634e4b405e10afc93494de..c07a62074dee4e59ad67994ce0e9416c76e164fd 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids -@@ -457,6 +457,11 @@ +@@ -460,6 +460,11 @@ "includes": [28880], }, diff --git a/patches/chromium/ignore_rc_check.patch b/patches/chromium/ignore_rc_check.patch deleted file mode 100644 index ecc7e4b6bba63..0000000000000 --- a/patches/chromium/ignore_rc_check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zac Walker -Date: Thu, 20 Sep 2018 17:49:55 -0700 -Subject: ignore_rc_check.patch - -Dont compare RC.exe and RC.py output. -FIXME: It has to be reverted once the script is fixed. - -diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py -index 3834cf2c01a9c63bfe7a6fc9e7549930a5eda01c..454b831a37c13fdd2fe4d8953d60dab661386f9a 100644 ---- a/build/toolchain/win/tool_wrapper.py -+++ b/build/toolchain/win/tool_wrapper.py -@@ -250,7 +250,11 @@ class WinTool(object): - if rc_exe_exit_code == 0: - import filecmp - # Strip "/fo" prefix. -- assert filecmp.cmp(rc_res_output[3:], rcpy_res_output[3:]) -+ # ------ -+ # Temporarily ignore compares -+ # Nightly builds use very large version numbers that fail this check -+ # FIXME(zacwalk): Enable the assert. -+ # assert filecmp.cmp(rc_res_output[3:], rcpy_res_output[3:]) - return rc_exe_exit_code - - def ExecActionWrapper(self, arch, rspfile, *dirname): diff --git a/patches/chromium/libgtkui_export.patch b/patches/chromium/libgtkui_export.patch index 3cbf97097f3be..0996db0356cb3 100644 --- a/patches/chromium/libgtkui_export.patch +++ b/patches/chromium/libgtkui_export.patch @@ -6,7 +6,7 @@ Subject: libgtkui_export.patch Export libgtkui symbols for the GN component build. diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/libgtkui/gtk_util.h -index e0ab34ca088e65b97ea6ce19c765e514acda760f..8c742d93ffabbd9795f9ba021b23c972e66eaec3 100644 +index c9712cd531c0e2114103bdf3f4cba3320b75c331..21d4c2418b0778df982897e675617a6f93f72c50 100644 --- a/chrome/browser/ui/libgtkui/gtk_util.h +++ b/chrome/browser/ui/libgtkui/gtk_util.h @@ -11,6 +11,7 @@ @@ -17,21 +17,13 @@ index e0ab34ca088e65b97ea6ce19c765e514acda760f..8c742d93ffabbd9795f9ba021b23c972 typedef union _GdkEvent GdkEvent; -@@ -36,10 +37,10 @@ namespace libgtkui { +@@ -34,11 +35,11 @@ namespace libgtkui { extern const color_utils::HSL kDefaultTintFrameIncognito; -void GtkInitFromCommandLine(const base::CommandLine& command_line); +LIBGTKUI_EXPORT void GtkInitFromCommandLine(const base::CommandLine& command_line); - // Returns the name of the ".desktop" file associated with our running process. --std::string GetDesktopName(base::Environment* env); -+LIBGTKUI_EXPORT std::string GetDesktopName(base::Environment* env); - - GdkModifierType GetGdkModifierForAccelerator( - const ui::Accelerator& accelerator); -@@ -52,7 +53,7 @@ void TurnButtonBlue(GtkWidget* button); - // Sets |dialog| as transient for |parent|, which will keep it on top and center // it above |parent|. Do nothing if |parent| is nullptr. -void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent); @@ -39,7 +31,7 @@ index e0ab34ca088e65b97ea6ce19c765e514acda760f..8c742d93ffabbd9795f9ba021b23c972 // Gets the transient parent aura window for |dialog|. aura::Window* GetAuraTransientParent(GtkWidget* dialog); -@@ -158,7 +159,7 @@ void ApplyCssToContext(GtkStyleContext* context, const std::string& css); +@@ -143,7 +144,7 @@ void ApplyCssToContext(GtkStyleContext* context, const std::string& css); // Get the 'color' property from the style context created by // GetStyleContextFromCss(|css_selector|). @@ -48,7 +40,7 @@ index e0ab34ca088e65b97ea6ce19c765e514acda760f..8c742d93ffabbd9795f9ba021b23c972 ScopedCssProvider GetCssProvider(const std::string& css); -@@ -171,7 +172,7 @@ void RenderBackground(const gfx::Size& size, +@@ -156,7 +157,7 @@ void RenderBackground(const gfx::Size& size, // Renders a background from the style context created by // GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and // returns the average color. @@ -57,52 +49,3 @@ index e0ab34ca088e65b97ea6ce19c765e514acda760f..8c742d93ffabbd9795f9ba021b23c972 // Renders the border from the style context created by // GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and -diff --git a/chrome/browser/ui/libgtkui/skia_utils_gtk.h b/chrome/browser/ui/libgtkui/skia_utils_gtk.h -index bd6ed68a11b0b6c08962f688c799bd0f6b8a8d0e..b1184475e0ab9f381dc3c78b1092e2e0ec59d60b 100644 ---- a/chrome/browser/ui/libgtkui/skia_utils_gtk.h -+++ b/chrome/browser/ui/libgtkui/skia_utils_gtk.h -@@ -8,6 +8,7 @@ - #include - #include - -+#include "chrome/browser/ui/libgtkui/libgtkui_export.h" - #include "third_party/skia/include/core/SkColor.h" - - #if !GTK_CHECK_VERSION(3, 90, 0) -@@ -48,7 +49,7 @@ const SkBitmap GdkPixbufToImageSkia(GdkPixbuf* pixbuf); - // Convert and copy a SkBitmap to a GdkPixbuf. NOTE: this uses BGRAToRGBA, so - // it is an expensive operation. The returned GdkPixbuf will have a refcount of - // 1, and the caller is responsible for unrefing it when done. --GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap); -+LIBGTKUI_EXPORT GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap); - - } // namespace libgtkui - -diff --git a/chrome/browser/ui/libgtkui/unity_service.h b/chrome/browser/ui/libgtkui/unity_service.h -index 8d67e1460837c7f8adb151adea131cc6440659a3..95fbb27b6a81e4d73d239e94f5105078a936b5af 100644 ---- a/chrome/browser/ui/libgtkui/unity_service.h -+++ b/chrome/browser/ui/libgtkui/unity_service.h -@@ -5,18 +5,20 @@ - #ifndef CHROME_BROWSER_UI_LIBGTKUI_UNITY_SERVICE_H_ - #define CHROME_BROWSER_UI_LIBGTKUI_UNITY_SERVICE_H_ - -+#include "chrome/browser/ui/libgtkui/libgtkui_export.h" -+ - namespace unity { - - // Returns whether unity is currently running. --bool IsRunning(); -+LIBGTKUI_EXPORT bool IsRunning(); - - // If unity is running, sets the download counter in the dock icon. Any value - // other than 0 displays the badge. --void SetDownloadCount(int count); -+LIBGTKUI_EXPORT void SetDownloadCount(int count); - - // If unity is running, sets the download progress bar in the dock icon. Any - // value between 0.0 and 1.0 (exclusive) shows the progress bar. --void SetProgressFraction(float percentage); -+LIBGTKUI_EXPORT void SetProgressFraction(float percentage); - - } // namespace unity - diff --git a/patches/chromium/mas-cgdisplayusesforcetogray.patch b/patches/chromium/mas-cgdisplayusesforcetogray.patch index 093f2711eff58..2e42e8bf1d83c 100644 --- a/patches/chromium/mas-cgdisplayusesforcetogray.patch +++ b/patches/chromium/mas-cgdisplayusesforcetogray.patch @@ -6,13 +6,13 @@ Subject: mas-cgdisplayusesforcetogray.patch Removes usage of the CGDisplayUsesForceToGray private API. diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm -index 85545ec7eaa6494fe542ee14e6f3e29ffa7d693e..bf352f9a6f087c28b6ce207bd0e5c09753ffb9cf 100644 +index 95675ad6ddf61e3809833894f0962908d12be4ff..8cd379bb3d10e88c95902896684d443366c759c4 100644 --- a/ui/display/mac/screen_mac.mm +++ b/ui/display/mac/screen_mac.mm -@@ -108,7 +108,17 @@ Display BuildDisplayForScreen(NSScreen* screen) { - - display.set_color_depth(NSBitsPerPixelFromDepth([screen depth])); - display.set_depth_per_component(NSBitsPerSampleFromDepth([screen depth])); +@@ -116,7 +116,17 @@ Display BuildDisplayForScreen(NSScreen* screen) { + display.set_depth_per_component(Display::kHDR10BitsPerComponent); + } + } +#ifdef MAS_BUILD + // This is equivalent to the CGDisplayUsesForceToGray() API as at 2018-08-06, + // but avoids usage of the private API. diff --git a/patches/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch b/patches/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch deleted file mode 100644 index b36444bb22bbd..0000000000000 --- a/patches/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Apthorp -Date: Thu, 20 Sep 2018 17:49:34 -0700 -Subject: mas-lssetapplicationlaunchservicesserverconnectionstatus.patch - -Removes usage of the _LSSetApplicationLaunchServicesServerConnectionStatus -private API. - -diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc -index d257830f5943937a634aa85539ad654310579e2c..4373f508964cb1e9fd51c952122ac2f41fb35ae9 100644 ---- a/content/gpu/gpu_main.cc -+++ b/content/gpu/gpu_main.cc -@@ -286,8 +286,10 @@ int GpuMain(const MainFunctionParams& parameters) { - std::make_unique( - base::MessagePumpType::NS_RUNLOOP); - -+#ifndef MAS_BUILD - // Tell LaunchServices to continue without a connection to the daemon. - _LSSetApplicationLaunchServicesServerConnectionStatus(0, nullptr); -+#endif - #else - main_thread_task_executor = - std::make_unique( diff --git a/patches/chromium/mas_blink_no_private_api.patch b/patches/chromium/mas_blink_no_private_api.patch index 7a37adc58d107..38b83d60c1f5c 100644 --- a/patches/chromium/mas_blink_no_private_api.patch +++ b/patches/chromium/mas_blink_no_private_api.patch @@ -73,7 +73,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d } // namespace blink diff --git a/third_party/blink/renderer/core/paint/theme_painter_mac.mm b/third_party/blink/renderer/core/paint/theme_painter_mac.mm -index e94235acb17335fbc78c606ff26036871117bd09..7c4bd19215c67f649636ae69b9a21b5c1ba21ecc 100644 +index 8f4ae94bc1d8188d041654c50511f3346eee79de..fa06f47abbff3dcda937bf0b794f616e4818cd30 100644 --- a/third_party/blink/renderer/core/paint/theme_painter_mac.mm +++ b/third_party/blink/renderer/core/paint/theme_painter_mac.mm @@ -41,6 +41,7 @@ @@ -92,7 +92,7 @@ index e94235acb17335fbc78c606ff26036871117bd09..7c4bd19215c67f649636ae69b9a21b5c namespace blink { -@@ -72,10 +74,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, +@@ -95,10 +97,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, // behavior change while remaining a fragile solution. // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3 if (!use_ns_text_field_cell) { @@ -105,9 +105,9 @@ index e94235acb17335fbc78c606ff26036871117bd09..7c4bd19215c67f649636ae69b9a21b5c return false; } -@@ -161,10 +165,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, - const PaintInfo& paint_info, +@@ -186,10 +190,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, const IntRect& r) { + ScopedColorSchemeAppearance appearance(style.UsedColorScheme()); LocalCurrentGraphicsContext local_context(paint_info.context, r); +#ifndef MAS_BUILD _NSDrawCarbonThemeListBox( diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 2d17ddaa3dfe2..2a994f55cc6f4 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -50,10 +50,10 @@ index 743d1364bcd13e24ecbe5ced730161d15b8c3e93..a5529ac8841b79f230f0fa8eae2b3cb2 // 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 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be868742069dafc72 100644 +index 2851641d0219164185567a100c2c19d49274c233..c787f7adf7bfb3b9caebe72eecfba55c2ebb8926 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm -@@ -229,6 +229,7 @@ +@@ -241,6 +241,7 @@ // VoiceOver uses -1 to mean "no limit" for AXResultsLimit. const int kAXResultsLimitNoLimit = -1; @@ -61,7 +61,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 extern "C" { // The following are private accessibility APIs required for cursor navigation -@@ -468,6 +469,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range, +@@ -480,6 +481,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range, AddMisspelledTextAttributes(ax_range, attributed_text); return attributed_text; } @@ -69,7 +69,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 // Returns an autoreleased copy of the AXNodeData's attribute. NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility, -@@ -735,7 +737,9 @@ + (void)initialize { +@@ -748,7 +750,9 @@ + (void)initialize { {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, @@ -79,7 +79,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, -@@ -747,8 +751,10 @@ + (void)initialize { +@@ -760,8 +764,10 @@ + (void)initialize { {NSAccessibilityHighestEditableAncestorAttribute, @"highestEditableAncestor"}, {NSAccessibilityIndexAttribute, @"index"}, @@ -90,7 +90,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 {NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityLanguageAttribute, @"language"}, -@@ -770,13 +776,17 @@ + (void)initialize { +@@ -783,13 +789,17 @@ + (void)initialize { {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute @@ -108,7 +108,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1272,6 +1282,7 @@ - (NSNumber*)enabled { +@@ -1285,6 +1295,7 @@ - (NSNumber*)enabled { ax::mojom::Restriction::kDisabled]; } @@ -116,7 +116,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1282,6 +1293,7 @@ - (id)endTextMarker { +@@ -1295,6 +1306,7 @@ - (id)endTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -124,7 +124,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 - (NSNumber*)expanded { if (![self instanceActive]) -@@ -1427,6 +1439,8 @@ - (NSNumber*)index { +@@ -1440,6 +1452,8 @@ - (NSNumber*)index { return nil; } @@ -133,7 +133,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 - (NSNumber*)insertionPointLineNumber { if (![self instanceActive]) return nil; -@@ -1449,6 +1463,7 @@ - (NSNumber*)insertionPointLineNumber { +@@ -1462,6 +1476,7 @@ - (NSNumber*)insertionPointLineNumber { caretPosition->AsTextPosition()->text_offset()); return @(std::distance(lineBreaks.begin(), iterator)); } @@ -141,7 +141,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 // Returns whether or not this node should be ignored in the // accessibility tree. -@@ -2134,6 +2149,7 @@ - (NSArray*)selectedChildren { +@@ -2147,6 +2162,7 @@ - (NSArray*)selectedChildren { return ret; } @@ -149,7 +149,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 - (NSString*)selectedText { if (![self instanceActive]) return nil; -@@ -2145,11 +2161,13 @@ - (NSString*)selectedText { +@@ -2158,11 +2174,13 @@ - (NSString*)selectedText { return nil; return base::SysUTF16ToNSString(range.GetText()); } @@ -163,7 +163,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 - (NSValue*)selectedTextRange { if (![self instanceActive]) return nil; -@@ -2170,12 +2188,15 @@ - (NSValue*)selectedTextRange { +@@ -2183,12 +2201,15 @@ - (NSValue*)selectedTextRange { int selLength = range.GetText().length(); return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -179,7 +179,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 - (NSValue*)size { if (![self instanceActive]) -@@ -2208,6 +2229,7 @@ - (NSString*)sortDirection { +@@ -2221,6 +2242,7 @@ - (NSString*)sortDirection { return nil; } @@ -187,7 +187,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2218,6 +2240,7 @@ - (id)startTextMarker { +@@ -2231,6 +2253,7 @@ - (id)startTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -195,7 +195,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2509,11 +2532,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { +@@ -2522,11 +2545,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { NSMutableAttributedString* attributedValue = [[[NSMutableAttributedString alloc] initWithString:value] autorelease]; @@ -209,7 +209,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 return [attributedValue attributedSubstringFromRange:range]; } -@@ -2616,9 +2641,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2629,9 +2654,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return ToBrowserAccessibilityCocoa(cell); } @@ -221,7 +221,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); if (!position->IsNullPosition()) -@@ -2929,6 +2953,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -2942,6 +2966,7 @@ AXPlatformRange range(std::move(lineStartPosition), return CreateTextMarker(root->CreatePositionAt(index)); } @@ -229,7 +229,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -2962,6 +2987,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -2975,6 +3000,7 @@ AXPlatformRange range(std::move(lineStartPosition), return nil; } @@ -237,7 +237,7 @@ index 5bdcea914780468d93b55b2e89dc3628a683f85c..0358f557432590ed48f9cd9be8687420 if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -3042,6 +3068,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( +@@ -3081,6 +3107,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( return @(child->GetIndexInParent()); } diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch index dae9dac513471..41747c870fdfc 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch @@ -5,10 +5,10 @@ Subject: network_service_allow_remote_certificate_verification_logic.patch diff --git a/services/network/network_context.cc b/services/network/network_context.cc -index 647fd0d633e868c5f06bbb97f03333e863075f06..b9a8a12b8abb386fec548a26e4686af2e3822b8c 100644 +index 2d553d924c0f6dac454cfd443ee2bfa6328f6ea0..f7998cce9e21e50d2643e1594bad3db4727a30bd 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -90,6 +90,11 @@ +@@ -92,6 +92,11 @@ #include "services/network/url_loader.h" #include "services/network/url_request_context_builder_mojo.h" @@ -20,7 +20,7 @@ index 647fd0d633e868c5f06bbb97f03333e863075f06..b9a8a12b8abb386fec548a26e4686af2 #if BUILDFLAG(IS_CT_SUPPORTED) #include "components/certificate_transparency/chrome_ct_policy_enforcer.h" #include "components/certificate_transparency/chrome_require_ct_delegate.h" -@@ -319,6 +324,79 @@ std::string HashesToBase64String(const net::HashValueVector& hashes) { +@@ -326,6 +331,79 @@ std::string HashesToBase64String(const net::HashValueVector& hashes) { } // namespace @@ -100,7 +100,7 @@ index 647fd0d633e868c5f06bbb97f03333e863075f06..b9a8a12b8abb386fec548a26e4686af2 constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess; NetworkContext::PendingCertVerify::PendingCertVerify() = default; -@@ -474,6 +552,13 @@ void NetworkContext::SetClient( +@@ -484,6 +562,13 @@ void NetworkContext::SetClient( client_.Bind(std::move(client)); } @@ -112,10 +112,10 @@ index 647fd0d633e868c5f06bbb97f03333e863075f06..b9a8a12b8abb386fec548a26e4686af2 +} + void NetworkContext::CreateURLLoaderFactory( - mojom::URLLoaderFactoryRequest request, + mojo::PendingReceiver receiver, mojom::URLLoaderFactoryParamsPtr params) { -@@ -1552,12 +1637,19 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { - net::SystemTrustStoreProvider::CreateDefaultForSSL()))); +@@ -1598,12 +1683,19 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { + cert_net_fetcher_)))); } #endif - if (!cert_verifier) @@ -139,10 +139,10 @@ index 647fd0d633e868c5f06bbb97f03333e863075f06..b9a8a12b8abb386fec548a26e4686af2 std::unique_ptr network_delegate = std::make_unique( diff --git a/services/network/network_context.h b/services/network/network_context.h -index 98c968120b4ccedcdf321a365db038954095ae7a..e98063a71435ee8828f3b5a21b569325965f7c58 100644 +index 4378529b710fe66adeb4f57c037f75d9b8215dca..db00747c9992b660ef848a37a77eb70bb34d42f8 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -81,6 +81,7 @@ class DomainReliabilityMonitor; +@@ -84,6 +84,7 @@ class DomainReliabilityMonitor; namespace network { class CertVerifierWithTrustAnchors; @@ -150,16 +150,16 @@ index 98c968120b4ccedcdf321a365db038954095ae7a..e98063a71435ee8828f3b5a21b569325 class CookieManager; class ExpectCTReporter; class HostResolver; -@@ -170,6 +171,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext - // mojom::NetworkContext implementation: - void SetClient( - mojo::PendingRemote client) override; +@@ -176,6 +177,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + void CreateURLLoaderFactory( + mojo::PendingReceiver receiver, + mojom::URLLoaderFactoryParamsPtr params) override; + void SetCertVerifierClient( + mojo::PendingRemote client) override; - void CreateURLLoaderFactory(mojom::URLLoaderFactoryRequest request, - mojom::URLLoaderFactoryParamsPtr params) override; void ResetURLLoaderFactories() override; -@@ -564,6 +567,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + void GetCookieManager( + mojo::PendingReceiver receiver) override; +@@ -577,6 +580,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext std::unique_ptr nss_temp_certs_cache_; #endif @@ -169,11 +169,11 @@ index 98c968120b4ccedcdf321a365db038954095ae7a..e98063a71435ee8828f3b5a21b569325 // CertNetFetcher is not used by the current platform. scoped_refptr cert_net_fetcher_; diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 322670fb32403266f25c9f49079a25ef90dc01e2..4691fde53fd7d6ff6e89c55a7fec88d77b39701c 100644 +index e014b8c0153ce8da293ebc226b19da393c91e844..e62831485c4f0a36e44759c67c70d9353a02195e 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom -@@ -168,6 +168,17 @@ interface TrustedURLLoaderHeaderClient { - pending_receiver header_client); +@@ -174,6 +174,17 @@ interface TrustedURLLoaderHeaderClient { + pending_receiver header_client); }; +interface CertVerifierClient { @@ -190,7 +190,7 @@ index 322670fb32403266f25c9f49079a25ef90dc01e2..4691fde53fd7d6ff6e89c55a7fec88d7 // Parameters for constructing a network context. struct NetworkContextParams { // Name used by memory tools to identify the context. -@@ -740,6 +751,9 @@ interface NetworkContext { +@@ -753,6 +764,9 @@ interface NetworkContext { // Sets a client for this network context. SetClient(pending_remote client); @@ -198,5 +198,5 @@ index 322670fb32403266f25c9f49079a25ef90dc01e2..4691fde53fd7d6ff6e89c55a7fec88d7 + SetCertVerifierClient(pending_remote? client); + // Creates a new URLLoaderFactory with the given |params|. - CreateURLLoaderFactory(URLLoaderFactory& url_loader_factory, + CreateURLLoaderFactory(pending_receiver url_loader_factory, URLLoaderFactoryParams params); diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 6e0865ab2dcb0..8d4967b09b065 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -55,10 +55,10 @@ index 5253f6be778cc78571b3df0a33d364a9b1e6ef52..dc5307e6500b0bfb5da83e8d8ff8886b scoped_refptr service_worker_context_; diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc -index ce997528ce2973b54dbbf965220cc30bcb19a094..e84b0b62d853b044e590a0c764f1b21ad3210886 100644 +index b0c806c9ad092cc5d8e424a3b49b32a24da7f004..810ae64c9a0287102117993674307a8bf3af7ab2 100644 --- a/content/browser/notifications/blink_notification_service_impl_unittest.cc +++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc -@@ -138,7 +138,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test { +@@ -139,7 +139,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test { notification_service_ = std::make_unique( notification_context_.get(), &browser_context_, @@ -68,10 +68,10 @@ index ce997528ce2973b54dbbf965220cc30bcb19a094..e84b0b62d853b044e590a0c764f1b21a notification_service_remote_.BindNewPipeAndPassReceiver()); diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc -index 2a447b73d763b7c91359f1b4550a002ff9e5e715..bd434393cf35605a8cc05d6fb96215cf76b5417a 100644 +index 9ada5345a004a761b6e12ac0259d61e9fd8de5e9..9c13bd9e7d2604ef72b28029a9733153e776754f 100644 --- a/content/browser/notifications/platform_notification_context_impl.cc +++ b/content/browser/notifications/platform_notification_context_impl.cc -@@ -207,12 +207,13 @@ void PlatformNotificationContextImpl::Shutdown() { +@@ -208,12 +208,13 @@ void PlatformNotificationContextImpl::Shutdown() { } void PlatformNotificationContextImpl::CreateService( @@ -108,10 +108,10 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59 mojo::PendingReceiver receiver); diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc -index 8030fd5e66fab694d3f3a54dcb4688c14dcba473..18f259bdd9b5340a50494311983646d9b9244469 100644 +index 6b584056fa02f82b20abd748254c6400d44ef770..bb037b8f5fac8c4dc223f7c066a57b51261e167b 100644 --- a/content/browser/renderer_interface_binders.cc +++ b/content/browser/renderer_interface_binders.cc -@@ -135,7 +135,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { +@@ -136,7 +136,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { RenderProcessHost* host, const url::Origin& origin) { static_cast(host->GetStoragePartition()) ->GetPlatformNotificationContext() diff --git a/patches/chromium/out_of_process_instance.patch b/patches/chromium/out_of_process_instance.patch index 372a92ee455fb..7a9b6449145cc 100644 --- a/patches/chromium/out_of_process_instance.patch +++ b/patches/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 a3786a8397536bdcb247c6a0a0ea6db4b174eae8..ab7f2276f4254d1d4cd608fa9815345185737665 100644 +index ef965d6fa3356908829589607df2ec333beab053..650d90f96016f3216b879611e29e17ce6ff18267 100644 --- a/pdf/out_of_process_instance.cc +++ b/pdf/out_of_process_instance.cc -@@ -479,7 +479,9 @@ bool OutOfProcessInstance::Init(uint32_t argc, +@@ -486,7 +486,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/chromium/printing.patch b/patches/chromium/printing.patch index a5ce8e91b1c49..2274c08f6eeb8 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -11,27 +11,29 @@ majority of changes originally come from these PRs: This patch also fixes callback for manual user cancellation and success. diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc -index 13f9d7af3ae796ecec3a9189aa59f4b20171fd7a..9c35b294340cce070a9f428dac6aa587c93ccc6c 100644 +index ab32d5475a0e269d32f6ab71f7dc82aa9e02035a..9ada750416f02d23c2f9faae0c41e4a7541183f7 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc -@@ -21,12 +21,12 @@ +@@ -21,7 +21,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/printing/print_job.h" -#include "chrome/grit/generated_resources.h" + #include "components/crash/core/common/crash_keys.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" - #include "content/public/browser/notification_service.h" +@@ -29,6 +28,7 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" + #include "printing/backend/print_backend.h" +#include "electron/grit/electron_resources.h" #include "printing/print_job_constants.h" #include "printing/printed_document.h" #include "printing/printing_utils.h" -@@ -203,9 +203,14 @@ void PrintJobWorker::SetSettingsFromPOD( - void PrintJobWorker::UpdatePrintSettings(base::Value new_settings, - SettingsCallback callback) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); +@@ -221,9 +221,14 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings, + print_backend->GetPrinterDriverInfo(printer_name)); + } + - PrintingContext::Result result = - printing_context_->UpdatePrintSettings(std::move(new_settings)); - GetSettingsDone(std::move(callback), result); @@ -46,7 +48,7 @@ index 13f9d7af3ae796ecec3a9189aa59f4b20171fd7a..9c35b294340cce070a9f428dac6aa587 } #if defined(OS_CHROMEOS) -@@ -221,6 +226,13 @@ void PrintJobWorker::UpdatePrintSettingsFromPOD( +@@ -239,6 +244,13 @@ void PrintJobWorker::UpdatePrintSettingsFromPOD( void PrintJobWorker::GetSettingsDone(SettingsCallback callback, PrintingContext::Result result) { @@ -378,7 +380,7 @@ index 9fbea6d0a2dbe55b1d600fbc217dee5aa8ae8cd5..de9bd267e408c02fd4da7d903523c0e6 // 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 f9f5d1c07e4068d0706770ca81bd92ce166c3822..9f0e079b941296fa27b8cf0a66abfa45a6183b42 100644 +index 200288ee10e3e3dd452d6e9e44ac0af88357ccd3..2403f9a80b3d53c703bd4d63f7656afbe22ecd69 100644 --- a/components/printing/common/print_messages.h +++ b/components/printing/common/print_messages.h @@ -365,7 +365,9 @@ IPC_MESSAGE_ROUTED0(PrintMsg_PrintNodeUnderContextMenu) @@ -389,11 +391,11 @@ index f9f5d1c07e4068d0706770ca81bd92ce166c3822..9f0e079b941296fa27b8cf0a66abfa45 +IPC_MESSAGE_ROUTED2(PrintMsg_PrintPages, + bool /* silent print */, + base::DictionaryValue /* settings */) + #endif - // Like PrintMsg_PrintPages, but using the print preview document's frame/node. - IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog) + // Print content of an out-of-process subframe. diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a4b449850 100644 +index 656bb69e16d3c4cc9dbc95c3192fa12dee07a4ac..abe11e14993775fe88c6aa8fc6b2e11090afa5e4 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -38,6 +38,7 @@ @@ -404,7 +406,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a #include "printing/units.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" #include "third_party/blink/public/common/frame/frame_owner_element_type.h" -@@ -1149,7 +1150,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { +@@ -1141,7 +1142,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { web_frame->DispatchBeforePrintEvent(); if (!weak_this) return; @@ -414,9 +416,18 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a if (weak_this) web_frame->DispatchAfterPrintEvent(); } -@@ -1224,7 +1226,9 @@ void PrintRenderFrameHelper::InitiatePrintPreview( - #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) +@@ -1191,7 +1193,7 @@ void PrintRenderFrameHelper::PrintForSystemDialog() { + } + auto weak_this = weak_ptr_factory_.GetWeakPtr(); + Print(frame, print_preview_context_.source_node(), +- PrintRequestType::kRegular); ++ PrintRequestType::kRegular, false, base::DictionaryValue()); + if (weak_this) + frame->DispatchAfterPrintEvent(); + // WARNING: |this| may be gone at this point. Do not do any more work here and +@@ -1230,7 +1232,9 @@ void PrintRenderFrameHelper::OnPrintPreviewDialogClosed() { } + #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) -void PrintRenderFrameHelper::OnPrintPages() { +void PrintRenderFrameHelper::OnPrintPages( @@ -425,7 +436,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a if (ipc_nesting_level_ > 1) return; -@@ -1237,7 +1241,8 @@ void PrintRenderFrameHelper::OnPrintPages() { +@@ -1243,7 +1247,8 @@ void PrintRenderFrameHelper::OnPrintPages() { // If we are printing a PDF extension frame, find the plugin node and print // that instead. auto plugin = delegate_->GetPdfElement(frame); @@ -435,16 +446,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a if (weak_this) frame->DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and -@@ -1254,7 +1259,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() { - } - auto weak_this = weak_ptr_factory_.GetWeakPtr(); - Print(frame, print_preview_context_.source_node(), -- PrintRequestType::kRegular); -+ PrintRequestType::kRegular, false, base::DictionaryValue()); - if (weak_this) - frame->DispatchAfterPrintEvent(); - // WARNING: |this| may be gone at this point. Do not do any more work here and -@@ -1289,6 +1294,8 @@ void PrintRenderFrameHelper::OnPrintPreview( +@@ -1278,6 +1283,8 @@ void PrintRenderFrameHelper::OnPrintPreview( if (ipc_nesting_level_ > 1) return; @@ -453,7 +455,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a print_preview_context_.OnPrintPreview(); UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent", -@@ -1662,7 +1669,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1645,7 +1652,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { auto self = weak_ptr_factory_.GetWeakPtr(); Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, @@ -464,7 +466,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a // Check if |this| is still valid. if (!self) return; -@@ -1673,7 +1682,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1656,7 +1665,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -475,7 +477,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a // If still not finished with earlier print request simply ignore. if (prep_frame_view_) return; -@@ -1681,7 +1692,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1664,7 +1675,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, FrameReference frame_ref(frame); int expected_page_count = 0; @@ -484,7 +486,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a DidFinishPrinting(FAIL_PRINT_INIT); return; // Failed to init print page settings. } -@@ -1701,8 +1712,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1684,8 +1695,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, PrintMsg_PrintPages_Params print_settings; auto self = weak_ptr_factory_.GetWeakPtr(); @@ -498,7 +500,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a // Check if |this| is still valid. if (!self) return; -@@ -1926,10 +1940,23 @@ void PrintRenderFrameHelper::IPCProcessed() { +@@ -1909,10 +1923,23 @@ void PrintRenderFrameHelper::IPCProcessed() { base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); } @@ -525,7 +527,7 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a // 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. -@@ -1949,12 +1976,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { +@@ -1932,12 +1959,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { return result; } @@ -545,20 +547,20 @@ index 27cf579e4ca10661c34c130097783f02e13f3521..e8f1b610fb8fa700ac3de9df268a7b6a 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 00b3e4647a192411262bc5e7c1c0cfac3e3f81bb..5bade84672ef9d8b8acb8e8d503760aca6635cb7 100644 +index aca69e7b68ad1fb0f623f729337ff5de54f97584..f9c9c027adfad345954bf7c8484e9534fa3ece8c 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h -@@ -204,7 +204,8 @@ class PrintRenderFrameHelper - bool has_selection) override; +@@ -221,7 +221,8 @@ class PrintRenderFrameHelper + #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) // Message handlers --------------------------------------------------------- - void OnPrintPages(); + void OnPrintPages(bool silent, + const base::DictionaryValue& settings); - void OnPrintForSystemDialog(); #if BUILDFLAG(ENABLE_PRINT_PREVIEW) void OnPrintPreview(const base::DictionaryValue& settings); -@@ -253,7 +254,9 @@ class PrintRenderFrameHelper + #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) +@@ -268,7 +269,9 @@ class PrintRenderFrameHelper // WARNING: |this| may be gone after this method returns. void Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -569,7 +571,7 @@ index 00b3e4647a192411262bc5e7c1c0cfac3e3f81bb..5bade84672ef9d8b8acb8e8d503760ac // Notification when printing is done - signal tear-down/free resources. void DidFinishPrinting(PrintingResult result); -@@ -262,12 +265,14 @@ class PrintRenderFrameHelper +@@ -277,12 +280,14 @@ class PrintRenderFrameHelper // Initialize print page settings with default settings. // Used only for native printing workflow. @@ -587,10 +589,10 @@ index 00b3e4647a192411262bc5e7c1c0cfac3e3f81bb..5bade84672ef9d8b8acb8e8d503760ac #if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Set options for print preset from source PDF document. diff --git a/printing/print_settings_conversion.cc b/printing/print_settings_conversion.cc -index 7403d3ea6200e2443ca23cb483c2a36fa6ff5027..05fcb8c2ef6d1074cf37b8974830d3fe1dd6e011 100644 +index f844f92e2cc3b094e265ab40d4e47a4ab57b6ce0..fb903c30e68e1baa1a5ccaf0f0424df48c2a6a01 100644 --- a/printing/print_settings_conversion.cc +++ b/printing/print_settings_conversion.cc -@@ -184,11 +184,12 @@ bool PrintSettingsFromJobSettings(const base::Value& job_settings, +@@ -182,6 +182,8 @@ bool PrintSettingsFromJobSettings(const base::Value& job_settings, settings->set_dpi_xy(dpi_horizontal.value(), dpi_vertical.value()); #endif @@ -599,16 +601,11 @@ index 7403d3ea6200e2443ca23cb483c2a36fa6ff5027..05fcb8c2ef6d1074cf37b8974830d3fe settings->set_collate(collate.value()); settings->set_copies(copies.value()); - settings->SetOrientation(landscape.value()); -- settings->set_device_name(base::UTF8ToUTF16(*device_name)); - settings->set_duplex_mode(static_cast(duplex_mode.value())); - settings->set_color(static_cast(color.value())); - settings->set_scale_factor(static_cast(scale_factor.value()) / 100.0); diff --git a/printing/printing_context.cc b/printing/printing_context.cc -index cd5c27c87df175676504a06b4e1904f6b836dc90..c4f6acf66bc69f1e7db633aa5b3b03a913ffb666 100644 +index 73940192472b1576a701cad3abbb92f2d72aa77e..bc0d39ccd113306691ae532e9fbc5b64c9aa0a33 100644 --- a/printing/printing_context.cc +++ b/printing/printing_context.cc -@@ -93,8 +93,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() { +@@ -90,8 +90,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() { PrintingContext::Result PrintingContext::UpdatePrintSettings( base::Value job_settings) { diff --git a/patches/chromium/proxy_config_monitor.patch b/patches/chromium/proxy_config_monitor.patch index 9d169294b2829..c681b36229112 100644 --- a/patches/chromium/proxy_config_monitor.patch +++ b/patches/chromium/proxy_config_monitor.patch @@ -6,7 +6,7 @@ Subject: proxy_config_monitor.patch Allow monitoring proxy config changes for a pref service. diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc -index f1e287553244cfd1054c4949ffbb1acdaccbe1e2..94cbca68cedc314d55993375bc48159c9a9bfb3d 100644 +index 342db7adee575cc49a38bbdfcf1bbfcc0e30cf57..fc8e6b49d96534546dfa97846c2be79cff8a96e5 100644 --- a/chrome/browser/net/proxy_config_monitor.cc +++ b/chrome/browser/net/proxy_config_monitor.cc @@ -10,7 +10,9 @@ @@ -19,7 +19,7 @@ index f1e287553244cfd1054c4949ffbb1acdaccbe1e2..94cbca68cedc314d55993375bc48159c #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "content/public/browser/browser_thread.h" #include "mojo/public/cpp/bindings/associated_interface_ptr.h" -@@ -19,12 +21,13 @@ +@@ -21,12 +23,13 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #endif // defined(OS_CHROMEOS) @@ -34,7 +34,7 @@ index f1e287553244cfd1054c4949ffbb1acdaccbe1e2..94cbca68cedc314d55993375bc48159c ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(profile); -@@ -54,6 +57,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { +@@ -56,6 +59,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { proxy_config_service_->AddObserver(this); } @@ -67,7 +67,7 @@ index f1e287553244cfd1054c4949ffbb1acdaccbe1e2..94cbca68cedc314d55993375bc48159c } #endif diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h -index 0f20947c7819c3be2086a69f5997412652a99915..a88a1e001a4c1b8d7bafdac74fb060a1ee30361d 100644 +index abffb6dbdbf730e2cc4423eaca6a9a8a9f8af582..7fe1badcdebebce9028825ac98d7ab6cfa65dcdd 100644 --- a/chrome/browser/net/proxy_config_monitor.h +++ b/chrome/browser/net/proxy_config_monitor.h @@ -40,11 +40,12 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer, @@ -84,11 +84,12 @@ index 0f20947c7819c3be2086a69f5997412652a99915..a88a1e001a4c1b8d7bafdac74fb060a1 // Creates a ProxyConfigMonitor that gets proxy settings from the // |local_state|, for use with NetworkContexts not // associated with a profile. Must be destroyed before |local_state|. -@@ -91,7 +92,6 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer, +@@ -91,7 +92,7 @@ class ProxyConfigMonitor : public net::ProxyConfigService::Observer, #if BUILDFLAG(ENABLE_EXTENSIONS) - mojo::BindingSet error_binding_set_; + mojo::ReceiverSet error_receiver_set_; - Profile* profile_ = nullptr; ++ // Profile* profile_ = nullptr; #endif DISALLOW_COPY_AND_ASSIGN(ProxyConfigMonitor); diff --git a/patches/chromium/put_back_deleted_colors_for_autofill.patch b/patches/chromium/put_back_deleted_colors_for_autofill.patch index 61269b60b2f93..99662718c4cfd 100644 --- a/patches/chromium/put_back_deleted_colors_for_autofill.patch +++ b/patches/chromium/put_back_deleted_colors_for_autofill.patch @@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them. This patch can be our autofill implementation to work like Chromium's. diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk.cc b/chrome/browser/ui/libgtkui/native_theme_gtk.cc -index b77b8a53b0246b05e3c45e74eaf2b5c44c6dad88..7af171f6cd5d76e87e2fca32f5dbcc34d7e0a974 100644 +index ad87f4729fe2cec2cf6e12b5bfcaf68bccf0390d..b1c3fd0f798d520da0637268dcbd51ecde9b40a7 100644 --- a/chrome/browser/ui/libgtkui/native_theme_gtk.cc +++ b/chrome/browser/ui/libgtkui/native_theme_gtk.cc @@ -279,6 +279,27 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) { diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch index 50fe4ffdada08..a55ff131f1de2 100644 --- a/patches/chromium/render_widget_host_view_mac.patch +++ b/patches/chromium/render_widget_host_view_mac.patch @@ -66,7 +66,7 @@ index d8de080eb6a30f16282661941b9a95da4fa41d70..326c5a13f6924643c699ca3cc2f98262 return validAttributesForMarkedText_.get(); } diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm -index ed9ea51809ec7f06b246b933281dc22b9b0055f7..32f3f2cceb742065db8b52a9f6aa814cfc30f955 100644 +index 4549c3d871d4c07333a557e311e38755c116fe45..de722efe61cb6823e62f1101b5aa3447f6795687 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -63,6 +63,7 @@ diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 5124163d5b78c..1cadfc329d0bd 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,10 +52,10 @@ Some alternatives to this patch: None of these options seems like a substantial maintainability win over this patch to me (@nornagon). diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 92fe7cd1cc2181277c4c49ee978762d1b32c8116..858d53eb3f7e5b358860e5ea3b15612e4015b1ed 100644 +index 16653e1529b61e4418009cb72f977b161a782688..a75a6401059e4ed354af3b5c612cf91afb99f841 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1599,7 +1599,7 @@ if (is_chrome_branded && !is_android) { +@@ -1612,7 +1612,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index 92fe7cd1cc2181277c4c49ee978762d1b32c8116..858d53eb3f7e5b358860e5ea3b15612e chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1623,6 +1623,12 @@ if (!is_android) { +@@ -1636,6 +1636,12 @@ if (!is_android) { } } diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index 7fddae77b0bdb..851f5c133401a 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/patches/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 81aceae802b32bc21f639996cb197e62cf52af1d..8bd95d5053f7911074041a62581097c8eb2322aa 100644 +index 64cd13931994c2cea7902f2943e4474d1266e764..48b09a3c33f341ee4ad6e340476f437828fce7e4 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1523,7 +1523,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { +@@ -1530,7 +1530,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/ssl_security_state_tab_helper.patch b/patches/chromium/ssl_security_state_tab_helper.patch index d8cc170bbbc68..7ce3cc495656c 100644 --- a/patches/chromium/ssl_security_state_tab_helper.patch +++ b/patches/chromium/ssl_security_state_tab_helper.patch @@ -6,7 +6,7 @@ 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 e971e3506864865d1b05218d42fa5d54a72cc742..a1aa2036c405dbbc310b12ac6c956579cf1aa1d9 100644 +index 9759e2055deb13e72e7a0f0a35513a8dc194f0ce..c9a723500a69782ce9788ce43a0f6f65afcba3ee 100644 --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc @@ -13,21 +13,25 @@ @@ -72,7 +72,7 @@ index e971e3506864865d1b05218d42fa5d54a72cc742..a1aa2036c405dbbc310b12ac6c956579 SecurityStateTabHelper::SecurityStateTabHelper( content::WebContents* web_contents) -@@ -145,6 +153,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const { +@@ -158,6 +166,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() { // information is still being initialized, thus no need to check for that. state->malicious_content_status = GetMaliciousContentStatus(); @@ -80,15 +80,15 @@ index e971e3506864865d1b05218d42fa5d54a72cc742..a1aa2036c405dbbc310b12ac6c956579 safety_tips::ReputationWebContentsObserver* reputation_web_contents_observer = safety_tips::ReputationWebContentsObserver::FromWebContents( web_contents()); -@@ -153,6 +162,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() const { - ? reputation_web_contents_observer - ->GetSafetyTipStatusForVisibleNavigation() - : security_state::SafetyTipStatus::kUnknown; +@@ -167,6 +176,7 @@ SecurityStateTabHelper::GetVisibleSecurityState() { + ->GetSafetyTipInfoForVisibleNavigation() + : security_state::SafetyTipInfo( + {security_state::SafetyTipStatus::kUnknown, GURL()}); +#endif return state; } -@@ -220,6 +230,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { +@@ -235,6 +245,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { web_contents()->GetController().GetVisibleEntry(); if (!entry) return security_state::MALICIOUS_CONTENT_STATUS_NONE; @@ -96,7 +96,7 @@ index e971e3506864865d1b05218d42fa5d54a72cc742..a1aa2036c405dbbc310b12ac6c956579 safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -298,6 +309,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { +@@ -317,6 +328,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { break; } } diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index 002897bfd514f..3dd8f6fda84f8 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/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 3e85adafd4e5173d5ea9680a28e41fd8f4efbdfd..0408a35db18ecdcad1521e4123aed4bd12bcf2c8 100644 +index e25b8ee5d7f2752ee1a816a833e0fb99e13450d7..9cb8d6a3c48257049be1a1a68ed80c4887c38081 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -400,6 +400,11 @@ class RendererSandboxedProcessLauncherDelegate +@@ -408,6 +408,11 @@ class RendererSandboxedProcessLauncherDelegate { } @@ -37,7 +37,7 @@ index 3e85adafd4e5173d5ea9680a28e41fd8f4efbdfd..0408a35db18ecdcad1521e4123aed4bd ~RendererSandboxedProcessLauncherDelegate() override {} #if defined(OS_WIN) -@@ -421,6 +426,9 @@ class RendererSandboxedProcessLauncherDelegate +@@ -429,6 +434,9 @@ class RendererSandboxedProcessLauncherDelegate #if BUILDFLAG(USE_ZYGOTE_HANDLE) service_manager::ZygoteHandle GetZygote() override { @@ -47,7 +47,7 @@ index 3e85adafd4e5173d5ea9680a28e41fd8f4efbdfd..0408a35db18ecdcad1521e4123aed4bd const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); base::CommandLine::StringType renderer_prefix = -@@ -435,10 +443,13 @@ class RendererSandboxedProcessLauncherDelegate +@@ -443,10 +451,13 @@ class RendererSandboxedProcessLauncherDelegate return service_manager::SANDBOX_TYPE_RENDERER; } @@ -62,7 +62,7 @@ index 3e85adafd4e5173d5ea9680a28e41fd8f4efbdfd..0408a35db18ecdcad1521e4123aed4bd }; const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey"; -@@ -1734,11 +1745,18 @@ bool RenderProcessHostImpl::Init() { +@@ -1690,11 +1701,18 @@ bool RenderProcessHostImpl::Init() { cmd_line->PrependWrapper(renderer_prefix); AppendRendererCommandLine(cmd_line.get()); diff --git a/patches/chromium/ui_views_fix_jumbo_build.patch b/patches/chromium/ui_views_fix_jumbo_build.patch index 12904febe82e3..d0136045b4be0 100644 --- a/patches/chromium/ui_views_fix_jumbo_build.patch +++ b/patches/chromium/ui_views_fix_jumbo_build.patch @@ -16,10 +16,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsFormControlsRefreshEnabled(); ninja: build stopped: subcommand failed. diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn -index b92fe5397a0f6223ef0c171755cc6e473c225b59..951ba8fedf20dd836adf48f70fa68f2f4128d88a 100644 +index 4e5403b55344fcd96789a8558a7f3a6979fc4249..b3b2f31573a85116c3a5b9c810a66bdf9705700b 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn -@@ -592,6 +592,7 @@ jumbo_component("views") { +@@ -591,6 +591,7 @@ jumbo_component("views") { "win/scoped_enable_unadjusted_mouse_events_win.cc", "win/scoped_fullscreen_visibility.cc", ] diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch index 857e53e38ad77..ca0ccf147af9e 100644 --- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch +++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch @@ -6,10 +6,10 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch Unsandboxed ppapi processes should skip zygote. diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc -index 86c23036817bc69ed44331acb5257582a3c66ff9..f3e184daf801dacb6a1a57ace82d22734ba770c5 100644 +index b906149ca57ea427d04752565cc21dc86728a72a..8cff1826d89d6e128d40ffb748a5f2ebf9c270e0 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc -@@ -128,6 +128,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate +@@ -124,6 +124,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate service_manager::ZygoteHandle GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 3aa605bbda0c8..732442b68afa7 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/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 3eea51d39eb9239e0eb5d706497d84c8bb1b156f..8586f71224f1cae6a5e9b4005a6acfef9ff64d4d 100644 +index 85395220a8f284becfac1f7fa2f13e23c1f4ccd1..f86de74bd99a3d4442c48e4f7a939a224d5e7880 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -2135,6 +2135,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2124,6 +2124,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 3eea51d39eb9239e0eb5d706497d84c8bb1b156f..8586f71224f1cae6a5e9b4005a6acfef WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -2150,6 +2156,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2139,6 +2145,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { &render_view_host_delegate_view_); } } @@ -92,7 +92,7 @@ index c45581fd22b7ba28b76bdebfffdc872b820798c8..f22ac0e611cc79aa1bc7f85836d69e3a RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForChildWidget( diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index 6708e254b314efc2366b86e0dcd5b312ec77038e..94a5b87ca72998729f1fca14f247914bb81d60d1 100644 +index 075dd25454306b3f689cf58245ac448b25a64f93..750de66b8002ba66d0f2247d0075da1e51ac764c 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -79,9 +79,12 @@ class BrowserPluginGuestDelegate; diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 939a409828bc8..3532d03ae34b5 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -5,10 +5,10 @@ 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 902bd023e6d2e26a5a89ed441651edd5f364f009..906920393c34043d19183064a2a4506c0a03e80d 100644 +index c1ed9f008b495d4afe05c21a81639383758b36d1..a05cef66facd477057fedb388e4000475bc76830 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -383,6 +383,11 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -376,6 +376,11 @@ class CONTENT_EXPORT ContentRendererClient { virtual void DidInitializeWorkerContextOnWorkerThread( v8::Local context) {} @@ -21,10 +21,10 @@ index 902bd023e6d2e26a5a89ed441651edd5f364f009..906920393c34043d19183064a2a4506c // An empty URL is returned if the URL is not overriden. virtual GURL OverrideFlashEmbedWithHTML(const GURL& url); diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc -index 875a9079d0d5e97d04ca9870cb1d35dbe39fb24b..08cdba51792cbc73eb55ca7bb1d0ca1711ca97e8 100644 +index a2e3c780db5894509dd2ef5ab6d230459819299c..776b6cbabac2f2a3b864cdd913e73344dd0da7b9 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -994,6 +994,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -948,6 +948,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -38,10 +38,10 @@ index 875a9079d0d5e97d04ca9870cb1d35dbe39fb24b..08cdba51792cbc73eb55ca7bb1d0ca17 const v8::Local& worker) { GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h -index b183977096477563043b288b33d90d3ce9fbd8de..87bd2530eb060c8e68a5a2ca090ce80cd63b942e 100644 +index 68be1b7654919f4cb1ad9e3b1369deb71c704996..cb611deb94cc0b7e3b4675d2c504589bbc9f9907 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h -@@ -200,6 +200,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -193,6 +193,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void DidStartWorkerThread() override; void WillStopWorkerThread() override; void WorkerContextCreated(const v8::Local& worker) override; @@ -50,10 +50,10 @@ index b183977096477563043b288b33d90d3ce9fbd8de..87bd2530eb060c8e68a5a2ca090ce80c const blink::WebString& header_name) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 83b3a264c0731acb567401ce64085560470a457f..70cab2fd7d3f5a30683ad2c8da7dcd453f939502 100644 +index e88219cb6640987ddbacbbb731c5205bc4d5f747..1b03fe2bda55741734610ef4950d60a81f12ac3b 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -692,6 +692,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -665,6 +665,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {}