From edadb98b2208e37037cfda2e86ebfe26f2bf895b Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 4 Mar 2022 15:10:20 +0000 Subject: [PATCH] Update to Chromium version 100.0.4896.20 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/base_sandbox_2743.patch | 4 ++-- patch/patches/chrome_browser_net_export.patch | 4 ++-- patch/patches/chrome_runtime.patch | 12 +++++----- patch/patches/chrome_runtime_views.patch | 22 +++++++++---------- patch/patches/content_2015.patch | 14 ++++++------ patch/patches/osr_fling_2745.patch | 4 ++-- patch/patches/services_network_2622.patch | 6 ++--- patch/patches/services_network_2718.patch | 6 ++--- patch/patches/views_widget.patch | 4 ++-- patch/patches/web_contents_1257_1565.patch | 4 ++-- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 1c9d31323..b53da8f17 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/100.0.4896.8', + 'chromium_checkout': 'refs/tags/100.0.4896.20', 'depot_tools_checkout': '32645dfee9' } diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index 460d47079..d06b06d52 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 8243e7ad76529..a013002ac9d1e 100644 +index 855ad1489f456..8c8c6559973a2 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -37,6 +37,7 @@ import("//build/nocompile.gni") @@ -23,7 +23,7 @@ index 8243e7ad76529..a013002ac9d1e 100644 sources += [ "hash/md5_nacl.cc", "hash/md5_nacl.h", -@@ -2136,6 +2141,12 @@ mixed_component("base") { +@@ -2137,6 +2142,12 @@ mixed_component("base") { defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ] } diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index 293b4de42..413c094ba 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 d0335e2fb75e2..8ffd1efa13703 100644 +index 29b4dabf6c3d5..32ea10d5046a5 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -10,6 +10,7 @@ import("//build/config/features.gni") @@ -29,7 +29,7 @@ index d0335e2fb75e2..8ffd1efa13703 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -5293,6 +5299,7 @@ static_library("ui") { +@@ -5300,6 +5306,7 @@ static_library("ui") { if (enable_basic_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 026a8c3ed..e4f41a483 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -170,7 +170,7 @@ index 831d7173873d1..594aee58331a7 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index d590b2d42f416..e1039ef8b78b4 100644 +index 2d3d64f06e330..a936eba6c8349 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -28,6 +28,7 @@ @@ -181,7 +181,7 @@ index d590b2d42f416..e1039ef8b78b4 100644 #include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/after_startup_task_utils.h" -@@ -3705,9 +3706,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -3718,9 +3719,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -193,7 +193,7 @@ index d590b2d42f416..e1039ef8b78b4 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -5340,7 +5343,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -5353,7 +5356,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( network_service); } @@ -202,7 +202,7 @@ index d590b2d42f416..e1039ef8b78b4 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -5358,6 +5361,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -5371,6 +5374,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -212,10 +212,10 @@ index d590b2d42f416..e1039ef8b78b4 100644 std::vector diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h -index f2a7fdf291652..f106b11e61ab0 100644 +index 79b637d77174d..15d5483eeea7a 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h -@@ -557,7 +557,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -561,7 +561,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { override; void OnNetworkServiceCreated( network::mojom::NetworkService* network_service) override; diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index c3220f8ea..5e198091e 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -139,7 +139,7 @@ index 67496d7ab6c50..fa97b9abe6253 100644 BrowserFrame(const BrowserFrame&) = delete; BrowserFrame& operator=(const BrowserFrame&) = delete; diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc -index 0f9a2e8b91715..355bdf6fa9074 100644 +index 1da4bd396d452..3a7f82497d487 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -297,11 +297,10 @@ using content::WebContents; @@ -216,7 +216,7 @@ index 0f9a2e8b91715..355bdf6fa9074 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -2824,7 +2842,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { +@@ -2816,7 +2834,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { } void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -226,7 +226,7 @@ index 0f9a2e8b91715..355bdf6fa9074 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -3313,8 +3332,10 @@ void BrowserView::Layout() { +@@ -3305,8 +3324,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -239,7 +239,7 @@ index 0f9a2e8b91715..355bdf6fa9074 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -3380,6 +3401,11 @@ void BrowserView::AddedToWidget() { +@@ -3372,6 +3393,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -251,7 +251,7 @@ index 0f9a2e8b91715..355bdf6fa9074 100644 toolbar_->Init(); // TODO(pbos): Manage this either inside SidePanel or the corresponding button -@@ -3432,13 +3458,9 @@ void BrowserView::AddedToWidget() { +@@ -3424,13 +3450,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -267,7 +267,7 @@ index 0f9a2e8b91715..355bdf6fa9074 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -3859,7 +3881,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -3851,7 +3873,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -277,7 +277,7 @@ index 0f9a2e8b91715..355bdf6fa9074 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -4186,6 +4209,8 @@ Profile* BrowserView::GetProfile() { +@@ -4178,6 +4201,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -286,7 +286,7 @@ index 0f9a2e8b91715..355bdf6fa9074 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -4208,6 +4233,8 @@ void BrowserView::HideDownloadShelf() { +@@ -4200,6 +4225,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { @@ -415,10 +415,10 @@ index 9a42c3bd2207b..4de0fb1b33bce 100644 } diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc -index 5ea77d3196bc0..1be02aea8cec6 100644 +index 04d47a837067e..9b2c2127007e3 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -169,12 +169,13 @@ auto& GetViewCommandMap() { +@@ -170,12 +170,13 @@ auto& GetViewCommandMap() { //////////////////////////////////////////////////////////////////////////////// // ToolbarView, public: @@ -434,7 +434,7 @@ index 5ea77d3196bc0..1be02aea8cec6 100644 SetID(VIEW_ID_TOOLBAR); UpgradeDetector::GetInstance()->AddObserver(this); -@@ -209,7 +210,7 @@ void ToolbarView::Init() { +@@ -210,7 +211,7 @@ void ToolbarView::Init() { #endif auto location_bar = std::make_unique( browser_, browser_->profile(), browser_->command_controller(), this, diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 24e47afe7..590380c77 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -31,7 +31,7 @@ index b5c2dc992fb19..868661c86c39a 100644 factory = base::MakeRefCounted( std::move(loader_factory)); diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index 0e2c7f92937f1..31bb164e25bf6 100644 +index a0a9f51b7e62b..3d96e30111cff 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -11,7 +11,7 @@ @@ -43,7 +43,7 @@ index 0e2c7f92937f1..31bb164e25bf6 100644 #include -@@ -883,7 +883,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( +@@ -889,7 +889,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( void ContentBrowserClient::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) {} @@ -52,7 +52,7 @@ index 0e2c7f92937f1..31bb164e25bf6 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -892,6 +892,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( +@@ -898,6 +898,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( cert_verifier_creation_params) { network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = "en-us,en"; @@ -61,7 +61,7 @@ index 0e2c7f92937f1..31bb164e25bf6 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index aa125be3640fe..bf5dec73a5287 100644 +index 3bbb6a39eeb71..bb703dbdc53e7 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -34,6 +34,7 @@ @@ -72,7 +72,7 @@ index aa125be3640fe..bf5dec73a5287 100644 #include "content/public/browser/web_ui_browser_interface_broker_registry.h" #include "content/public/common/alternative_error_page_override_info.mojom.h" #include "content/public/common/main_function_params.h" -@@ -1658,7 +1659,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1667,7 +1668,7 @@ class CONTENT_EXPORT ContentBrowserClient { // // If |relative_partition_path| is the empty string, it means this needs to // create the default NetworkContext for the BrowserContext. @@ -81,7 +81,7 @@ index aa125be3640fe..bf5dec73a5287 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1859,6 +1860,17 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1868,6 +1869,17 @@ class CONTENT_EXPORT ContentBrowserClient { RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory); @@ -99,7 +99,7 @@ index aa125be3640fe..bf5dec73a5287 100644 // Creates an OverlayWindow to be used for video or document // Picture-in-Picture respectively. This window will house the content shown // when in Picture-in-Picture mode. This will return a new OverlayWindow. -@@ -1920,6 +1932,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1929,6 +1941,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch index 1c13a3ee2..17e132a98 100644 --- a/patch/patches/osr_fling_2745.patch +++ b/patch/patches/osr_fling_2745.patch @@ -41,10 +41,10 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644 } // namespace content diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc -index 03e318b14025f..0428c5d4b92b1 100644 +index f127b930806bc..83e2a99d0a593 100644 --- content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc -@@ -3112,6 +3112,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { +@@ -3116,6 +3116,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE); } diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 19580b5fc..3c175fdd1 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -123,10 +123,10 @@ index f5df9b6c27e9f..ea02e2b379f3a 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 8ff62f92ed6ef..9af2e737a9c01 100644 +index 2ee1a3da9ca15..3afe01c9255ce 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -2286,17 +2286,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2295,17 +2295,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); } @@ -157,7 +157,7 @@ index 8ff62f92ed6ef..9af2e737a9c01 100644 trust_token_store_ = std::make_unique(); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom -index 3d5779c980ff7..9d0e0a58ec64d 100644 +index 0b1afd416381c..d6c0480f6e3c3 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -330,6 +330,9 @@ struct NetworkContextParams { diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index 43fa955ea..e482411a4 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 4104bde55093c..8992ed51a47d1 100644 +index 6cbe5f15ce3c9..cc89d88767de6 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -494,10 +494,6 @@ class LoginHandlerDelegate { @@ -26,7 +26,7 @@ index 4104bde55093c..8992ed51a47d1 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, -@@ -2737,8 +2727,12 @@ void StoragePartitionImpl::GetQuotaSettings( +@@ -2747,8 +2737,12 @@ void StoragePartitionImpl::GetQuotaSettings( return; } @@ -40,7 +40,7 @@ index 4104bde55093c..8992ed51a47d1 100644 storage::GetDefaultDeviceInfoHelper(), std::move(callback)); } -@@ -2748,9 +2742,12 @@ void StoragePartitionImpl::InitNetworkContext() { +@@ -2758,9 +2752,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 74ed1e85c..62c4b1b18 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc -index 5fd8cb63f589d..cabf4b90d8078 100644 +index 14b5b4552f807..46b6a77023f11 100644 --- content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc -@@ -617,6 +617,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const { +@@ -618,6 +618,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const { return screen_infos_.current().device_scale_factor; } diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 8c4b52a0d..6bcc78bfc 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 96ced4715eed9..1094a4e9ec0a4 100644 +index f28855f738e3b..d36ec5b3aa7c2 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -3040,6 +3040,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -39,7 +39,7 @@ index 96ced4715eed9..1094a4e9ec0a4 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -7726,6 +7742,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -7729,6 +7745,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // frames). SetFocusedFrameTree(node->frame_tree()); }