From e747782ece7fafec542eb78cd4575d0c5822bc21 Mon Sep 17 00:00:00 2001 From: CEF Spotify Date: Thu, 5 Aug 2021 15:32:06 +0000 Subject: [PATCH] Update to Chromium version 93.0.4577.25 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/base_sandbox_2743.patch | 6 +++--- patch/patches/chrome_browser_context_menus.patch | 10 +++++----- patch/patches/chrome_runtime_views.patch | 2 +- patch/patches/content_2015.patch | 6 +++--- patch/patches/print_preview_123.patch | 12 ++++++------ patch/patches/runhooks.patch | 13 ------------- patch/patches/views_widget.patch | 4 ++-- patch/patches/webview_plugin_2020.patch | 4 ++-- 9 files changed, 23 insertions(+), 36 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index fc262bea3..d64bb40bb 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/93.0.4577.18', + 'chromium_checkout': 'refs/tags/93.0.4577.25', 'depot_tools_checkout': '45d2afa080' } diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index 1ceb9edc2..6bb6e366a 100644 --- a/patch/patches/base_sandbox_2743.patch +++ b/patch/patches/base_sandbox_2743.patch @@ -1,5 +1,5 @@ diff --git base/BUILD.gn base/BUILD.gn -index 576bd49a6198..d5872f293f7c 100644 +index 1c989c7e9221..b8b637397f61 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -34,6 +34,7 @@ import("//build/config/ui.gni") @@ -10,7 +10,7 @@ index 576bd49a6198..d5872f293f7c 100644 import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/test.gni") import("//third_party/icu/config.gni") -@@ -1731,7 +1732,11 @@ component("base") { +@@ -1733,7 +1734,11 @@ component("base") { "hash/md5_constexpr_internal.h", "hash/sha1.h", ] @@ -23,7 +23,7 @@ index 576bd49a6198..d5872f293f7c 100644 sources += [ "hash/md5_nacl.cc", "hash/md5_nacl.h", -@@ -1978,6 +1983,12 @@ component("base") { +@@ -1980,6 +1985,12 @@ component("base") { defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ] } diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 1ab38f5c1..02c69886c 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 00cffaf573b2..e324126c2dae 100644 +index 7029436a258c..99e09f3b6523 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -274,6 +274,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -42,7 +42,7 @@ index 00cffaf573b2..e324126c2dae 100644 } RenderViewContextMenu::~RenderViewContextMenu() = default; -@@ -1024,6 +1043,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1025,6 +1044,12 @@ void RenderViewContextMenu::InitMenu() { // menu, meaning that each menu item added/removed in this function will cause // it to visibly jump on the screen (see b/173569669). AppendQuickAnswersItems(); @@ -55,7 +55,7 @@ index 00cffaf573b2..e324126c2dae 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -2744,6 +2769,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting( +@@ -2745,6 +2770,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting( *GetMenuShownCallback() = std::move(cb); } @@ -69,7 +69,7 @@ index 00cffaf573b2..e324126c2dae 100644 RenderViewContextMenu::GetHandlersForLinkUrl() { ProtocolHandlerRegistry::ProtocolHandlerList handlers = diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h -index 34b6152a222e..b03c81bd076b 100644 +index 7b6f19105c8e..277b2f4e95a4 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -101,6 +101,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, @@ -85,7 +85,7 @@ index 34b6152a222e..b03c81bd076b 100644 protected: Profile* GetProfile() const; -@@ -296,6 +302,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, +@@ -297,6 +303,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, // built. bool is_protocol_submenu_valid_ = false; diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 8cb9bae70..a96133b47 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -120,7 +120,7 @@ index 0ce7abdeb7d9..8197a6bb7da9 100644 // Initialize the frame (creates the underlying native window). diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc -index 338c049c8116..6a1a97b37573 100644 +index 18c19c28cddd..c07387019480 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -589,11 +589,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 29a93dd42..c8ece2ed6 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -188,10 +188,10 @@ index 632ae86c6fd6..55b749ec1242 100644 const std::vector& all_plugins); diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 33b210a8bba5..4b13dc734b67 100644 +index ee638fbd09ad..ef1a5567a0fa 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -11954,6 +11954,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( +@@ -11960,6 +11960,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( } void RenderFrameHostImpl::GetPluginInfo(const GURL& url, @@ -199,7 +199,7 @@ index 33b210a8bba5..4b13dc734b67 100644 const url::Origin& main_frame_origin, const std::string& mime_type, GetPluginInfoCallback callback) { -@@ -11961,7 +11962,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, +@@ -11967,7 +11968,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, WebPluginInfo info; std::string actual_mime_type; bool found = PluginServiceImpl::GetInstance()->GetPluginInfo( diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 6116753d3..3de71c20f 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -58,7 +58,7 @@ index 4ff73fd2d9ec..d56686d8284b 100644 // Add an entry to the map. preview_dialog_map_[preview_dialog] = initiator; diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc -index 867227684ddb..98986fdad1e7 100644 +index e345c611cac0..373b1b92cc55 100644 --- chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc @@ -21,6 +21,7 @@ @@ -97,10 +97,10 @@ index 867227684ddb..98986fdad1e7 100644 void NotifySystemDialogCancelled(int render_process_id, int routing_id) { diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h -index 48e2baa05cdf..b4da112845d8 100644 +index eaa0e162a339..8e030d2ab399 100644 --- chrome/browser/printing/print_view_manager_base.h +++ chrome/browser/printing/print_view_manager_base.h -@@ -124,9 +124,6 @@ class PrintViewManagerBase : public content::NotificationObserver, +@@ -126,9 +126,6 @@ class PrintViewManagerBase : public content::NotificationObserver, // Manages the low-level talk to the printer. scoped_refptr print_job_; @@ -304,7 +304,7 @@ index e326047aef5e..4fc8898e95b6 100644 base::FilePath GetSaveLocation() const; diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc -index 5cebaa1d75b7..3c2fae113c67 100644 +index 83707d6c0c68..3c17f84d0fa7 100644 --- chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -25,6 +25,7 @@ @@ -315,7 +315,7 @@ index 5cebaa1d75b7..3c2fae113c67 100644 #include "chrome/browser/account_manager_facade_factory.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/bad_message.h" -@@ -1151,6 +1152,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler( +@@ -1154,6 +1155,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler( } #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) if (printer_type == mojom::PrinterType::kPrivet && @@ -323,7 +323,7 @@ index 5cebaa1d75b7..3c2fae113c67 100644 GetPrefs()->GetBoolean(prefs::kForceEnablePrivetPrinting)) { if (!privet_printer_handler_) { privet_printer_handler_ = -@@ -1158,6 +1160,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler( +@@ -1161,6 +1163,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler( } return privet_printer_handler_.get(); } diff --git a/patch/patches/runhooks.patch b/patch/patches/runhooks.patch index d033162a3..4bf4cd63a 100644 --- a/patch/patches/runhooks.patch +++ b/patch/patches/runhooks.patch @@ -1,16 +1,3 @@ -diff --git .vpython3 .vpython3 -index 14faab39343e..0aeeb03f79bd 100644 ---- .vpython3 -+++ .vpython3 -@@ -204,7 +204,7 @@ wheel < - - wheel < - name: "infra/python/wheels/py-py2_py3" -- version: "version:1.5.3" -+ version: "version:1.10.0" - > - - wheel < diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py index c1d2fa2ce0aa..d1d215f35ac1 100644 --- build/toolchain/win/setup_toolchain.py diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 734717779..9add95fd7 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -272,7 +272,7 @@ index 20bcac8ebadf..f36e48dbf654 100644 // a reference. corewm::TooltipWin* tooltip_; diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index a742d7d7f5d5..ac66f0cb1800 100644 +index 4b7f2bbe19ab..2ddfa798af91 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -332,7 +332,8 @@ void Widget::Init(InitParams params) { @@ -317,7 +317,7 @@ index a742d7d7f5d5..ac66f0cb1800 100644 } diff --git ui/views/widget/widget.h ui/views/widget/widget.h -index d6ce8c4934ed..773125ba2dd5 100644 +index 4a1527951ae3..893682be9bff 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h @@ -326,6 +326,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 3d162cdc6..533ded119 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,8 +1,8 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index 220e8eed1ff4..2191e5bd8fcd 100644 +index d8488d90dc96..2401d987baae 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd -@@ -5286,7 +5286,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5287,7 +5287,7 @@ Keep your key file in a safe place. You will need it to create new versions of y