diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom index ff7a8ed89e94..77f44956ff22 100644 --- third_party/blink/public/mojom/plugins/plugin_registry.mojom +++ third_party/blink/public/mojom/plugins/plugin_registry.mojom @@ -36,5 +36,5 @@ interface PluginRegistry { // // TODO(crbug.com/850278): We shouldn't rely on the renderer to tell us the main frame origin. [Sync] - GetPlugins(bool refresh, url.mojom.Origin main_frame_origin) => (array plugins); + GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array plugins); }; diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h index 8690ec1fdd21..010156ed9dbc 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h @@ -679,6 +679,11 @@ class BLINK_PLATFORM_EXPORT Platform { // runs during Chromium's build step). virtual bool IsTakingV8ContextSnapshot() { return false; } + // DevTools ------------------------------------------------------------ + + virtual void DevToolsAgentAttached() {} + virtual void DevToolsAgentDetached() {} + private: static void InitializeCommon(Platform* platform, std::unique_ptr main_thread); diff --git third_party/blink/renderer/core/dom/document_init.cc third_party/blink/renderer/core/dom/document_init.cc index 8df9cdf40707..746e15c5884c 100644 --- third_party/blink/renderer/core/dom/document_init.cc +++ third_party/blink/renderer/core/dom/document_init.cc @@ -198,11 +198,11 @@ DocumentInit& DocumentInit::WithTypeFrom(const String& type) { if (GetFrame()->IsMainFrame()) { scoped_refptr origin = SecurityOrigin::Create(Url()); - plugin_data = GetFrame()->GetPage()->GetPluginData(origin.get()); + plugin_data = GetFrame()->GetPage()->GetPluginData(true, origin.get()); } else { auto* top_security_origin = GetFrame()->Tree().Top().GetSecurityContext()->GetSecurityOrigin(); - plugin_data = GetFrame()->GetPage()->GetPluginData(top_security_origin); + plugin_data = GetFrame()->GetPage()->GetPluginData(false, top_security_origin); } } diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc index 0cf193d31a02..1c62098d3a6a 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc @@ -1199,7 +1199,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; - return GetPage()->GetPluginData( + return GetPage()->GetPluginData(IsMainFrame(), Tree().Top().GetSecurityContext()->GetSecurityOrigin()); } diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc index ba54df90e309..a902a0d31221 100644 --- third_party/blink/renderer/core/inspector/devtools_session.cc +++ third_party/blink/renderer/core/inspector/devtools_session.cc @@ -8,6 +8,7 @@ #include #include +#include "third_party/blink/public/platform/platform.h" #include "third_party/blink/renderer/bindings/core/v8/script_controller.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/inspector/devtools_agent.h" @@ -151,6 +152,7 @@ DevToolsSession::DevToolsSession( for (wtf_size_t i = 0; i < agents_.size(); i++) agents_[i]->Restore(); } + Platform::Current()->DevToolsAgentAttached(); } DevToolsSession::~DevToolsSession() { @@ -191,6 +193,7 @@ void DevToolsSession::Detach() { agents_.clear(); v8_session_.reset(); agent_->client_->DebuggerTaskFinished(); + Platform::Current()->DevToolsAgentDetached(); } void DevToolsSession::FlushProtocolNotifications() { diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc index 569cfb844dfc..29d5d6940c44 100644 --- third_party/blink/renderer/core/page/page.cc +++ third_party/blink/renderer/core/page/page.cc @@ -194,7 +194,8 @@ Page::Page(PageClients& page_clients) MakeGarbageCollected(GetVisualViewport(), GetChromeClient())), link_highlight_(MakeGarbageCollected(*this)), - plugin_data_(nullptr), + plugin_data_main_frame_(nullptr), + plugin_data_sub_frame_(nullptr), // TODO(pdr): Initialize |validation_message_client_| lazily. validation_message_client_( MakeGarbageCollected(*this)), @@ -368,21 +369,41 @@ void Page::InitialStyleChanged() { } } -PluginData* Page::GetPluginData(const SecurityOrigin* main_frame_origin) { - if (!plugin_data_) - plugin_data_ = MakeGarbageCollected(); +PluginData* Page::GetPluginData(bool is_main_frame, + const SecurityOrigin* main_frame_origin) { + if (is_main_frame) { + if (!plugin_data_main_frame_) + plugin_data_main_frame_ = MakeGarbageCollected(); - if (!plugin_data_->Origin() || - !main_frame_origin->IsSameOriginWith(plugin_data_->Origin())) - plugin_data_->UpdatePluginList(main_frame_origin); - return plugin_data_.Get(); + if (!plugin_data_main_frame_->Origin() || + !main_frame_origin->IsSameOriginWith( + plugin_data_main_frame_->Origin())) { + plugin_data_main_frame_->UpdatePluginList(true, main_frame_origin); + } + + return plugin_data_main_frame_.Get(); + } else { + if (!plugin_data_sub_frame_) + plugin_data_sub_frame_ = MakeGarbageCollected(); + + if (!plugin_data_sub_frame_->Origin() || + !main_frame_origin->IsSameOriginWith( + plugin_data_sub_frame_->Origin())) { + plugin_data_sub_frame_->UpdatePluginList(false, main_frame_origin); + } + + return plugin_data_sub_frame_.Get(); + } } void Page::ResetPluginData() { for (Page* page : AllPages()) { - if (page->plugin_data_) { - page->plugin_data_->ResetPluginData(); + if (page->plugin_data_main_frame_ || page->plugin_data_sub_frame_) { + if (page->plugin_data_main_frame_) + page->plugin_data_main_frame_->ResetPluginData(); + if (page->plugin_data_sub_frame_) + page->plugin_data_sub_frame_->ResetPluginData(); page->NotifyPluginsChanged(); } } @@ -873,7 +894,8 @@ void Page::Trace(blink::Visitor* visitor) { visitor->Trace(link_highlight_); visitor->Trace(spatial_navigation_controller_); visitor->Trace(main_frame_); - visitor->Trace(plugin_data_); + visitor->Trace(plugin_data_main_frame_); + visitor->Trace(plugin_data_sub_frame_); visitor->Trace(validation_message_client_); visitor->Trace(agent_metrics_collector_); visitor->Trace(plugins_changed_observers_); diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h index f71d15a750a5..a4b901152085 100644 --- third_party/blink/renderer/core/page/page.h +++ third_party/blink/renderer/core/page/page.h @@ -144,7 +144,8 @@ class CORE_EXPORT Page final : public GarbageCollected, ViewportDescription GetViewportDescription() const; // Returns the plugin data associated with |main_frame_origin|. - PluginData* GetPluginData(const SecurityOrigin* main_frame_origin); + PluginData* GetPluginData(bool is_main_frame, + const SecurityOrigin* main_frame_origin); // Resets the plugin data for all pages in the renderer process and notifies // PluginsChangedObservers. @@ -393,7 +394,8 @@ class CORE_EXPORT Page final : public GarbageCollected, const Member link_highlight_; Member spatial_navigation_controller_; - Member plugin_data_; + Member plugin_data_main_frame_; + Member plugin_data_sub_frame_; Member validation_message_client_; diff --git third_party/blink/renderer/core/page/plugin_data.cc third_party/blink/renderer/core/page/plugin_data.cc index 987ed360e0ae..382c833b39d0 100644 --- third_party/blink/renderer/core/page/plugin_data.cc +++ third_party/blink/renderer/core/page/plugin_data.cc @@ -91,10 +91,12 @@ void PluginData::RefreshBrowserSidePluginCache() { Platform::Current()->GetBrowserInterfaceBroker()->GetInterface( registry.BindNewPipeAndPassReceiver()); Vector plugins; - registry->GetPlugins(true, SecurityOrigin::CreateUniqueOpaque(), &plugins); + registry->GetPlugins(true, true, SecurityOrigin::CreateUniqueOpaque(), + &plugins); } -void PluginData::UpdatePluginList(const SecurityOrigin* main_frame_origin) { +void PluginData::UpdatePluginList(bool is_main_frame, + const SecurityOrigin* main_frame_origin) { ResetPluginData(); main_frame_origin_ = main_frame_origin; @@ -102,7 +104,7 @@ void PluginData::UpdatePluginList(const SecurityOrigin* main_frame_origin) { Platform::Current()->GetBrowserInterfaceBroker()->GetInterface( registry.BindNewPipeAndPassReceiver()); Vector plugins; - registry->GetPlugins(false, main_frame_origin_, &plugins); + registry->GetPlugins(false, is_main_frame, main_frame_origin_, &plugins); for (const auto& plugin : plugins) { auto* plugin_info = MakeGarbageCollected( plugin->name, FilePathToWebString(plugin->filename), diff --git third_party/blink/renderer/core/page/plugin_data.h third_party/blink/renderer/core/page/plugin_data.h index efd11fb5b5e3..5b985cea38fe 100644 --- third_party/blink/renderer/core/page/plugin_data.h +++ third_party/blink/renderer/core/page/plugin_data.h @@ -97,7 +97,8 @@ class CORE_EXPORT PluginData final : public GarbageCollected { const HeapVector>& Plugins() const { return plugins_; } const HeapVector>& Mimes() const { return mimes_; } const SecurityOrigin* Origin() const { return main_frame_origin_.get(); } - void UpdatePluginList(const SecurityOrigin* main_frame_origin); + void UpdatePluginList(bool is_main_frame, + const SecurityOrigin* main_frame_origin); void ResetPluginData(); bool SupportsMimeType(const String& mime_type) const;