diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc index d3677b9732ff..ac41dbec4e6b 100644 --- chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc @@ -477,8 +477,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context, content::PluginService* plugin_service = content::PluginService::GetInstance(); bool plugin_found = plugin_service->GetPluginInfo( - -1, -1, resource_context, url, url::Origin(), mime_type, false, &is_stale, - &plugin_info, &actual_mime_type); + -1, -1, resource_context, url, true, url::Origin(), mime_type, false, + &is_stale, &plugin_info, &actual_mime_type); if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) { // The GetPlugins call causes the plugin list to be refreshed. Once that's // done we can retry the GetPluginInfo call. We break out of this cycle diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc index 1783a101aa02..b380ef826ff7 100644 --- chrome/browser/plugins/chrome_plugin_service_filter.cc +++ chrome/browser/plugins/chrome_plugin_service_filter.cc @@ -179,6 +179,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable( int render_frame_id, const void* context, const GURL& plugin_content_url, + bool is_main_frame, const url::Origin& main_frame_origin, content::WebPluginInfo* plugin) { base::AutoLock auto_lock(lock_); diff --git chrome/browser/plugins/chrome_plugin_service_filter.h chrome/browser/plugins/chrome_plugin_service_filter.h index f8b651f1ddc4..ec39f8d7dc85 100644 --- chrome/browser/plugins/chrome_plugin_service_filter.h +++ chrome/browser/plugins/chrome_plugin_service_filter.h @@ -71,6 +71,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, int render_frame_id, const void* context, const GURL& plugin_content_url, + bool is_main_frame, const url::Origin& main_frame_origin, content::WebPluginInfo* plugin) override; diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc index 83445e1428a9..385e223b9069 100644 --- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc +++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc @@ -52,7 +52,7 @@ PDFIFrameNavigationThrottle::MaybeCreateThrottleFor( content::ResourceContext* resource_context = handle->GetWebContents()->GetBrowserContext()->GetResourceContext(); if (filter->IsPluginAvailable(process_id, routing_id, resource_context, - handle->GetURL(), url::Origin(), + handle->GetURL(), false, url::Origin(), &pdf_plugin_info)) { return nullptr; } diff --git chrome/browser/plugins/plugin_info_message_filter.cc chrome/browser/plugins/plugin_info_message_filter.cc index 8d0adcac00c1..2751e745107f 100644 --- chrome/browser/plugins/plugin_info_message_filter.cc +++ chrome/browser/plugins/plugin_info_message_filter.cc @@ -451,8 +451,8 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin( for (; i < matching_plugins.size(); ++i) { if (!filter || filter->IsPluginAvailable(render_process_id_, render_frame_id, - resource_context_, url, main_frame_origin, - &matching_plugins[i])) { + resource_context_, url, true, + main_frame_origin, &matching_plugins[i])) { break; } } diff --git chrome/browser/ui/cocoa/drag_util.mm chrome/browser/ui/cocoa/drag_util.mm index 6a2122ee1ed7..68831894695a 100644 --- chrome/browser/ui/cocoa/drag_util.mm +++ chrome/browser/ui/cocoa/drag_util.mm @@ -54,7 +54,7 @@ BOOL IsSupportedFileURL(Profile* profile, const GURL& url) { return PluginService::GetInstance()->GetPluginInfo( -1, // process ID MSG_ROUTING_NONE, // routing ID - profile->GetResourceContext(), url, url::Origin(), mime_type, + profile->GetResourceContext(), url, true, url::Origin(), mime_type, allow_wildcard, NULL, &plugin, NULL); } diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index ef7ae9c7de76..29a4e7cb9578 100644 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -594,6 +594,6 @@ void BrowserTabStripController::OnFindURLMimeTypeCompleted( content::PluginService::GetInstance()->GetPluginInfo( -1, // process ID MSG_ROUTING_NONE, // routing ID - model_->profile()->GetResourceContext(), url, url::Origin(), + model_->profile()->GetResourceContext(), url, true, url::Origin(), mime_type, false, NULL, &plugin, NULL)); } diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc index 2e4d0d9ac4cb..9bd0bf12ca88 100644 --- content/browser/frame_host/navigation_handle_impl.cc +++ content/browser/frame_host/navigation_handle_impl.cc @@ -312,12 +312,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() { } RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() { - // TODO(mkwst): Change this to check against 'READY_TO_COMMIT' once - // ReadyToCommitNavigation is available whether or not PlzNavigate is - // enabled. https://crbug.com/621856 - CHECK_GE(state_, WILL_PROCESS_RESPONSE) - << "This accessor should only be called after a response has been " - "delivered for processing."; return render_frame_host_; } diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc index a9c344c3cbee..78ad450cf104 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc @@ -370,9 +370,9 @@ void ForwardRequest(const char* service_name, void CreatePaymentManager(RenderFrameHostImpl* rfh, payments::mojom::PaymentManagerRequest request) { - StoragePartitionImpl* storage_partition = - static_cast(BrowserContext::GetStoragePartition( - rfh->GetSiteInstance()->GetBrowserContext(), rfh->GetSiteInstance())); + StoragePartition* storage_partition = + BrowserContext::GetStoragePartition( + rfh->GetSiteInstance()->GetBrowserContext(), rfh->GetSiteInstance()); storage_partition->GetPaymentAppContext()->CreatePaymentManager( std::move(request)); } @@ -937,10 +937,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { IPC_MESSAGE_HANDLER(FrameHostMsg_ShowPopup, OnShowPopup) IPC_MESSAGE_HANDLER(FrameHostMsg_HidePopup, OnHidePopup) #endif -#if defined(OS_ANDROID) IPC_MESSAGE_HANDLER(FrameHostMsg_NavigationHandledByEmbedder, OnNavigationHandledByEmbedder) -#endif IPC_MESSAGE_HANDLER(FrameHostMsg_RequestOverlayRoutingToken, OnRequestOverlayRoutingToken) IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow) @@ -1436,6 +1434,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (navigation_handle_) { navigation_handle_->set_net_error_code( static_cast(params.error_code)); + navigation_handle_->set_render_frame_host(this); } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); @@ -2705,14 +2704,12 @@ void RenderFrameHostImpl::OnHidePopup() { } #endif -#if defined(OS_ANDROID) void RenderFrameHostImpl::OnNavigationHandledByEmbedder() { if (navigation_handle_) navigation_handle_->set_net_error_code(net::ERR_ABORTED); OnDidStopLoading(); } -#endif void RenderFrameHostImpl::OnRequestOverlayRoutingToken() { // Make sure that we have a token. diff --git content/browser/frame_host/render_frame_host_impl.h content/browser/frame_host/render_frame_host_impl.h index 9a4fa29dd7c6..bfd658b91c06 100644 --- content/browser/frame_host/render_frame_host_impl.h +++ content/browser/frame_host/render_frame_host_impl.h @@ -821,8 +821,8 @@ class CONTENT_EXPORT RenderFrameHostImpl void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params); void OnHidePopup(); #endif -#if defined(OS_ANDROID) void OnNavigationHandledByEmbedder(); +#if defined(OS_ANDROID) void ForwardGetInterfaceToRenderFrame(const std::string& interface_name, mojo::ScopedMessagePipeHandle pipe); #endif diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc index c440d8061dac..1ee6a7ca1cf1 100644 --- content/browser/frame_host/render_frame_message_filter.cc +++ content/browser/frame_host/render_frame_message_filter.cc @@ -509,6 +509,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id, void RenderFrameMessageFilter::OnGetPlugins( bool refresh, + bool is_main_frame, const url::Origin& main_frame_origin, IPC::Message* reply_msg) { // Don't refresh if the specified threshold has not been passed. Note that @@ -530,18 +531,19 @@ void RenderFrameMessageFilter::OnGetPlugins( PluginServiceImpl::GetInstance()->GetPlugins( base::BindOnce(&RenderFrameMessageFilter::GetPluginsCallback, this, - reply_msg, main_frame_origin)); + reply_msg, is_main_frame, main_frame_origin)); } void RenderFrameMessageFilter::GetPluginsCallback( IPC::Message* reply_msg, + bool is_main_frame, const url::Origin& main_frame_origin, const std::vector& all_plugins) { // Filter the plugin list. PluginServiceFilter* filter = PluginServiceImpl::GetInstance()->GetFilter(); std::vector plugins; - int child_process_id = -1; + int child_process_id = render_process_id_; int routing_id = MSG_ROUTING_NONE; // In this loop, copy the WebPluginInfo (and do not use a reference) because // the filter might mutate it. @@ -550,7 +552,7 @@ void RenderFrameMessageFilter::GetPluginsCallback( if (!filter || filter->IsPluginAvailable(child_process_id, routing_id, resource_context_, main_frame_origin.GetURL(), - main_frame_origin, &plugin)) { + is_main_frame, main_frame_origin, &plugin)) { plugins.push_back(plugin); } } @@ -562,6 +564,7 @@ void RenderFrameMessageFilter::GetPluginsCallback( void RenderFrameMessageFilter::OnGetPluginInfo( int render_frame_id, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, const std::string& mime_type, bool* found, @@ -570,8 +573,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo( bool allow_wildcard = true; *found = plugin_service_->GetPluginInfo( render_process_id_, render_frame_id, resource_context_, url, - main_frame_origin, mime_type, allow_wildcard, nullptr, info, - actual_mime_type); + is_main_frame, main_frame_origin, mime_type, allow_wildcard, nullptr, + info, actual_mime_type); } void RenderFrameMessageFilter::OnOpenChannelToPepperPlugin( diff --git content/browser/frame_host/render_frame_message_filter.h content/browser/frame_host/render_frame_message_filter.h index 6875eb6496c4..a9248109c2b3 100644 --- content/browser/frame_host/render_frame_message_filter.h +++ content/browser/frame_host/render_frame_message_filter.h @@ -127,13 +127,16 @@ class CONTENT_EXPORT RenderFrameMessageFilter #if BUILDFLAG(ENABLE_PLUGINS) void OnGetPlugins(bool refresh, + bool is_main_frame, const url::Origin& main_frame_origin, IPC::Message* reply_msg); void GetPluginsCallback(IPC::Message* reply_msg, + bool is_main_frame, const url::Origin& main_frame_origin, const std::vector& plugins); void OnGetPluginInfo(int render_frame_id, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, const std::string& mime_type, bool* found, diff --git content/browser/loader/mime_sniffing_resource_handler.cc content/browser/loader/mime_sniffing_resource_handler.cc index 482bb55c2bfe..fbbac2ab26b1 100644 --- content/browser/loader/mime_sniffing_resource_handler.cc +++ content/browser/loader/mime_sniffing_resource_handler.cc @@ -489,8 +489,8 @@ bool MimeSniffingResourceHandler::CheckForPluginHandler( WebPluginInfo plugin; bool has_plugin = plugin_service_->GetPluginInfo( info->GetChildID(), info->GetRenderFrameID(), info->GetContext(), - request()->url(), url::Origin(), response_->head.mime_type, - allow_wildcard, &stale, &plugin, NULL); + request()->url(), info->IsMainFrame(), url::Origin(), + response_->head.mime_type, allow_wildcard, &stale, &plugin, NULL); if (stale) { // Refresh the plugins asynchronously. diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc index 4bdfa1d5455f..cf9b9166ae43 100644 --- content/browser/plugin_service_impl.cc +++ content/browser/plugin_service_impl.cc @@ -242,6 +242,7 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id, int render_frame_id, ResourceContext* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, const std::string& mime_type, bool allow_wildcard, @@ -258,7 +259,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, context, - url, main_frame_origin, &plugins[i])) { + url, is_main_frame, main_frame_origin, + &plugins[i])) { *info = plugins[i]; 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 b654bf3c98b4..1b09cd3d0a23 100644 --- content/browser/plugin_service_impl.h +++ content/browser/plugin_service_impl.h @@ -63,6 +63,7 @@ class CONTENT_EXPORT PluginServiceImpl : public PluginService { int render_frame_id, ResourceContext* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, const std::string& mime_type, bool allow_wildcard, diff --git content/common/frame_messages.h content/common/frame_messages.h index cd68128c6167..6bb6ced10858 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h @@ -1329,8 +1329,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, // Used to get the list of plugins. |main_frame_origin| is used to handle // exceptions for plugin content settings. -IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, +IPC_SYNC_MESSAGE_CONTROL3_1(FrameHostMsg_GetPlugins, bool /* refresh*/, + bool /* is_main_frame */, url::Origin /* main_frame_origin */, std::vector /* plugins */) @@ -1338,9 +1339,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, // type. If there is no matching plugin, |found| is false. // |actual_mime_type| is the actual mime type supported by the // found plugin. -IPC_SYNC_MESSAGE_CONTROL4_3(FrameHostMsg_GetPluginInfo, +IPC_SYNC_MESSAGE_CONTROL5_3(FrameHostMsg_GetPluginInfo, int /* render_frame_id */, GURL /* url */, + bool /* is_main_frame */, url::Origin /* main_frame_origin */, std::string /* mime_type */, bool /* found */, @@ -1727,9 +1729,9 @@ IPC_MESSAGE_ROUTED3(FrameHostMsg_FindMatchRects_Reply, IPC_MESSAGE_ROUTED2(FrameHostMsg_GetNearestFindResult_Reply, int /* nfr_request_id */, float /* distance */) +#endif IPC_MESSAGE_ROUTED0(FrameHostMsg_NavigationHandledByEmbedder) -#endif // Adding a new message? Stick to the sort order above: first platform // independent FrameMsg, then ifdefs for platform specific FrameMsg, then diff --git content/ppapi_plugin/ppapi_blink_platform_impl.cc content/ppapi_plugin/ppapi_blink_platform_impl.cc index bf393b7025c9..ae2f1840d193 100644 --- content/ppapi_plugin/ppapi_blink_platform_impl.cc +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -215,6 +215,7 @@ std::unique_ptr PpapiBlinkPlatformImpl::CreateURLLoader( void PpapiBlinkPlatformImpl::GetPluginList( bool refresh, + bool isMainFrame, const blink::WebSecurityOrigin& mainFrameOrigin, blink::WebPluginListBuilder* builder) { NOTREACHED(); diff --git content/ppapi_plugin/ppapi_blink_platform_impl.h content/ppapi_plugin/ppapi_blink_platform_impl.h index f7684513c3bd..ff6d12f17fe7 100644 --- content/ppapi_plugin/ppapi_blink_platform_impl.h +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -46,6 +46,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl { const blink::WebURLRequest& request, base::SingleThreadTaskRunner* task_runner) override; void GetPluginList(bool refresh, + bool isMainFrame, const blink::WebSecurityOrigin& mainFrameOrigin, blink::WebPluginListBuilder*) override; blink::WebData GetDataResource(const char* name) override; diff --git content/public/browser/plugin_service.h content/public/browser/plugin_service.h index ac05c13b1df8..762262bff01a 100644 --- content/public/browser/plugin_service.h +++ content/public/browser/plugin_service.h @@ -74,6 +74,7 @@ class PluginService { int render_frame_id, ResourceContext* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, 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 3b610b1f554e..7c439e060779 100644 --- content/public/browser/plugin_service_filter.h +++ content/public/browser/plugin_service_filter.h @@ -33,6 +33,7 @@ class PluginServiceFilter { int render_frame_id, const void* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, WebPluginInfo* plugin) = 0; diff --git content/public/renderer/content_renderer_client.cc content/public/renderer/content_renderer_client.cc index 303653a66248..a53478408226 100644 --- content/public/renderer/content_renderer_client.cc +++ content/public/renderer/content_renderer_client.cc @@ -109,7 +109,6 @@ bool ContentRendererClient::AllowPopup() { return false; } -#if defined(OS_ANDROID) bool ContentRendererClient::HandleNavigation( RenderFrame* render_frame, bool is_content_initiated, @@ -122,6 +121,7 @@ bool ContentRendererClient::HandleNavigation( return false; } +#if defined(OS_ANDROID) bool ContentRendererClient::ShouldUseMediaPlayerForURL(const GURL& url) { return false; } diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h index 16f55a95fdea..7f40cd466b09 100644 --- content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h @@ -77,6 +77,9 @@ class CONTENT_EXPORT ContentRendererClient { // Notifies us that the RenderThread has been created. virtual void RenderThreadStarted() {} + // Notifies that the RenderThread can now send sync IPC messages. + virtual void RenderThreadConnected() {} + // Notifies that a new RenderFrame has been created. virtual void RenderFrameCreated(RenderFrame* render_frame) {} @@ -201,7 +204,6 @@ class CONTENT_EXPORT ContentRendererClient { // Returns true if a popup window should be allowed. virtual bool AllowPopup(); -#if defined(OS_ANDROID) // TODO(sgurun) This callback is deprecated and will be removed as soon // as android webview completes implementation of a resource throttle based // shouldoverrideurl implementation. See crbug.com/325351 @@ -217,6 +219,7 @@ class CONTENT_EXPORT ContentRendererClient { blink::WebNavigationPolicy default_policy, bool is_redirect); +#if defined(OS_ANDROID) // Indicates if the Android MediaPlayer should be used instead of Chrome's // built in media player for the given |url|. Defaults to false. virtual bool ShouldUseMediaPlayerForURL(const GURL& url); diff --git content/public/renderer/render_frame_observer.h content/public/renderer/render_frame_observer.h index 4f8478bfa87a..52471407518e 100644 --- content/public/renderer/render_frame_observer.h +++ content/public/renderer/render_frame_observer.h @@ -124,6 +124,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, // load. This is used for UseCounter feature metrics. virtual void DidObserveNewFeatureUsage(blink::mojom::WebFeature feature) {} + // Called when this frame gains focus. + virtual void FrameFocused() {} + // Called when the focused node has changed to |node|. virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc index 7e546c27b671..11f88ec24b00 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -2959,7 +2959,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( - routing_id_, params.url, frame_->Top()->GetSecurityOrigin(), + routing_id_, params.url, frame_->Parent() == nullptr, + frame_->Top()->GetSecurityOrigin(), params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; @@ -3265,6 +3266,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { void RenderFrameImpl::FrameFocused() { Send(new FrameHostMsg_FrameFocused(routing_id_)); + for (auto& observer : observers_) + observer.FrameFocused(); } void RenderFrameImpl::WillCommitProvisionalLoad() { @@ -5431,9 +5434,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( (!IsBrowserSideNavigationEnabled() || url != pending_navigation_params_->request_params.redirects[0])); -#ifdef OS_ANDROID - bool render_view_was_created_by_renderer = - render_view_->was_created_by_renderer_; + // CEF doesn't use this value, so just pass false. + bool render_view_was_created_by_renderer = false; // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (GetContentClient()->renderer()->HandleNavigation( @@ -5446,7 +5448,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( } return blink::kWebNavigationPolicyIgnore; } -#endif // If the browser is interested, then give it a chance to look at the request. if (is_content_initiated && IsTopLevelNavigation(frame_) && diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc index dbf1a1967f90..064f48a2e071 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -774,6 +774,8 @@ void RenderThreadImpl::Init( StartServiceManagerConnection(); + GetContentClient()->renderer()->RenderThreadConnected(); + GetAssociatedInterfaceRegistry()->AddInterface( base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc index 2246aa95c564..02d25c60a090 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc @@ -783,6 +783,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor( void RendererBlinkPlatformImpl::GetPluginList( bool refresh, + bool isMainFrame, const blink::WebSecurityOrigin& mainFrameOrigin, blink::WebPluginListBuilder* builder) { #if BUILDFLAG(ENABLE_PLUGINS) @@ -790,7 +791,8 @@ void RendererBlinkPlatformImpl::GetPluginList( if (!plugin_refresh_allowed_) refresh = false; RenderThread::Get()->Send( - new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins)); + new FrameHostMsg_GetPlugins(refresh, isMainFrame, mainFrameOrigin, + &plugins)); for (const WebPluginInfo& plugin : plugins) { builder->AddPlugin(WebString::FromUTF16(plugin.name), WebString::FromUTF16(plugin.desc), diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h index 18ab5e68d8a6..bd40d2914f7a 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h @@ -125,6 +125,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { viz::FrameSinkId GenerateFrameSinkId() override; void GetPluginList(bool refresh, + bool isMainFrame, const blink::WebSecurityOrigin& mainFrameOrigin, blink::WebPluginListBuilder* builder) override; blink::WebPublicSuffixList* PublicSuffixList() override; diff --git content/shell/browser/shell_plugin_service_filter.cc content/shell/browser/shell_plugin_service_filter.cc index 3a48c59b7e3e..d10ef64adbba 100644 --- content/shell/browser/shell_plugin_service_filter.cc +++ content/shell/browser/shell_plugin_service_filter.cc @@ -18,6 +18,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable( int render_frame_id, const void* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, WebPluginInfo* plugin) { return plugin->name == base::ASCIIToUTF16("Blink Test Plugin") || diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h index 7767a620a9fd..8a95377f5f3b 100644 --- content/shell/browser/shell_plugin_service_filter.h +++ content/shell/browser/shell_plugin_service_filter.h @@ -21,6 +21,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter { int render_frame_id, const void* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, WebPluginInfo* plugin) override; diff --git content/test/fake_plugin_service.cc content/test/fake_plugin_service.cc index 6746b9f16e7e..8634ada48d57 100644 --- content/test/fake_plugin_service.cc +++ content/test/fake_plugin_service.cc @@ -29,6 +29,7 @@ bool FakePluginService::GetPluginInfo(int render_process_id, int render_frame_id, ResourceContext* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, const std::string& mime_type, bool allow_wildcard, diff --git content/test/fake_plugin_service.h content/test/fake_plugin_service.h index db23a83ed079..57a4c536118c 100644 --- content/test/fake_plugin_service.h +++ content/test/fake_plugin_service.h @@ -30,6 +30,7 @@ class FakePluginService : public PluginService { int render_frame_id, ResourceContext* context, const GURL& url, + bool is_main_frame, const url::Origin& main_frame_origin, const std::string& mime_type, bool allow_wildcard, diff --git content/test/test_blink_web_unit_test_support.cc content/test/test_blink_web_unit_test_support.cc index c19d608cc3e1..3dce54daf1cb 100644 --- content/test/test_blink_web_unit_test_support.cc +++ content/test/test_blink_web_unit_test_support.cc @@ -290,6 +290,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() { void TestBlinkWebUnitTestSupport::GetPluginList( bool refresh, + bool is_main_frame, const blink::WebSecurityOrigin& mainFrameOrigin, blink::WebPluginListBuilder* builder) { builder->AddPlugin("pdf", "pdf", "pdf-files"); diff --git content/test/test_blink_web_unit_test_support.h content/test/test_blink_web_unit_test_support.h index 556242d76fa9..61853c2df547 100644 --- content/test/test_blink_web_unit_test_support.h +++ content/test/test_blink_web_unit_test_support.h @@ -70,6 +70,7 @@ class TestBlinkWebUnitTestSupport : public BlinkPlatformImpl { const blink::WebSize& size) override; void GetPluginList(bool refresh, + bool is_main_frame, const blink::WebSecurityOrigin& mainFrameOrigin, blink::WebPluginListBuilder* builder) override;