mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 80.0.3987.0 (#722274)
This commit is contained in:
Alexander Guettler
committed by
Marshall Greenblatt
Marshall Greenblatt
parent
ed39922f85
commit
71768ea6c3
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
index 865ca9288de7..8f736f081b86 100644
|
||||
index d49a1df73622..9a389e4383f0 100644
|
||||
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
@@ -18,6 +18,7 @@
|
||||
@ -10,7 +10,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
||||
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
|
||||
@@ -55,6 +56,11 @@
|
||||
@@ -54,6 +55,11 @@
|
||||
#include "url/gurl.h"
|
||||
#include "url/origin.h"
|
||||
|
||||
@ -22,7 +22,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "components/guest_view/browser/guest_view_base.h"
|
||||
#include "extensions/browser/extension_registry.h"
|
||||
@@ -101,6 +107,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
||||
@@ -100,6 +106,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
||||
extensions::ExtensionRegistry* extension_registry,
|
||||
int process_id,
|
||||
const GURL& resource) {
|
||||
@ -32,7 +32,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
extensions::WebViewRendererState* renderer_state =
|
||||
extensions::WebViewRendererState::GetInstance();
|
||||
std::string partition_id;
|
||||
@@ -129,9 +138,6 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
||||
@@ -128,9 +137,6 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
||||
|
||||
PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
|
||||
: render_process_id_(render_process_id),
|
||||
@ -42,7 +42,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
host_content_settings_map_(
|
||||
HostContentSettingsMapFactory::GetForProfile(profile)),
|
||||
plugin_prefs_(PluginPrefs::GetForProfile(profile)) {
|
||||
@@ -139,6 +145,13 @@ PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
|
||||
@@ -138,6 +144,13 @@ PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
|
||||
profile->GetPrefs());
|
||||
run_all_flash_in_allow_mode_.Init(prefs::kRunAllFlashInAllowMode,
|
||||
profile->GetPrefs());
|
||||
@ -56,7 +56,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
}
|
||||
|
||||
PluginInfoHostImpl::Context::~Context() {}
|
||||
@@ -209,6 +222,7 @@ void PluginInfoHostImpl::PluginsLoaded(
|
||||
@@ -208,6 +221,7 @@ void PluginInfoHostImpl::PluginsLoaded(
|
||||
plugin_metadata->identifier(), &output->status);
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
if (output->status == chrome::mojom::PluginStatus::kNotFound) {
|
||||
// Check to see if the component updater can fetch an implementation.
|
||||
std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info =
|
||||
@@ -217,7 +231,9 @@ void PluginInfoHostImpl::PluginsLoaded(
|
||||
@@ -216,7 +230,9 @@ void PluginInfoHostImpl::PluginsLoaded(
|
||||
ComponentPluginLookupDone(params, std::move(output), std::move(callback),
|
||||
std::move(plugin_metadata),
|
||||
std::move(cus_plugin_info));
|
||||
@ -75,7 +75,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
GetPluginInfoFinish(params, std::move(output), std::move(callback),
|
||||
std::move(plugin_metadata));
|
||||
}
|
||||
@@ -230,6 +246,14 @@ void PluginInfoHostImpl::Context::DecidePluginStatus(
|
||||
@@ -229,6 +245,14 @@ void PluginInfoHostImpl::Context::DecidePluginStatus(
|
||||
PluginMetadata::SecurityStatus security_status,
|
||||
const std::string& plugin_identifier,
|
||||
chrome::mojom::PluginStatus* status) const {
|
||||
@ -90,7 +90,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
if (security_status == PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) {
|
||||
*status = chrome::mojom::PluginStatus::kAllowed;
|
||||
return;
|
||||
@@ -338,16 +362,35 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
|
||||
@@ -337,16 +361,35 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -128,7 +128,7 @@ index 865ca9288de7..8f736f081b86 100644
|
||||
// If we broke out of the loop, we have found an enabled plugin.
|
||||
bool enabled = i < matching_plugins.size();
|
||||
diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
|
||||
index 56f147d2fc56..9f5687d9a5b9 100644
|
||||
index 4e64db143b8a..71322b0261a1 100644
|
||||
--- chrome/browser/plugins/plugin_utils.cc
|
||||
+++ chrome/browser/plugins/plugin_utils.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
@ -165,7 +165,7 @@ index 56f147d2fc56..9f5687d9a5b9 100644
|
||||
Profile* profile = Profile::FromBrowserContext(browser_context);
|
||||
std::vector<std::string> whitelist = MimeTypesHandler::GetMIMETypeWhitelist();
|
||||
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
|
||||
index 0a565575f36c..06dfa59d1a75 100644
|
||||
index 69539de7b1ec..001cf1d1fe0d 100644
|
||||
--- chrome/common/google_url_loader_throttle.cc
|
||||
+++ chrome/common/google_url_loader_throttle.cc
|
||||
@@ -4,11 +4,16 @@
|
||||
@ -185,9 +185,9 @@ index 0a565575f36c..06dfa59d1a75 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "extensions/common/extension_urls.h"
|
||||
#endif
|
||||
@@ -98,6 +103,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
|
||||
@@ -97,6 +102,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
|
||||
const GURL& response_url,
|
||||
network::ResourceResponseHead* response_head,
|
||||
network::mojom::URLResponseHead* response_head,
|
||||
bool* defer) {
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
+ if (!extensions::ExtensionsEnabled())
|
||||
@ -198,72 +198,72 @@ index 0a565575f36c..06dfa59d1a75 100644
|
||||
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
|
||||
if (response_url.SchemeIsHTTPOrHTTPS() &&
|
||||
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
||||
index 4d3cfef5b28a..bbcaceebfda2 100644
|
||||
index ffde51cd276a..3ef2ad8d3945 100644
|
||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -794,6 +794,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -814,6 +814,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
|
||||
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
|
||||
status == chrome::mojom::PluginStatus::kBlocked) &&
|
||||
+ observer &&
|
||||
observer->IsPluginTemporarilyAllowed(identifier)) {
|
||||
+ content_settings_agent &&
|
||||
content_settings_agent->IsPluginTemporarilyAllowed(identifier)) {
|
||||
status = chrome::mojom::PluginStatus::kAllowed;
|
||||
}
|
||||
@@ -994,7 +995,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1012,7 +1013,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
||||
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
||||
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
||||
- observer->DidBlockContentType(content_type, group_name);
|
||||
+ if (observer)
|
||||
+ observer->DidBlockContentType(content_type, group_name);
|
||||
- content_settings_agent->DidBlockContentType(content_type);
|
||||
+ if (content_settings_agent)
|
||||
+ content_settings_agent->DidBlockContentType(content_type);
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlocked: {
|
||||
@@ -1003,7 +1005,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1021,7 +1023,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
||||
placeholder->AllowLoading();
|
||||
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
||||
- observer->DidBlockContentType(content_type, group_name);
|
||||
+ if (observer)
|
||||
+ observer->DidBlockContentType(content_type, group_name);
|
||||
- content_settings_agent->DidBlockContentType(content_type);
|
||||
+ if (content_settings_agent)
|
||||
+ content_settings_agent->DidBlockContentType(content_type);
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
||||
@@ -1013,7 +1016,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1031,7 +1034,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
group_name));
|
||||
RenderThread::Get()->RecordAction(
|
||||
UserMetricsAction("Plugin_BlockedByPolicy"));
|
||||
- observer->DidBlockContentType(content_type, group_name);
|
||||
+ if (observer)
|
||||
+ observer->DidBlockContentType(content_type, group_name);
|
||||
- content_settings_agent->DidBlockContentType(content_type);
|
||||
+ if (content_settings_agent)
|
||||
+ content_settings_agent->DidBlockContentType(content_type);
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
|
||||
@@ -1021,7 +1025,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1039,7 +1043,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
IDR_BLOCKED_PLUGIN_HTML,
|
||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
|
||||
group_name));
|
||||
- observer->DidBlockContentType(content_type, group_name);
|
||||
+ if (observer)
|
||||
+ observer->DidBlockContentType(content_type, group_name);
|
||||
- content_settings_agent->DidBlockContentType(content_type);
|
||||
+ if (content_settings_agent)
|
||||
+ content_settings_agent->DidBlockContentType(content_type);
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kComponentUpdateRequired: {
|
||||
diff --git chrome/renderer/plugins/chrome_plugin_placeholder.cc chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
||||
index 205c7398f827..8fcb6e5ae7ad 100644
|
||||
index b86b883882cf..442bfa6753d8 100644
|
||||
--- chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
||||
+++ chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
||||
@@ -358,8 +358,11 @@ void ChromePluginPlaceholder::OnBlockedContent(
|
||||
|
||||
if (status ==
|
||||
content::RenderFrame::PeripheralContentStatus::CONTENT_STATUS_TINY) {
|
||||
- ContentSettingsObserver::Get(render_frame())
|
||||
- ->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, title_);
|
||||
+ ContentSettingsObserver* observer =
|
||||
+ ContentSettingsObserver::Get(render_frame());
|
||||
+ if (observer) {
|
||||
+ observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, title_);
|
||||
+ }
|
||||
- ContentSettingsAgentImpl::Get(render_frame())
|
||||
- ->DidBlockContentType(ContentSettingsType::PLUGINS);
|
||||
+ ContentSettingsAgentImpl *content_settings_agent =
|
||||
+ ContentSettingsAgentImpl::Get(render_frame());
|
||||
+ if (content_settings_agent) {
|
||||
+ content_settings_agent->DidBlockContentType(ContentSettingsType::PLUGINS);
|
||||
+ }
|
||||
}
|
||||
|
||||
std::string message = base::StringPrintf(
|
||||
|
||||
Reference in New Issue
Block a user