From 16dbbdc6955e1166152775da1c37d7c832d0b039 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 12 Jan 2022 16:45:07 +0000 Subject: [PATCH] Update to Chromium version 98.0.4758.48 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser.patch | 2 +- patch/patches/chrome_browser_context_menus.patch | 2 +- patch/patches/chrome_browser_safe_browsing.patch | 2 +- patch/patches/chrome_runtime.patch | 2 +- patch/patches/embedder_product_override.patch | 4 ++-- patch/patches/extensions_1947.patch | 4 ++-- patch/patches/print_preview_123.patch | 2 +- patch/patches/printing_context_2196.patch | 8 ++++---- patch/patches/services_network_2718.patch | 6 +++--- patch/patches/views_widget.patch | 10 +++++----- patch/patches/web_contents_1257_1565.patch | 4 ++-- patch/patches/webview_plugin_2020.patch | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 65e50edee..0b5a0774b 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/98.0.4758.9', + 'chromium_checkout': 'refs/tags/98.0.4758.48', 'depot_tools_checkout': 'db41eed6b7' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 4a0648fbc..2a010a864 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 9702367345081..d43e8a4f1de43 100644 +index f88e5e225c4b4..99f8d2d710514 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -13,6 +13,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index c37a3170b..7cc2c45d3 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 c1e556eb29076..280e50f8faafe 100644 +index 22721c2ed864b..1198db6ff3a29 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -286,6 +286,13 @@ base::OnceCallback* GetMenuShownCallback() { diff --git a/patch/patches/chrome_browser_safe_browsing.patch b/patch/patches/chrome_browser_safe_browsing.patch index 3fb56aa7a..514606b37 100644 --- a/patch/patches/chrome_browser_safe_browsing.patch +++ b/patch/patches/chrome_browser_safe_browsing.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn -index ebf319ae6be67..24a3c73c2d230 100644 +index ad5bfe976316c..fb3fbfdce6d60 100644 --- chrome/browser/safe_browsing/BUILD.gn +++ chrome/browser/safe_browsing/BUILD.gn @@ -26,6 +26,7 @@ static_library("safe_browsing") { diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index d8c335cfa..d6fdd768b 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -156,7 +156,7 @@ index 97afd5b1ba753..40672e7c4fdf3 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 968b63908b38e..3cbeacd8418e2 100644 +index dc13157123f9f..4a22e4cf885ee 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -28,6 +28,7 @@ diff --git a/patch/patches/embedder_product_override.patch b/patch/patches/embedder_product_override.patch index e24ddfbd4..826fb493d 100644 --- a/patch/patches/embedder_product_override.patch +++ b/patch/patches/embedder_product_override.patch @@ -1,5 +1,5 @@ diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc -index 01051f333b15a..ede45b6c871d9 100644 +index 2c451bda79ae3..bb39a13fe162d 100644 --- components/embedder_support/user_agent_utils.cc +++ components/embedder_support/user_agent_utils.cc @@ -15,6 +15,7 @@ @@ -10,7 +10,7 @@ index 01051f333b15a..ede45b6c871d9 100644 #include "components/embedder_support/switches.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/prefs/pref_service.h" -@@ -256,6 +257,12 @@ const blink::UserAgentBrandList& GetBrandFullVersionList( +@@ -248,6 +249,12 @@ blink::UserAgentBrandList GetBrandFullVersionList( } std::string GetProduct(const bool allow_version_override) { diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index f27550aa5..1bda8e840 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -161,7 +161,7 @@ index f88183071e861..a05302a7a2f0b 100644 // A pointer to the current or speculative main frame in `host_contents_`. We // can't access this frame through the `host_contents_` directly as it does diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h -index 564a62eb00beb..5f29a54e92169 100644 +index 1fa1e67dddcfd..7af2a0e231824 100644 --- extensions/browser/extensions_browser_client.h +++ extensions/browser/extensions_browser_client.h @@ -27,6 +27,7 @@ @@ -180,7 +180,7 @@ index 564a62eb00beb..5f29a54e92169 100644 class ExtensionHostDelegate; class ExtensionSet; class ExtensionSystem; -@@ -206,6 +208,14 @@ class ExtensionsBrowserClient { +@@ -207,6 +209,14 @@ class ExtensionsBrowserClient { virtual std::unique_ptr CreateExtensionHostDelegate() = 0; diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 7e47ea667..9bb122a5f 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -34,7 +34,7 @@ index a45799d6fc9ee..d884e88e754cc 100644 } diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc -index 96929c4158ce5..68bacf03a27ff 100644 +index 1cf3cbf2a5ed0..09f43d550eebc 100644 --- chrome/browser/printing/print_preview_dialog_controller.cc +++ chrome/browser/printing/print_preview_dialog_controller.cc @@ -15,6 +15,7 @@ diff --git a/patch/patches/printing_context_2196.patch b/patch/patches/printing_context_2196.patch index 361f95d9a..419c92a86 100644 --- a/patch/patches/printing_context_2196.patch +++ b/patch/patches/printing_context_2196.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc -index d8f67ab511648..707ca0f50328b 100644 +index e3fb49f7f6121..d23c7afed6e8c 100644 --- chrome/browser/printing/print_job_worker.cc +++ chrome/browser/printing/print_job_worker.cc @@ -142,6 +142,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id) @@ -11,10 +11,10 @@ index d8f67ab511648..707ca0f50328b 100644 PrintJobWorker::~PrintJobWorker() { diff --git printing/printing_context.h printing/printing_context.h -index 7d937e7e3f19d..be49a65eeed94 100644 +index e34fb070b5d1e..015ee3149845a 100644 --- printing/printing_context.h +++ printing/printing_context.h -@@ -177,6 +177,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { +@@ -173,6 +173,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { int job_id() const { return job_id_; } @@ -28,7 +28,7 @@ index 7d937e7e3f19d..be49a65eeed94 100644 protected: explicit PrintingContext(Delegate* delegate); -@@ -221,6 +228,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { +@@ -217,6 +224,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { // The job id for the current job. The value is 0 if no jobs are active. int job_id_; diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index 2296ba43b..542e450f7 100644 --- a/patch/patches/services_network_2718.patch +++ b/patch/patches/services_network_2718.patch @@ -1,5 +1,5 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index 2a729ea2de461..4d6bcddba181d 100644 +index 124eb79407285..93371e667a9d2 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -489,10 +489,6 @@ class LoginHandlerDelegate { @@ -26,7 +26,7 @@ index 2a729ea2de461..4d6bcddba181d 100644 new LoginHandlerDelegate( std::move(auth_challenge_responder), std::move(web_contents_getter), auth_info, is_request_for_primary_main_frame, process_id, request_id, url, -@@ -2717,8 +2707,12 @@ void StoragePartitionImpl::GetQuotaSettings( +@@ -2708,8 +2698,12 @@ void StoragePartitionImpl::GetQuotaSettings( return; } @@ -40,7 +40,7 @@ index 2a729ea2de461..4d6bcddba181d 100644 storage::GetDefaultDeviceInfoHelper(), std::move(callback)); } -@@ -2728,9 +2722,12 @@ void StoragePartitionImpl::InitNetworkContext() { +@@ -2719,9 +2713,12 @@ void StoragePartitionImpl::InitNetworkContext() { cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params = cert_verifier::mojom::CertVerifierCreationParams::New(); diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 96a639d22..63586d0cc 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -309,10 +309,10 @@ index 9432480a38e45..82c4ffa97eee4 100644 // a reference. raw_ptr tooltip_; diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index a2627e07f3131..7acd793ca3cb3 100644 +index bc07e34bde24f..35089937d13aa 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc -@@ -359,7 +359,8 @@ void Widget::Init(InitParams params) { +@@ -340,7 +340,8 @@ void Widget::Init(InitParams params) { } params.child |= (params.type == InitParams::TYPE_CONTROL); @@ -322,7 +322,7 @@ index a2627e07f3131..7acd793ca3cb3 100644 if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred && params.type != views::Widget::InitParams::TYPE_WINDOW) { -@@ -435,13 +436,21 @@ void Widget::Init(InitParams params) { +@@ -416,13 +417,21 @@ void Widget::Init(InitParams params) { if (show_state == ui::SHOW_STATE_MAXIMIZED) { Maximize(); @@ -345,7 +345,7 @@ index a2627e07f3131..7acd793ca3cb3 100644 } native_theme_observation_.Observe(GetNativeTheme()); -@@ -1417,10 +1426,16 @@ void Widget::OnNativeWidgetDestroyed() { +@@ -1402,10 +1411,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) { } gfx::Size Widget::GetMinimumSize() const { @@ -363,7 +363,7 @@ index a2627e07f3131..7acd793ca3cb3 100644 } diff --git ui/views/widget/widget.h ui/views/widget/widget.h -index 52c0b91c81c41..d91ce4fd14094 100644 +index b88cc69c0489d..c254fc09806a5 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h @@ -329,6 +329,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 809cdf3d5..a4997ce5b 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index a3ff7b5dece60..f524e08b1ff08 100644 +index 03b7c24726c2a..ca6e9c2969dd7 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -2971,6 +2971,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -39,7 +39,7 @@ index a3ff7b5dece60..f524e08b1ff08 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -7672,6 +7688,8 @@ void WebContentsImpl::OnAdvanceFocus(RenderFrameHostImpl* source_rfh) { +@@ -7682,6 +7698,8 @@ void WebContentsImpl::OnAdvanceFocus(RenderFrameHostImpl* source_rfh) { GetFocusedWebContents() == GetOuterWebContents()) { SetAsFocusedWebContentsIfNecessary(); } diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 6ad60dbf2..7e9e58981 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,5 +1,5 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index a9fd3a713304a..f55246a93f3ba 100644 +index 2306904107da5..b1c0d5707a700 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -5413,7 +5413,7 @@ Keep your key file in a safe place. You will need it to create new versions of y