From ab89ea2d96bd0b65b14ab42741f1c38c288f7765 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 30 Dec 2022 20:26:16 +0000 Subject: [PATCH] Update to Chromium version 109.0.5414.61 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/base_task_4015625.patch | 4 ++-- patch/patches/browser_security_policy_1081397.patch | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index e74da059c..ba14ca4ad 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/109.0.5414.46', + 'chromium_checkout': 'refs/tags/109.0.5414.61', 'depot_tools_checkout': 'ca3ebf119e' } diff --git a/patch/patches/base_task_4015625.patch b/patch/patches/base_task_4015625.patch index 66552017f..f5e046fa3 100644 --- a/patch/patches/base_task_4015625.patch +++ b/patch/patches/base_task_4015625.patch @@ -1,8 +1,8 @@ diff --git base/task/common/task_annotator.cc base/task/common/task_annotator.cc -index 289d1d1f1bd88..b9ed6e32fdc44 100644 +index 27838482024e1..41d0ea21d9431 100644 --- base/task/common/task_annotator.cc +++ base/task/common/task_annotator.cc -@@ -292,6 +292,12 @@ TaskAnnotator::LongTaskTracker::~LongTaskTracker() { +@@ -313,6 +313,12 @@ TaskAnnotator::LongTaskTracker::~LongTaskTracker() { perfetto::Track::ThreadScoped(task_annotator_), task_end_time); } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index f07c2bafb..e3bc6af94 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 18c138c21a853..554e22458da45 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 ad6106b649198..ff232d4cdce6b 100644 +index 636b3e88c5b40..51126a2f51a77 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -6710,10 +6710,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( +@@ -6712,10 +6712,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( bool use_opaque_origin = (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == network::mojom::WebSandboxFlags::kOrigin; @@ -47,7 +47,7 @@ index ad6106b649198..ff232d4cdce6b 100644 } return origin_and_debug_info; -@@ -6743,6 +6755,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -6745,6 +6757,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( SandboxFlagsToCommit());