From 7f52c307234353752b98b4c6437209981501a080 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 28 Oct 2021 14:36:24 +0000 Subject: [PATCH] Update to Chromium version 96.0.4664.27 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_scheduler.patch | 4 ++-- patch/patches/browser_security_policy_1081397.patch | 6 +++--- patch/patches/content_2015.patch | 6 +++--- patch/patches/views_1749_2102.patch | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index f3a4d3bc1..34fc9a080 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/96.0.4664.18', + 'chromium_checkout': 'refs/tags/96.0.4664.27', 'depot_tools_checkout': 'e023d44820' } diff --git a/patch/patches/browser_scheduler.patch b/patch/patches/browser_scheduler.patch index 3584aefe9..acb1722bc 100644 --- a/patch/patches/browser_scheduler.patch +++ b/patch/patches/browser_scheduler.patch @@ -1,8 +1,8 @@ diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc -index 8de3da087ea78..e902397694149 100644 +index 0cf2b0daa0a56..3778e8e7a7711 100644 --- content/browser/scheduler/browser_task_executor.cc +++ content/browser/scheduler/browser_task_executor.cc -@@ -300,7 +300,7 @@ BrowserTaskExecutor::OnUserInputStart() { +@@ -315,7 +315,7 @@ BrowserTaskExecutor::OnUserInputStart() { // static void BrowserTaskExecutor::Shutdown() { diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 0037adb85..b8f0627aa 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 4801a199a29d3..11a1d3b328142 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 b09a22ea4c124..39968d123ebfb 100644 +index 6612af565aa1d..d72a6492ede3a 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -5759,6 +5759,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( +@@ -5763,6 +5763,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( network::mojom::WebSandboxFlags sandbox_flags) { // Calculate an approximation of the origin. The sandbox/csp are ignored. url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this); @@ -36,7 +36,7 @@ index b09a22ea4c124..39968d123ebfb 100644 // Apply sandbox flags. // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag -@@ -5792,6 +5798,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { +@@ -5796,6 +5802,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { if (IsSameDocument() || IsPageActivation()) return GetRenderFrameHost()->GetLastCommittedOrigin(); diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index b1eadf1fd..71eb1fd26 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 100644 const std::vector& all_plugins); diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 10c5c18955e58..2b8fcbf204d7f 100644 +index 1d0639d7b6efc..007cc2765a02f 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -12355,6 +12355,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( +@@ -12354,6 +12354,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( } void RenderFrameHostImpl::GetPluginInfo(const GURL& url, @@ -199,7 +199,7 @@ index 10c5c18955e58..2b8fcbf204d7f 100644 const url::Origin& main_frame_origin, const std::string& mime_type, GetPluginInfoCallback callback) { -@@ -12362,7 +12363,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, +@@ -12361,7 +12362,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, WebPluginInfo info; std::string actual_mime_type; bool found = PluginServiceImpl::GetInstance()->GetPluginInfo( diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 0b588b239..2e35b61dd 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -238,10 +238,10 @@ index 049983a12312c..7c0cb56ab627e 100644 std::unique_ptr selection_controller_; diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc -index 5a554d16234e5..eb7b21c2cc2ce 100644 +index f056f201b6313..08fc4e376b2e7 100644 --- ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc -@@ -2854,8 +2854,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( +@@ -2879,8 +2879,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( void MenuController::OpenSubmenuChangeSelectionIfCan() { MenuItemView* item = pending_state_.item; @@ -256,7 +256,7 @@ index 5a554d16234e5..eb7b21c2cc2ce 100644 MenuItemView* to_select = nullptr; if (!item->GetSubmenu()->GetMenuItems().empty()) to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN); -@@ -2874,8 +2879,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { +@@ -2899,8 +2904,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { void MenuController::CloseSubmenu() { MenuItemView* item = state_.item; DCHECK(item);