From ec0a26124ccdf9244244da8f73667325c28e2911 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 27 Jan 2022 20:30:10 -0500 Subject: [PATCH] Update to Chromium version 99.0.4844.9 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 3 ++- patch/patches/browser_security_policy_1081397.patch | 2 +- patch/patches/extensions_1947.patch | 2 +- patch/patches/web_contents_1257_1565.patch | 10 +++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index f1efaf059..b28e52879 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/99.0.4844.0' + 'chromium_checkout': 'refs/tags/99.0.4844.9', + 'depot_tools_checkout': '289dedd36b' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 2ead87f1b..203f55e46 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,7 +20,7 @@ index 620b3fdc4403a..f20399d453680 100644 // TODO(wjmaclean): We should update the ProcessLock comparison API diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index 8a84c355e4d56..2545e0e828fe5 100644 +index 2f17127dc4ba6..32c7890a69379 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc @@ -5896,6 +5896,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 1bda8e840..1ce2c03cd 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -196,7 +196,7 @@ index 1fa1e67dddcfd..7af2a0e231824 100644 // once each time the extensions system is loaded per browser_context. The // implementation may wish to use the BrowserContext to record the current diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc -index bee1c92ce2b69..31e6d5587de2a 100644 +index 9c5c1404df84a..e09394bb97547 100644 --- extensions/browser/process_manager.cc +++ extensions/browser/process_manager.cc @@ -391,9 +391,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension, diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index c967c7408..24c5dba6a 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index bf235e7493dd0..1f0eb81769b56 100644 +index 6b742d4635454..ddba5aadb21a1 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -2979,6 +2979,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -2983,6 +2983,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, site_instance.get(), params.renderer_initiated_creation, params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy); @@ -15,7 +15,7 @@ index bf235e7493dd0..1f0eb81769b56 100644 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -2989,6 +2995,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -2993,6 +2999,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_.reset(CreateWebContentsView(this, delegate, &render_view_host_delegate_view_)); } @@ -23,7 +23,7 @@ index bf235e7493dd0..1f0eb81769b56 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -3853,6 +3860,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -3857,6 +3864,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( // objects. create_params.renderer_initiated_creation = !is_new_browsing_instance; @@ -39,7 +39,7 @@ index bf235e7493dd0..1f0eb81769b56 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -7625,6 +7641,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -7651,6 +7667,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // frames). SetFocusedFrameTree(node->frame_tree()); }