mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-03-03 19:37:47 +01:00
66648c2343
- Remove CefRequestContextHandler::OnBeforePluginLoad and CefRequestContext::PurgePluginListCache (fixes issue #3047). These methods stopped being relevant after the removal of Flash support in January 2021. The last remaining PPAPI plugin (PDF viewer) will switch to a non-plugin implementation in the near future (see https://crbug.com/702993#c58) and functionality related to plugin filtering has already been removed in https://crrev.com/343ae351c9.
192 lines
8.0 KiB
Diff
192 lines
8.0 KiB
Diff
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
|
index 2cf61c44809a9..e6948ab525700 100644
|
|
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
|
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
|
@@ -18,6 +18,7 @@
|
|
#include "base/task/task_runner_util.h"
|
|
#include "build/branding_buildflags.h"
|
|
#include "build/build_config.h"
|
|
+#include "cef/libcef/features/runtime.h"
|
|
#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"
|
|
@@ -53,6 +54,10 @@
|
|
#include "url/gurl.h"
|
|
#include "url/origin.h"
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+#include "cef/libcef/common/extensions/extensions_util.h"
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#include "components/guest_view/browser/guest_view_base.h"
|
|
#include "extensions/browser/extension_registry.h"
|
|
@@ -102,6 +107,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
|
extensions::ExtensionRegistry* extension_registry,
|
|
int process_id,
|
|
const GURL& resource) {
|
|
+ if (!extension_registry)
|
|
+ return false;
|
|
+
|
|
extensions::WebViewRendererState* renderer_state =
|
|
extensions::WebViewRendererState::GetInstance();
|
|
std::string partition_id;
|
|
@@ -130,14 +138,18 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
|
|
|
PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
|
|
: render_process_id_(render_process_id),
|
|
-#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
- extension_registry_(extensions::ExtensionRegistry::Get(profile)),
|
|
-#endif
|
|
host_content_settings_map_(
|
|
HostContentSettingsMapFactory::GetForProfile(profile)),
|
|
plugin_prefs_(PluginPrefs::GetForProfile(profile)) {
|
|
allow_outdated_plugins_.Init(prefs::kPluginsAllowOutdated,
|
|
profile->GetPrefs());
|
|
+
|
|
+#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled())
|
|
+#endif
|
|
+ extension_registry_ = extensions::ExtensionRegistry::Get(profile);
|
|
+#endif
|
|
}
|
|
|
|
PluginInfoHostImpl::Context::~Context() {}
|
|
diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
|
|
index 7999b960694ab..5c1848a0afadf 100644
|
|
--- chrome/browser/plugins/plugin_utils.cc
|
|
+++ chrome/browser/plugins/plugin_utils.cc
|
|
@@ -5,6 +5,7 @@
|
|
#include "chrome/browser/plugins/plugin_utils.h"
|
|
|
|
#include "base/values.h"
|
|
+#include "cef/libcef/features/runtime.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "components/content_settings/core/browser/host_content_settings_map.h"
|
|
#include "components/content_settings/core/common/content_settings_types.h"
|
|
@@ -14,6 +15,10 @@
|
|
#include "url/gurl.h"
|
|
#include "url/origin.h"
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+#include "cef/libcef/common/extensions/extensions_util.h"
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#include "chrome/common/pref_names.h"
|
|
#include "components/prefs/pref_service.h"
|
|
@@ -69,6 +74,12 @@ base::flat_map<std::string, std::string>
|
|
PluginUtils::GetMimeTypeToExtensionIdMap(
|
|
content::BrowserContext* browser_context) {
|
|
base::flat_map<std::string, std::string> mime_type_to_extension_id_map;
|
|
+
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ if (cef::IsAlloyRuntimeEnabled() && !extensions::ExtensionsEnabled())
|
|
+ return mime_type_to_extension_id_map;
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
Profile* profile = Profile::FromBrowserContext(browser_context);
|
|
const std::vector<std::string>& allowlist =
|
|
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
|
|
index 8c2547056ec26..2ab3252dca708 100644
|
|
--- chrome/common/google_url_loader_throttle.cc
|
|
+++ chrome/common/google_url_loader_throttle.cc
|
|
@@ -7,6 +7,7 @@
|
|
#include "base/feature_list.h"
|
|
#include "base/metrics/histogram_functions.h"
|
|
#include "build/build_config.h"
|
|
+#include "cef/libcef/features/runtime.h"
|
|
#include "chrome/common/chrome_features.h"
|
|
#include "chrome/common/net/safe_search_util.h"
|
|
#include "components/google/core/common/google_util.h"
|
|
@@ -19,6 +20,10 @@
|
|
#include "ui/base/device_form_factor.h"
|
|
#endif
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+#include "cef/libcef/common/extensions/extensions_util.h"
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#include "extensions/common/extension_urls.h"
|
|
#endif
|
|
@@ -158,6 +163,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
|
|
const GURL& response_url,
|
|
network::mojom::URLResponseHead* response_head,
|
|
bool* defer) {
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ if (cef::IsAlloyRuntimeEnabled() && !extensions::ExtensionsEnabled())
|
|
+ return;
|
|
+#endif
|
|
+
|
|
// Built-in additional protection for the chrome web store origin by ensuring
|
|
// that the X-Frame-Options protection mechanism is set to either DENY or
|
|
// SAMEORIGIN.
|
|
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
|
index 14c199c88ba6a..a4bb52c01c2f5 100644
|
|
--- chrome/renderer/chrome_content_renderer_client.cc
|
|
+++ chrome/renderer/chrome_content_renderer_client.cc
|
|
@@ -947,6 +947,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
|
|
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
|
|
status == chrome::mojom::PluginStatus::kBlocked) &&
|
|
+ content_settings_agent_delegate &&
|
|
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
|
identifier)) {
|
|
status = chrome::mojom::PluginStatus::kAllowed;
|
|
@@ -1148,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
|
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
|
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
|
- content_settings_agent->DidBlockContentType(content_type);
|
|
+ if (content_settings_agent)
|
|
+ content_settings_agent->DidBlockContentType(content_type);
|
|
break;
|
|
}
|
|
case chrome::mojom::PluginStatus::kBlocked: {
|
|
@@ -1157,7 +1159,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
|
placeholder->AllowLoading();
|
|
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
|
- content_settings_agent->DidBlockContentType(content_type);
|
|
+ if (content_settings_agent)
|
|
+ content_settings_agent->DidBlockContentType(content_type);
|
|
break;
|
|
}
|
|
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
|
@@ -1167,7 +1170,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
group_name));
|
|
RenderThread::Get()->RecordAction(
|
|
UserMetricsAction("Plugin_BlockedByPolicy"));
|
|
- content_settings_agent->DidBlockContentType(content_type);
|
|
+ if (content_settings_agent)
|
|
+ content_settings_agent->DidBlockContentType(content_type);
|
|
break;
|
|
}
|
|
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
|
|
@@ -1175,7 +1179,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
|
IDR_BLOCKED_PLUGIN_HTML,
|
|
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
|
|
group_name));
|
|
- content_settings_agent->DidBlockContentType(content_type);
|
|
+ if (content_settings_agent)
|
|
+ content_settings_agent->DidBlockContentType(content_type);
|
|
break;
|
|
}
|
|
}
|
|
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
|
index 567d0f56294f8..1526e57fc0aeb 100644
|
|
--- content/browser/browser_plugin/browser_plugin_guest.h
|
|
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
|
@@ -117,6 +117,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
|
|
|
|
gfx::Point GetScreenCoordinates(const gfx::Point& relative_position) const;
|
|
|
|
+ WebContentsImpl* owner_web_contents() const { return owner_web_contents_; }
|
|
+
|
|
protected:
|
|
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
|
|
// |web_contents| has to stay valid for the lifetime of BrowserPluginGuest.
|