mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-21 14:40:49 +01:00
Update to Chromium version 94.0.4606.81
This commit is contained in:
parent
09ee681fc4
commit
38a79951bd
@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/94.0.4606.71',
|
'chromium_checkout': 'refs/tags/94.0.4606.81',
|
||||||
'depot_tools_checkout': '64a9f33bdd'
|
'depot_tools_checkout': '64a9f33bdd'
|
||||||
}
|
}
|
||||||
|
@ -20,10 +20,10 @@ index 8b338161af4bc..e0c4e36f9f140 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 8d0575e107ad3..0a89a33a330be 100644
|
index bd052c19a233f..26a6262801a33 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
|
||||||
@@ -5684,6 +5684,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
|
@@ -5693,6 +5693,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
|
||||||
network::mojom::WebSandboxFlags sandbox_flags) {
|
network::mojom::WebSandboxFlags sandbox_flags) {
|
||||||
// Calculate an approximation of the origin. The sandbox/csp are ignored.
|
// Calculate an approximation of the origin. The sandbox/csp are ignored.
|
||||||
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
|
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
|
||||||
@ -36,7 +36,7 @@ index 8d0575e107ad3..0a89a33a330be 100644
|
|||||||
|
|
||||||
// Apply sandbox flags.
|
// Apply sandbox flags.
|
||||||
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
|
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
|
||||||
@@ -5717,6 +5723,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
|
@@ -5726,6 +5732,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
|
||||||
if (IsSameDocument() || IsPageActivation())
|
if (IsSameDocument() || IsPageActivation())
|
||||||
return GetRenderFrameHost()->GetLastCommittedOrigin();
|
return GetRenderFrameHost()->GetLastCommittedOrigin();
|
||||||
|
|
||||||
|
@ -348,10 +348,10 @@ index d88901876c14b..c43ef8798c3a2 100644
|
|||||||
&mime_type);
|
&mime_type);
|
||||||
if (!found)
|
if (!found)
|
||||||
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
|
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
|
||||||
index c2b1d0d10b522..adeb8b318d3a3 100644
|
index c28f517cc5623..9d075052e3fc8 100644
|
||||||
--- content/renderer/render_thread_impl.cc
|
--- content/renderer/render_thread_impl.cc
|
||||||
+++ content/renderer/render_thread_impl.cc
|
+++ content/renderer/render_thread_impl.cc
|
||||||
@@ -609,6 +609,8 @@ void RenderThreadImpl::Init() {
|
@@ -615,6 +615,8 @@ void RenderThreadImpl::Init() {
|
||||||
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
|
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
|
||||||
blink::URLLoaderThrottleProviderType::kFrame);
|
blink::URLLoaderThrottleProviderType::kFrame);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user