bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 96.0.4664.0 (#929512)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
patch/patches/content_2015.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
index 404fb702f46bd..fa460d245570c 100644
index c5a29d75151a6..c5b198483cb4a 100644
--- chrome/browser/download/download_target_determiner.cc
+++ chrome/browser/download/download_target_determiner.cc
@@ -683,7 +683,7 @@ void IsHandledBySafePlugin(int render_process_id,
@ -12,10 +12,10 @@ index 404fb702f46bd..fa460d245570c 100644
if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) {
// The GetPlugins call causes the plugin list to be refreshed. Once that's
diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc
index 27f7028908745..35e1cdb72874f 100644
index 4e6a0f8e664b3..e34a49e4fc654 100644
--- chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -133,6 +133,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
@@ -129,6 +129,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
int render_process_id,
int render_frame_id,
const GURL& plugin_content_url,
@ -36,7 +36,7 @@ index 937d3d5bc84fd..ac327392dcf37 100644
content::WebPluginInfo* plugin) override;
diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
index d0a5a12620bd3..a02e13bbd8154 100644
index 6b260a40b14a2..b6198889273ce 100644
--- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
+++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
@@ -65,7 +65,7 @@ bool IsPDFPluginEnabled(content::NavigationHandle* navigation_handle,
@ -75,37 +75,37 @@ index 18b58f53a9df7..80452f68f24fb 100644
GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING);
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 33822b23dfb1e..0593095eb42f9 100644
index 06517d7afaaa2..e368b300c5e30 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -636,6 +636,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
resource_request_->has_user_gesture,
resource_request_->request_initiator, &loader_factory);
@@ -670,6 +670,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
resource_request_->has_user_gesture, initiating_origin,
&loader_factory);
+ if (!handled) {
+ handled = GetContentClient()->browser()->HandleExternalProtocol(
+ web_contents_getter_, frame_tree_node_id_,
+ navigation_ui_data_.get(), *resource_request_,
+ &loader_factory);
+ navigation_ui_data_.get(), request_info_->sandbox_flags,
+ *resource_request_, &loader_factory);
+ }
+
if (loader_factory) {
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory));
@@ -869,7 +876,7 @@ void NavigationURLLoaderImpl::CheckPluginAndContinueOnReceiveResponse(
@@ -838,7 +845,7 @@ void NavigationURLLoaderImpl::CheckPluginAndContinueOnReceiveResponse(
frame_tree_node->current_frame_host()->GetProcess()->GetID();
int routing_id = frame_tree_node->current_frame_host()->GetRoutingID();
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
- render_process_id, routing_id, resource_request_->url, url::Origin(),
+ render_process_id, routing_id, resource_request_->url, true, url::Origin(),
head->mime_type, false /* allow_wildcard */, &stale, &plugin, nullptr);
head->mime_type, /*allow_wildcard=*/false, &stale, &plugin, nullptr);
if (stale) {
diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
index 493e9a31c983d..c468cb87a541f 100644
index bec7bccadfec4..5a45990eb71ed 100644
--- content/browser/plugin_service_impl.cc
+++ content/browser/plugin_service_impl.cc
@@ -269,6 +269,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
@@ -266,6 +266,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
bool PluginServiceImpl::GetPluginInfo(int render_process_id,
int render_frame_id,
const GURL& url,
@ -113,7 +113,7 @@ index 493e9a31c983d..c468cb87a541f 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
bool allow_wildcard,
@@ -286,7 +287,8 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id,
@@ -283,7 +284,8 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id,
for (size_t i = 0; i < plugins.size(); ++i) {
if (!filter_ ||
filter_->IsPluginAvailable(render_process_id, render_frame_id, url,
@ -136,7 +136,7 @@ index b0fb11b4d5ba7..1bce64c6b20ee 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/browser/renderer_host/plugin_registry_impl.cc content/browser/renderer_host/plugin_registry_impl.cc
index 68ccb16a86ad0..7e9aeed8c8c32 100644
index 54a561c009464..a51afa5c74141 100644
--- content/browser/renderer_host/plugin_registry_impl.cc
+++ content/browser/renderer_host/plugin_registry_impl.cc
@@ -30,6 +30,7 @@ void PluginRegistryImpl::Bind(
@ -188,10 +188,10 @@ index 632ae86c6fd69..55b749ec12421 100644
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
index 974823d53b583..f5d635cd92889 100644
index 6520b9b7e90aa..60af548b678cc 100644
--- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -12408,6 +12408,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
@@ -12341,6 +12341,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
}
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@ -199,7 +199,7 @@ index 974823d53b583..f5d635cd92889 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
GetPluginInfoCallback callback) {
@@ -12415,7 +12416,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -12348,7 +12349,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
WebPluginInfo info;
std::string actual_mime_type;
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
@ -210,10 +210,10 @@ index 974823d53b583..f5d635cd92889 100644
std::move(callback).Run(found, info, actual_mime_type);
}
diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h
index 53cc68edc7fd7..b8b6698f65e9d 100644
index 86666516a0131..c1e11fbfda6fb 100644
--- content/browser/renderer_host/render_frame_host_impl.h
+++ content/browser/renderer_host/render_frame_host_impl.h
@@ -2611,6 +2611,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2614,6 +2614,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
int32_t plugin_child_id,
const base::FilePath& path) override;
void GetPluginInfo(const GURL& url,
@ -222,7 +222,7 @@ index 53cc68edc7fd7..b8b6698f65e9d 100644
const std::string& mime_type,
GetPluginInfoCallback callback) override;
diff --git content/common/pepper_plugin.mojom content/common/pepper_plugin.mojom
index a544bfed7ed85..60aad01350c2f 100644
index c20ff8254421b..84659f627e2f8 100644
--- content/common/pepper_plugin.mojom
+++ content/common/pepper_plugin.mojom
@@ -29,6 +29,7 @@ interface PepperHost {
@ -234,7 +234,7 @@ index a544bfed7ed85..60aad01350c2f 100644
string mime_type) =>
(bool found,
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 0cf1f777dc5ff..5d6bf40de09b9 100644
index 248a90c768200..1ba2f15d5778d 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@ -246,8 +246,25 @@ index 0cf1f777dc5ff..5d6bf40de09b9 100644
#include <utility>
@@ -874,7 +874,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
-void ContentBrowserClient::ConfigureNetworkContextParams(
+bool ContentBrowserClient::ConfigureNetworkContextParams(
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -883,6 +883,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgent();
network_context_params->accept_language = "en-us,en";
+ return true;
}
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index bafb4cc0e7cdf..6f303d9866f18 100644
index 7dfc30f346a94..8adbde6963711 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -33,6 +33,7 @@
@ -258,7 +275,16 @@ index bafb4cc0e7cdf..6f303d9866f18 100644
#include "content/public/browser/web_ui_browser_interface_broker_registry.h"
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
@@ -1780,6 +1781,14 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1618,7 +1619,7 @@ class CONTENT_EXPORT ContentBrowserClient {
//
// If |relative_partition_path| is the empty string, it means this needs to
// create the default NetworkContext for the BrowserContext.
- virtual void ConfigureNetworkContextParams(
+ virtual bool ConfigureNetworkContextParams(
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1802,6 +1803,15 @@ class CONTENT_EXPORT ContentBrowserClient {
const absl::optional<url::Origin>& initiating_origin,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -267,13 +293,14 @@ index bafb4cc0e7cdf..6f303d9866f18 100644
+ WebContents::Getter web_contents_getter,
+ int frame_tree_node_id,
+ NavigationUIData* navigation_data,
+ network::mojom::WebSandboxFlags sandbox_flags,
+ const network::ResourceRequest& request,
+ mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) { return false; }
+
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
// will house the content shown when in Picture-in-Picture mode. This will
// return a new OverlayWindow.
@@ -1853,6 +1862,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1879,6 +1889,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@ -309,7 +336,7 @@ index 570b5a4738b94..923a5f7195c53 100644
WebPluginInfo* plugin) = 0;
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index b62158069f9a1..7470d6f49dac0 100644
index f3852c0eef152..03b751225575e 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -82,6 +82,9 @@ class CONTENT_EXPORT ContentRendererClient {
@ -334,10 +361,10 @@ index b62158069f9a1..7470d6f49dac0 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 173952d4545d5..2f311b988c380 100644
index 78ec20c40e5db..406a25890ddb8 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3306,7 +3306,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -3278,7 +3278,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
WebPluginInfo info;
std::string mime_type;
bool found = false;
@ -348,10 +375,10 @@ index 173952d4545d5..2f311b988c380 100644
&mime_type);
if (!found)
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 52c02371bf373..3cd441e5d9a0d 100644
index 1546f52724fc7..776efe8247abd 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -610,6 +610,8 @@ void RenderThreadImpl::Init() {
@@ -616,6 +616,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
blink::URLLoaderThrottleProviderType::kFrame);
@ -361,10 +388,10 @@ index 52c02371bf373..3cd441e5d9a0d 100644
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 337c630fc85f3..20abead97fe1d 100644
index bbfe51c4bcfd5..b81c93789993c 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -1101,6 +1101,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -1093,6 +1093,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------
@ -377,14 +404,14 @@ index 337c630fc85f3..20abead97fe1d 100644
+
+//------------------------------------------------------------------------------
+
blink::mojom::CodeCacheHost& RendererBlinkPlatformImpl::GetCodeCacheHost() {
if (!code_cache_host_) {
code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>(
mojo::SharedRemote<blink::mojom::CodeCacheHost>
RendererBlinkPlatformImpl::GetCodeCacheHost() {
base::AutoLock lock(code_cache_host_lock_);
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index b199c34615f02..43ced4c4d8cf5 100644
index 6c0a233f70d81..38f15d507f2a2 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -258,6 +258,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -264,6 +264,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
const blink::WebURL& url,
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
@ -407,10 +434,10 @@ index c25b7d1a18432..7e007d964f1a1 100644
WebPluginInfo* plugin) {
return plugin->name == u"Blink Test Plugin" ||
diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h
index 337b4b0653fe2..107ab4c9d8a85 100644
index e9d0bed90ea65..12d1acb37619f 100644
--- content/shell/browser/shell_plugin_service_filter.h
+++ content/shell/browser/shell_plugin_service_filter.h
@@ -20,6 +20,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter {
@@ -24,6 +24,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter {
bool IsPluginAvailable(int render_process_id,
int render_frame_id,
const GURL& url,