From 263160aa1442e0c13f1179fc7fbac5f2a521fa7b Mon Sep 17 00:00:00 2001 From: CEF Spotify Date: Mon, 27 Sep 2021 07:33:45 +0000 Subject: [PATCH] Update to Chromium version 95.0.4638.17 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser_context_menus.patch | 2 +- patch/patches/chrome_browser_net_export.patch | 4 ++-- patch/patches/chrome_browser_profiles.patch | 2 +- patch/patches/chrome_runtime_views.patch | 16 ++++++++-------- patch/patches/content_2015.patch | 4 ++-- patch/patches/webkit_plugin_info_2015.patch | 2 +- patch/patches/webview_plugin_2020.patch | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index feae44f89..4b0b06583 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/95.0.4638.10', + 'chromium_checkout': 'refs/tags/95.0.4638.17', 'depot_tools_checkout': 'eff810e93d' } diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 044d73661..75abb83ef 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 e17b94b67104f..22be126f0c5a4 100644 +index 24d40c76da899..a05d78416b7eb 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -283,6 +283,13 @@ base::OnceCallback* GetMenuShownCallback() { diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index ca2f37b72..de05b6507 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 946ce7804a93d..2dfdde6a04afc 100644 +index a6161392b2698..bab517eeb3a9e 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/features.gni") @@ -29,7 +29,7 @@ index 946ce7804a93d..2dfdde6a04afc 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -4988,6 +4994,7 @@ static_library("ui") { +@@ -4990,6 +4996,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 d74cf56d4..2bb762786 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -113,7 +113,7 @@ index b6c4eee4c9d1a..c8158ff856167 100644 } diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h -index c4d9b563a2bc1..13de953c75ad2 100644 +index 126faf0da6c27..b9acfa7144650 100644 --- chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h @@ -119,7 +119,7 @@ class ProfileManager : public Profile::Delegate { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index a12b6dd0d..5eb2cadd0 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -120,7 +120,7 @@ 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 63922bed46718..e8dca023a8150 100644 +index e7081ab3ec3e8..eb533496ef91c 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -284,11 +284,10 @@ using content::WebContents; @@ -188,7 +188,7 @@ index 63922bed46718..e8dca023a8150 100644 contents_separator_ = top_container_->AddChildView(std::make_unique()); -@@ -1465,6 +1481,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { +@@ -1472,6 +1488,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { if (immersive_mode_controller_->IsEnabled()) return false; @@ -197,7 +197,7 @@ index 63922bed46718..e8dca023a8150 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -2538,7 +2556,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { +@@ -2545,7 +2563,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { } void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -207,7 +207,7 @@ index 63922bed46718..e8dca023a8150 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -2990,8 +3009,10 @@ void BrowserView::Layout() { +@@ -2997,8 +3016,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 63922bed46718..e8dca023a8150 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -3054,6 +3075,11 @@ void BrowserView::AddedToWidget() { +@@ -3061,6 +3082,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -232,7 +232,7 @@ index 63922bed46718..e8dca023a8150 100644 toolbar_->Init(); #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -3089,13 +3115,9 @@ void BrowserView::AddedToWidget() { +@@ -3096,13 +3122,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -368,7 +368,7 @@ index 140c0df49ea46..7d4ac470dcc9a 100644 } diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc -index f290b0d5ea521..31ffa7e61e69f 100644 +index aeda031a86169..229b12b48f975 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -162,12 +162,13 @@ auto& GetViewCommandMap() { @@ -397,7 +397,7 @@ index f290b0d5ea521..31ffa7e61e69f 100644 size_animation_.Reset(1); diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h -index ec77ff5a0611a..0c8d95120d0c5 100644 +index 1da8e4f42dc99..3c86aad64f014 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.h +++ chrome/browser/ui/views/toolbar/toolbar_view.h @@ -91,7 +91,8 @@ class ToolbarView : public views::AccessiblePaneView, diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index cb725dc21..e3e9d20ba 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -348,10 +348,10 @@ index 173952d4545d5..2f311b988c380 100644 &mime_type); if (!found) diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index 52c02371bf373..3cd441e5d9a0d 100644 +index c0a004136c09c..5fbf7092b07ad 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc -@@ -610,6 +610,8 @@ void RenderThreadImpl::Init() { +@@ -616,6 +616,8 @@ void RenderThreadImpl::Init() { GetContentClient()->renderer()->CreateURLLoaderThrottleProvider( blink::URLLoaderThrottleProviderType::kFrame); diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index b038b33a9..4aa73822e 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 b3bc13e67987a..da2f32c4a8684 100644 +index 03454b10d7020..0e3c66a76fb38 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 666f88c44..4cce0d2ad 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 adf1373005390..b34518a06053b 100644 +index 0b1ae29ed8f18..918f42f2f3d69 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -5327,7 +5327,7 @@ Keep your key file in a safe place. You will need it to create new versions of y