Update to Chromium version 109.0.5414.61

This commit is contained in:
Marshall Greenblatt
2022-12-30 20:26:16 +00:00
committed by Marshall Greenblatt
parent 1d6e584b76
commit ab89ea2d96
3 changed files with 6 additions and 6 deletions

View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # 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' 'depot_tools_checkout': 'ca3ebf119e'
} }

View File

@ -1,8 +1,8 @@
diff --git base/task/common/task_annotator.cc base/task/common/task_annotator.cc 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
+++ 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_), perfetto::Track::ThreadScoped(task_annotator_),
task_end_time); task_end_time);
} }

View File

@ -20,10 +20,10 @@ index 18c138c21a853..554e22458da45 100644
// TODO(wjmaclean): We should update the ProcessLock comparison API // 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 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
+++ 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 = bool use_opaque_origin =
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
network::mojom::WebSandboxFlags::kOrigin; network::mojom::WebSandboxFlags::kOrigin;
@ -47,7 +47,7 @@ index ad6106b649198..ff232d4cdce6b 100644
} }
return origin_and_debug_info; return origin_and_debug_info;
@@ -6743,6 +6755,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { @@ -6745,6 +6757,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
SandboxFlagsToCommit()); SandboxFlagsToCommit());