diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 47e97573b..feae44f89 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/95.0.4638.0' + 'chromium_checkout': 'refs/tags/95.0.4638.10', + 'depot_tools_checkout': 'eff810e93d' } diff --git a/patch/patch.cfg b/patch/patch.cfg index 4b8ce7238..9099c428c 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -545,10 +545,5 @@ patches = [ # Linux: Fix ATK assertion error when generating ARM build config. # https://bugs.chromium.org/p/chromium/issues/detail?id=1123214 'name': 'linux_atk_1123214', - }, - { - # Linux: Fix missing re2 dependency for third_party/maldoca. - # https://chromium-review.googlesource.com/c/chromium/src/+/3128781 - 'name': 'linux_maldoca_3128781', } ] diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index cf8b7b4ae..ae81fb25c 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 a2045328ec276..cf90eda945d20 100644 +index 69032e4832aa8..f62f1d353ee99 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 c4f469831..044d73661 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 9729ece5b3ffe..6a31b31567f24 100644 +index e17b94b67104f..22be126f0c5a4 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -280,6 +280,13 @@ base::OnceCallback* GetMenuShownCallback() { +@@ -283,6 +283,13 @@ base::OnceCallback* GetMenuShownCallback() { return callback.get(); } @@ -16,7 +16,7 @@ index 9729ece5b3ffe..6a31b31567f24 100644 enum class UmaEnumIdLookupType { GeneralEnumId, ContextSpecificEnumId, -@@ -491,6 +498,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { +@@ -494,6 +501,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { if (ContextMenuMatcher::IsExtensionsCustomCommandId(id)) return 1; @@ -27,7 +27,7 @@ index 9729ece5b3ffe..6a31b31567f24 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -667,6 +678,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -670,6 +681,14 @@ RenderViewContextMenu::RenderViewContextMenu( system_app_ = GetBrowser() && GetBrowser()->app_controller() ? GetBrowser()->app_controller()->system_app() : nullptr; @@ -42,7 +42,7 @@ index 9729ece5b3ffe..6a31b31567f24 100644 } RenderViewContextMenu::~RenderViewContextMenu() = default; -@@ -1033,6 +1052,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1026,6 +1045,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 9729ece5b3ffe..6a31b31567f24 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -2819,6 +2844,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting( +@@ -2824,6 +2849,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting( *GetMenuShownCallback() = std::move(cb); } @@ -69,10 +69,10 @@ index 9729ece5b3ffe..6a31b31567f24 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 524cff207c179..801def29a8636 100644 +index 196a699745061..849303df95a32 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -109,6 +109,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, +@@ -111,6 +111,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, static void RegisterMenuShownCallbackForTesting( base::OnceCallback cb); @@ -85,7 +85,7 @@ index 524cff207c179..801def29a8636 100644 protected: Profile* GetProfile() const; -@@ -307,6 +313,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, +@@ -309,6 +315,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, // built. bool is_protocol_submenu_valid_ = false; diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index a6704d124..ca2f37b72 100644 --- a/patch/patches/chrome_browser_net_export.patch +++ b/patch/patches/chrome_browser_net_export.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index e5811d45bd4b6..4f532d65e963f 100644 +index 946ce7804a93d..2dfdde6a04afc 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/features.gni") @@ -10,7 +10,7 @@ index e5811d45bd4b6..4f532d65e963f 100644 import("//chrome/browser/buildflags.gni") import("//chrome/common/features.gni") import("//chromeos/assistant/assistant.gni") -@@ -347,6 +348,10 @@ static_library("ui") { +@@ -346,6 +347,10 @@ static_library("ui") { "//build/config/compiler:wexit_time_destructors", ] @@ -21,7 +21,7 @@ index e5811d45bd4b6..4f532d65e963f 100644 # Since browser and browser_ui actually depend on each other, # we must omit the dependency from browser_ui to browser. # However, this means browser_ui and browser should more or less -@@ -369,6 +374,7 @@ static_library("ui") { +@@ -368,6 +373,7 @@ static_library("ui") { "//build:branding_buildflags", "//build:chromeos_buildflags", "//cc/paint", @@ -29,7 +29,7 @@ index e5811d45bd4b6..4f532d65e963f 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -4984,6 +4990,7 @@ static_library("ui") { +@@ -4988,6 +4994,7 @@ static_library("ui") { if (enable_basic_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 9f2d42fa4..d74cf56d4 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -14,7 +14,7 @@ index 4e76c7a55ac03..a4614a9d2cecb 100644 } diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc -index 5d6cb6f377f81..8c4b53d2f7cc3 100644 +index e184a2418982e..ce80292f01b7c 100644 --- chrome/browser/profiles/profile.cc +++ chrome/browser/profiles/profile.cc @@ -86,6 +86,7 @@ base::LazyInstance>::Leaky diff --git a/patch/patches/chrome_browser_safe_browsing.patch b/patch/patches/chrome_browser_safe_browsing.patch index 4a7421769..3cf4c3eed 100644 --- a/patch/patches/chrome_browser_safe_browsing.patch +++ b/patch/patches/chrome_browser_safe_browsing.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn -index abc27a26195d8..67124b5eccf50 100644 +index adfa159ac4be3..b406a0eb4dd2a 100644 --- chrome/browser/safe_browsing/BUILD.gn +++ chrome/browser/safe_browsing/BUILD.gn -@@ -27,6 +27,7 @@ static_library("safe_browsing") { +@@ -26,6 +26,7 @@ static_library("safe_browsing") { "//chrome/common:constants", "//components/browser_sync", "//components/enterprise/common:strings", diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 1df2dc0a4..a12b6dd0d 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -120,10 +120,10 @@ index e06cd6c3d83db..1f7da7cf79979 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 84044530181a8..737c41a0d01a5 100644 +index 63922bed46718..e8dca023a8150 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -281,11 +281,10 @@ using content::WebContents; +@@ -284,11 +284,10 @@ using content::WebContents; using views::ColumnSet; using web_modal::WebContentsModalDialogHost; @@ -138,7 +138,7 @@ index 84044530181a8..737c41a0d01a5 100644 #if BUILDFLAG(IS_CHROMEOS_ASH) // UMA histograms that record animation smoothness for tab loading animation. -@@ -600,11 +599,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { +@@ -603,11 +602,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { /////////////////////////////////////////////////////////////////////////////// // BrowserView, public: @@ -162,7 +162,7 @@ index 84044530181a8..737c41a0d01a5 100644 SetShowIcon(::ShouldShowWindowIcon(browser_.get())); // In forced app mode, all size controls are always disabled. Otherwise, use -@@ -618,7 +628,6 @@ BrowserView::BrowserView(std::unique_ptr browser) +@@ -621,7 +631,6 @@ BrowserView::BrowserView(std::unique_ptr browser) } browser_->tab_strip_model()->AddObserver(this); @@ -170,7 +170,7 @@ index 84044530181a8..737c41a0d01a5 100644 // Top container holds tab strip region and toolbar and lives at the front of // the view hierarchy. -@@ -662,8 +671,15 @@ BrowserView::BrowserView(std::unique_ptr browser) +@@ -665,8 +674,15 @@ BrowserView::BrowserView(std::unique_ptr browser) contents_container->SetLayoutManager(std::make_unique( devtools_web_view_, contents_web_view_)); @@ -188,7 +188,7 @@ index 84044530181a8..737c41a0d01a5 100644 contents_separator_ = top_container_->AddChildView(std::make_unique()); -@@ -1454,6 +1470,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { +@@ -1465,6 +1481,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { if (immersive_mode_controller_->IsEnabled()) return false; @@ -197,7 +197,7 @@ index 84044530181a8..737c41a0d01a5 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -2527,7 +2545,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { +@@ -2538,7 +2556,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { } void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -207,7 +207,7 @@ index 84044530181a8..737c41a0d01a5 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -2979,8 +2998,10 @@ void BrowserView::Layout() { +@@ -2990,8 +3009,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -220,7 +220,7 @@ index 84044530181a8..737c41a0d01a5 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -3043,6 +3064,11 @@ void BrowserView::AddedToWidget() { +@@ -3054,6 +3075,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -232,7 +232,7 @@ index 84044530181a8..737c41a0d01a5 100644 toolbar_->Init(); #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -3078,13 +3104,9 @@ void BrowserView::AddedToWidget() { +@@ -3089,13 +3115,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -249,10 +249,10 @@ index 84044530181a8..737c41a0d01a5 100644 MaybeInitializeWebUITabStrip(); diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h -index 4709cdd1f29d1..3d79400cbf4a7 100644 +index a9ba4f9841ef4..a373c1a1f1e90 100644 --- chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h -@@ -118,11 +118,16 @@ class BrowserView : public BrowserWindow, +@@ -121,11 +121,16 @@ class BrowserView : public BrowserWindow, public webapps::AppBannerManager::Observer { public: METADATA_HEADER(BrowserView); @@ -269,7 +269,7 @@ index 4709cdd1f29d1..3d79400cbf4a7 100644 void set_frame(BrowserFrame* frame) { frame_ = frame; } BrowserFrame* frame() const { return frame_; } -@@ -679,6 +684,12 @@ class BrowserView : public BrowserWindow, +@@ -684,6 +689,12 @@ class BrowserView : public BrowserWindow, return accessibility_focus_highlight_.get(); } diff --git a/patch/patches/linux_maldoca_3128781.patch b/patch/patches/linux_maldoca_3128781.patch deleted file mode 100644 index e4a1262b3..000000000 --- a/patch/patches/linux_maldoca_3128781.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git third_party/maldoca/BUILD.gn third_party/maldoca/BUILD.gn -index 3fb5c5962c07b..20e5809263398 100644 ---- third_party/maldoca/BUILD.gn -+++ third_party/maldoca/BUILD.gn -@@ -276,6 +276,7 @@ static_library("maldoca") { - "//third_party/boringssl", - "//third_party/libxml", - "//third_party/protobuf:protobuf_lite", -+ "//third_party/re2" - ] - - public_deps = [ diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index 3e74eb914..49d7099c2 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 de63186ea911e..4beccce527c86 100644 +index f3998e40b6d50..761c1615bd1f8 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -498,10 +498,6 @@ class LoginHandlerDelegate { @@ -26,7 +26,7 @@ index de63186ea911e..4beccce527c86 100644 new LoginHandlerDelegate( std::move(auth_challenge_responder), std::move(web_contents_getter), auth_info, is_request_for_main_frame, process_id, request_id, url, -@@ -2689,8 +2679,12 @@ void StoragePartitionImpl::GetQuotaSettings( +@@ -2692,8 +2682,12 @@ void StoragePartitionImpl::GetQuotaSettings( return; } @@ -40,7 +40,7 @@ index de63186ea911e..4beccce527c86 100644 storage::GetDefaultDeviceInfoHelper(), std::move(callback)); } -@@ -2703,6 +2697,11 @@ void StoragePartitionImpl::InitNetworkContext() { +@@ -2706,6 +2700,11 @@ void StoragePartitionImpl::InitNetworkContext() { GetContentClient()->browser()->ConfigureNetworkContextParams( browser_context_, is_in_memory(), relative_partition_path_, context_params.get(), cert_verifier_creation_params.get()); diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index fd58f8a06..b038b33a9 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -44,7 +44,7 @@ index 463e3e5e73419..97aaf0da2b9a5 100644 DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) { diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index cf505929c9f6e..ad6d5b603223f 100644 +index b3bc13e67987a..da2f32c4a8684 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc @@ -1853,7 +1853,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 0c4cb58cb..666f88c44 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 85b4e2ae58841..90f2db47a00bf 100644 +index adf1373005390..b34518a06053b 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd -@@ -5318,7 +5318,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -5327,7 +5327,7 @@ Keep your key file in a safe place. You will need it to create new versions of y