diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc index dfa34db9255e..0a79d11c7e0c 100644 --- chrome/browser/plugins/plugin_info_host_impl.cc +++ chrome/browser/plugins/plugin_info_host_impl.cc @@ -18,6 +18,7 @@ #include "base/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,11 @@ #include "url/gurl.h" #include "url/origin.h" +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/browser/plugins/plugin_service_filter.h" +#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" @@ -99,6 +105,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; @@ -127,9 +136,6 @@ 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)) { @@ -137,6 +143,13 @@ PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile) profile->GetPrefs()); run_all_flash_in_allow_mode_.Init(prefs::kRunAllFlashInAllowMode, 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() {} @@ -207,7 +220,8 @@ void PluginInfoHostImpl::PluginsLoaded( plugin_metadata->identifier(), &output->status); } - if (output->status == chrome::mojom::PluginStatus::kNotFound) { + if (!cef::IsAlloyRuntimeEnabled() && + output->status == chrome::mojom::PluginStatus::kNotFound) { // Check to see if the component updater can fetch an implementation. std::unique_ptr cus_plugin_info = g_browser_process->component_updater()->GetComponentForMimeType( @@ -228,6 +242,15 @@ void PluginInfoHostImpl::Context::DecidePluginStatus( PluginMetadata::SecurityStatus security_status, const std::string& plugin_identifier, chrome::mojom::PluginStatus* status) const { +#if BUILDFLAG(ENABLE_CEF) + // Don't override the user decision. + if (cef::IsAlloyRuntimeEnabled() && + (*status == chrome::mojom::PluginStatus::kBlocked || + *status == chrome::mojom::PluginStatus::kDisabled)) { + return; + } +#endif + if (security_status == PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) { *status = chrome::mojom::PluginStatus::kAllowed; return; @@ -344,17 +367,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin( return false; } + const bool is_main_frame = + main_frame_origin.IsSameOriginWith(url::Origin::Create(url)); + size_t i = 0; + +#if BUILDFLAG(ENABLE_CEF) + if (cef::IsAlloyRuntimeEnabled()) { + CefPluginServiceFilter* filter = static_cast( + PluginService::GetInstance()->GetFilter()); + DCHECK(filter); + + for (; i < matching_plugins.size(); ++i) { + if (filter->IsPluginAvailable(render_process_id_, render_frame_id, + url, is_main_frame, main_frame_origin, + &matching_plugins[i], status)) { + break; + } + } + } else { +#endif // BUILDFLAG(ENABLE_CEF) + content::PluginServiceFilter* filter = PluginService::GetInstance()->GetFilter(); - size_t i = 0; for (; i < matching_plugins.size(); ++i) { if (!filter || filter->IsPluginAvailable(render_process_id_, render_frame_id, url, - main_frame_origin, &matching_plugins[i])) { + is_main_frame, main_frame_origin, + &matching_plugins[i])) { break; } } +#if BUILDFLAG(ENABLE_CEF) + } +#endif + // If we broke out of the loop, we have found an enabled plugin. bool enabled = i < matching_plugins.size(); if (!enabled) { diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc index e547d5f00617..831d5794ecde 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_io_data.h" #include "chrome/common/plugin_utils.h" #include "components/content_settings/core/browser/host_content_settings_map.h" @@ -15,6 +16,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" @@ -77,6 +82,12 @@ base::flat_map PluginUtils::GetMimeTypeToExtensionIdMap( content::BrowserContext* browser_context) { base::flat_map 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& allowlist = diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc index ce40f0039fe0..c8cbecb61455 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" @@ -14,6 +15,10 @@ #include "services/network/public/mojom/url_response_head.mojom.h" #include "services/network/public/mojom/x_frame_options.mojom.h" +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/common/extensions/extensions_util.h" +#endif + #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/extension_urls.h" #endif @@ -153,6 +158,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 a1c26dfbd5cc..aaf96b069c32 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc @@ -848,6 +848,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; @@ -1046,7 +1047,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: { @@ -1055,7 +1057,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: { @@ -1065,7 +1068,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: { @@ -1073,7 +1077,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; } case chrome::mojom::PluginStatus::kComponentUpdateRequired: { diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h index 06b6875bd37e..13c197b532ad 100644 --- content/browser/browser_plugin/browser_plugin_guest.h +++ content/browser/browser_plugin/browser_plugin_guest.h @@ -115,6 +115,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.