bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 96.0.4664.45

This commit is contained in:
Marshall Greenblatt 2021-11-15 20:37:19 +00:00 committed by Marshall Greenblatt
parent 147b5f5532
commit 622afbdebc
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/96.0.4664.35', 'chromium_checkout': 'refs/tags/96.0.4664.45',
'depot_tools_checkout': 'e023d44820' 'depot_tools_checkout': 'e023d44820'
} }

6
patch/patches/browser_security_policy_1081397.patch
View File

@ -20,10 +20,10 @@ index 4801a199a29d3..11a1d3b328142 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 0026ceac7b7df..676e38fec4211 100644 index 73aff501bf401..1ed61b3e455f2 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
@@ -5766,6 +5766,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( @@ -5769,6 +5769,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 0026ceac7b7df..676e38fec4211 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
@@ -5799,6 +5805,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { @@ -5802,6 +5808,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
if (IsSameDocument() || IsPageActivation()) if (IsSameDocument() || IsPageActivation())
return GetRenderFrameHost()->GetLastCommittedOrigin(); return GetRenderFrameHost()->GetLastCommittedOrigin();

4
patch/patches/component_build.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
index 6aa16d20faa3b..5c4fd217ae936 100644 index a46c99b6230b4..dfcdb58449aac 100644
--- content/browser/devtools/devtools_instrumentation.h --- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h +++ content/browser/devtools/devtools_instrumentation.h
@@ -90,7 +90,7 @@ bool ApplyUserAgentMetadataOverrides( @@ -94,7 +94,7 @@ bool ApplyUserAgentMetadataOverrides(
FrameTreeNode* frame_tree_node, FrameTreeNode* frame_tree_node,
absl::optional<blink::UserAgentMetadata>* override_out); absl::optional<blink::UserAgentMetadata>* override_out);

6
patch/patches/content_2015.patch
View File

@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 100644
const std::vector<WebPluginInfo>& all_plugins); const std::vector<WebPluginInfo>& all_plugins);
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
index 7a7cc0ebf81bc..e2db1cc99ea4a 100644 index cb2e3a09dece9..f2f8694fcf6b5 100644
--- content/browser/renderer_host/render_frame_host_impl.cc --- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -12356,6 +12356,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( @@ -12366,6 +12366,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
} }
void RenderFrameHostImpl::GetPluginInfo(const GURL& url, void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@ -199,7 +199,7 @@ index 7a7cc0ebf81bc..e2db1cc99ea4a 100644
const url::Origin& main_frame_origin, const url::Origin& main_frame_origin,
const std::string& mime_type, const std::string& mime_type,
GetPluginInfoCallback callback) { GetPluginInfoCallback callback) {
@@ -12363,7 +12364,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, @@ -12373,7 +12374,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
WebPluginInfo info; WebPluginInfo info;
std::string actual_mime_type; std::string actual_mime_type;
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo( bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(

4
patch/patches/views_widget.patch
View File

@ -130,10 +130,10 @@ index 0cad4e1f9731b..94d9e189661af 100644
// Set the view's active state (i.e., tint state of controls). // Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0; virtual void SetActive(bool active) = 0;
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
index 8ae1783e5aa2e..c683f5fb30e46 100644 index 3ef183213bc60..f6739d9d0817c 100644
--- ui/platform_window/x11/x11_window.cc --- ui/platform_window/x11/x11_window.cc
+++ ui/platform_window/x11/x11_window.cc +++ ui/platform_window/x11/x11_window.cc
@@ -1697,7 +1697,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { @@ -1704,7 +1704,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0; req.border_pixel = 0;
bounds_in_pixels_ = SanitizeBounds(bounds); bounds_in_pixels_ = SanitizeBounds(bounds);