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 92.0.4515.0 (#885287)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-06-03 21:34:56 -04:00
parent f2f52c1e2c
commit 00dca9601e
190 changed files with 1234 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
patch/patches/content_2015.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
index f094105ac70c8..b5f4616ff821e 100644
index 181732fa49c2d..29eeb60091ce6 100644
--- chrome/browser/download/download_target_determiner.cc
+++ chrome/browser/download/download_target_determiner.cc
@@ -672,7 +672,7 @@ void IsHandledBySafePlugin(int render_process_id,
@@ -677,7 +677,7 @@ void IsHandledBySafePlugin(int render_process_id,
content::PluginService* plugin_service =
content::PluginService::GetInstance();
bool plugin_found = plugin_service->GetPluginInfo(
@@ -12,10 +12,10 @@ index f094105ac70c8..b5f4616ff821e 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 c2bd9b8c3131e..d1283cf3d9b21 100644
index 27f7028908745..35e1cdb72874f 100644
--- chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -132,6 +132,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
@@ -133,6 +133,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
int render_process_id,
int render_frame_id,
const GURL& plugin_content_url,
@@ -49,10 +49,10 @@ index d0a5a12620bd3..a02e13bbd8154 100644
false /* allow_wildcard */, is_stale, &plugin_info,
nullptr /* actual_mime_type */);
diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc
index df02e848472f6..955edd0b7ff1f 100644
index 92dced6c08aa4..73cdaf388123b 100644
--- chrome/browser/ui/views/frame/browser_root_view.cc
+++ chrome/browser/ui/views/frame/browser_root_view.cc
@@ -81,7 +81,7 @@ void OnFindURLMimeType(const GURL& url,
@@ -82,7 +82,7 @@ void OnFindURLMimeType(const GURL& url,
#if BUILDFLAG(ENABLE_PLUGINS)
content::WebPluginInfo plugin;
result = result || content::PluginService::GetInstance()->GetPluginInfo(
@@ -62,7 +62,7 @@ index df02e848472f6..955edd0b7ff1f 100644
#endif
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
index 7df791af69af7..6005886106e58 100644
index 30267bc6d214e..c01f4ff040c05 100644
--- content/browser/devtools/devtools_http_handler.cc
+++ content/browser/devtools/devtools_http_handler.cc
@@ -574,7 +574,7 @@ void DevToolsHttpHandler::OnJsonRequest(
@@ -75,10 +75,10 @@ index 7df791af69af7..6005886106e58 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 a46dbf3c52abe..2d83757cef53a 100644
index 178a234311337..51555a02e2409 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -639,6 +639,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@@ -633,6 +633,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
resource_request_->has_user_gesture,
resource_request_->request_initiator, &loader_factory);
@@ -92,7 +92,7 @@ index a46dbf3c52abe..2d83757cef53a 100644
if (loader_factory) {
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory));
@@ -859,7 +866,7 @@ void NavigationURLLoaderImpl::CheckPluginAndContinueOnReceiveResponse(
@@ -853,7 +860,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(
@@ -102,10 +102,10 @@ index a46dbf3c52abe..2d83757cef53a 100644
if (stale) {
diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
index 12e48ad8e3e31..1fd51c85ad6fb 100644
index 9be14f9a03219..00e2520112d81 100644
--- content/browser/plugin_service_impl.cc
+++ content/browser/plugin_service_impl.cc
@@ -269,6 +269,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
@@ -270,6 +270,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
bool PluginServiceImpl::GetPluginInfo(int render_process_id,
int render_frame_id,
const GURL& url,
@@ -113,7 +113,7 @@ index 12e48ad8e3e31..1fd51c85ad6fb 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,
@@ -287,7 +288,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,
@@ -124,7 +124,7 @@ index 12e48ad8e3e31..1fd51c85ad6fb 100644
if (actual_mime_type)
*actual_mime_type = mime_types[i];
diff --git content/browser/plugin_service_impl.h content/browser/plugin_service_impl.h
index 3ce3ad55eef18..77674a7224551 100644
index b0fb11b4d5ba7..1bce64c6b20ee 100644
--- content/browser/plugin_service_impl.h
+++ content/browser/plugin_service_impl.h
@@ -54,6 +54,7 @@ class CONTENT_EXPORT PluginServiceImpl : public PluginService {
@@ -136,10 +136,10 @@ index 3ce3ad55eef18..77674a7224551 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 a6d6188fb1390..7ac57de6fd55a 100644
index 68ccb16a86ad0..7e9aeed8c8c32 100644
--- content/browser/renderer_host/plugin_registry_impl.cc
+++ content/browser/renderer_host/plugin_registry_impl.cc
@@ -29,6 +29,7 @@ void PluginRegistryImpl::Bind(
@@ -30,6 +30,7 @@ void PluginRegistryImpl::Bind(
}
void PluginRegistryImpl::GetPlugins(bool refresh,
@@ -147,7 +147,7 @@ index a6d6188fb1390..7ac57de6fd55a 100644
const url::Origin& main_frame_origin,
GetPluginsCallback callback) {
auto* plugin_service = PluginServiceImpl::GetInstance();
@@ -50,10 +51,11 @@ void PluginRegistryImpl::GetPlugins(bool refresh,
@@ -51,10 +52,11 @@ void PluginRegistryImpl::GetPlugins(bool refresh,
plugin_service->GetPlugins(base::BindOnce(
&PluginRegistryImpl::GetPluginsComplete, weak_factory_.GetWeakPtr(),
@@ -160,7 +160,7 @@ index a6d6188fb1390..7ac57de6fd55a 100644
const url::Origin& main_frame_origin,
GetPluginsCallback callback,
const std::vector<WebPluginInfo>& all_plugins) {
@@ -76,6 +78,7 @@ void PluginRegistryImpl::GetPluginsComplete(
@@ -77,6 +79,7 @@ void PluginRegistryImpl::GetPluginsComplete(
// TODO(crbug.com/621724): Pass an url::Origin instead of a GURL.
if (!filter || filter->IsPluginAvailable(render_process_id_, routing_id,
main_frame_origin.GetURL(),
@@ -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 e5b9d4722ff48..e15707aa31976 100644
index b4c2b23799188..3bdc6327c2c18 100644
--- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -10749,6 +10749,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
@@ -11216,6 +11216,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
}
void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -199,7 +199,7 @@ index e5b9d4722ff48..e15707aa31976 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
GetPluginInfoCallback callback) {
@@ -10756,7 +10757,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
@@ -11223,7 +11224,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url,
WebPluginInfo info;
std::string actual_mime_type;
bool found = PluginServiceImpl::GetInstance()->GetPluginInfo(
@@ -210,10 +210,10 @@ index e5b9d4722ff48..e15707aa31976 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 d8d7676dc885c..0cf11c7de7454 100644
index a2eb6268b937d..625518ccf5971 100644
--- content/browser/renderer_host/render_frame_host_impl.h
+++ content/browser/renderer_host/render_frame_host_impl.h
@@ -2338,6 +2338,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2383,6 +2383,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
int32_t plugin_child_id,
const base::FilePath& path) override;
void GetPluginInfo(const GURL& url,
@@ -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 0fadf2a320b0c..8c491e3b48064 100644
index 0a22650086512..847cea49a484d 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@@ -247,7 +247,7 @@ index 0fadf2a320b0c..8c491e3b48064 100644
#include <utility>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index b031e69e4fe09..8c91423f8c140 100644
index 71d40028ce3ea..440305180e643 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -32,6 +32,7 @@
@@ -258,8 +258,8 @@ index b031e69e4fe09..8c91423f8c140 100644
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
#include "device/vr/buildflags/buildflags.h"
@@ -1747,6 +1748,14 @@ class CONTENT_EXPORT ContentBrowserClient {
const base::Optional<url::Origin>& initiating_origin,
@@ -1763,6 +1764,14 @@ class CONTENT_EXPORT ContentBrowserClient {
const absl::optional<url::Origin>& initiating_origin,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
+ // Same as above, but exposing the whole ResourceRequest object.
@@ -273,7 +273,7 @@ index b031e69e4fe09..8c91423f8c140 100644
// 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.
@@ -1820,6 +1829,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1836,6 +1845,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@@ -297,10 +297,10 @@ index 90fb0fcfa822b..d48e64b1573ca 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/public/browser/plugin_service_filter.h content/public/browser/plugin_service_filter.h
index 98c59005599e4..69752184745d3 100644
index 570b5a4738b94..923a5f7195c53 100644
--- content/public/browser/plugin_service_filter.h
+++ content/public/browser/plugin_service_filter.h
@@ -32,6 +32,7 @@ class PluginServiceFilter {
@@ -30,6 +30,7 @@ class PluginServiceFilter {
virtual bool IsPluginAvailable(int render_process_id,
int render_frame_id,
const GURL& url,
@@ -309,10 +309,10 @@ index 98c59005599e4..69752184745d3 100644
WebPluginInfo* plugin) = 0;
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index f84df6e581606..38e5eeef558b6 100644
index 601633452b5f9..03bc3f8e5f70a 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -82,6 +82,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -81,6 +81,9 @@ class CONTENT_EXPORT ContentRendererClient {
// binding requests from RenderProcessHost::BindReceiver().
virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
@@ -322,7 +322,7 @@ index f84df6e581606..38e5eeef558b6 100644
// Notifies that a new RenderFrame has been created.
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
@@ -298,6 +301,10 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -292,6 +295,10 @@ class CONTENT_EXPORT ContentRendererClient {
// This method may invalidate the frame.
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
@@ -334,10 +334,10 @@ index f84df6e581606..38e5eeef558b6 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 580974507f1a3..86a0514c8b558 100644
index aa5503a16409a..b1da8198722e2 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3548,7 +3548,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -3177,7 +3177,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
WebPluginInfo info;
std::string mime_type;
bool found = false;
@@ -348,10 +348,10 @@ index 580974507f1a3..86a0514c8b558 100644
&mime_type);
if (!found)
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 36365398f8fae..b2d3fa8798563 100644
index 5bb7fec55d93e..634ccfc09889a 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -618,6 +618,8 @@ void RenderThreadImpl::Init() {
@@ -599,6 +599,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
blink::URLLoaderThrottleProviderType::kFrame);
@@ -361,10 +361,10 @@ index 36365398f8fae..b2d3fa8798563 100644
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 7aec578843ce5..f631601f1bb1e 100644
index 1ee1fdf477745..74e3ddf4d19dc 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -1022,6 +1022,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -1110,6 +1110,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------
@@ -381,12 +381,12 @@ index 7aec578843ce5..f631601f1bb1e 100644
if (!code_cache_host_) {
code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>(
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 7a836b82ee155..8e026751ce350 100644
index faa1d91bf74a9..81e367bfb9b10 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -220,6 +220,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
const blink::WebString& top_url) override;
SkBitmap* GetSadPageBitmap() override;
@@ -255,6 +255,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
std::unique_ptr<blink::WebV8ValueConverter> CreateWebV8ValueConverter()
override;
+ void DevToolsAgentAttached() override;
+ void DevToolsAgentDetached() override;