Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: third_party/WebKit/Source/web/WebDataSourceImpl.cpp

Issue 1426923007: Remove PluginLoadObserver and related logic, it was only used for NPAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebDataSourceImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp
index 45a6748dec84a5747da2f73d56e0d989e9fbef60..455be26b8cdfed7db2cccea2a3db79ca02b34141 100644
--- a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp
+++ b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp
@@ -38,12 +38,6 @@
namespace blink {
-static OwnPtrWillBePersistent<WebPluginLoadObserver>& nextPluginLoadObserver()
-{
- DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WebPluginLoadObserver>, nextPluginLoadObserver, ());
- return nextPluginLoadObserver;
-}
-
PassRefPtrWillBeRawPtr<WebDataSourceImpl> WebDataSourceImpl::create(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data)
{
return adoptRefWillBeNoop(new WebDataSourceImpl(frame, request, data));
@@ -137,25 +131,9 @@ WebNavigationType WebDataSourceImpl::toWebNavigationType(NavigationType type)
}
}
-void WebDataSourceImpl::setNextPluginLoadObserver(PassOwnPtrWillBeRawPtr<WebPluginLoadObserver> observer)
-{
- nextPluginLoadObserver() = observer;
-}
-
WebDataSourceImpl::WebDataSourceImpl(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data)
: DocumentLoader(frame, request, data)
{
- if (!nextPluginLoadObserver())
- return;
- // When a new frame is created, it initially gets a data source for an
- // empty document. Then it is navigated to the source URL of the
- // frame, which results in a second data source being created. We want
- // to wait to attach the WebPluginLoadObserver to that data source.
- if (request.url().isEmpty())
- return;
-
- ASSERT(nextPluginLoadObserver()->url() == WebURL(request.url()));
- m_pluginLoadObserver = nextPluginLoadObserver().release();
}
WebDataSourceImpl::~WebDataSourceImpl()
@@ -170,12 +148,10 @@ void WebDataSourceImpl::detachFromFrame()
DocumentLoader::detachFromFrame();
m_extraData.clear();
- m_pluginLoadObserver.clear();
}
DEFINE_TRACE(WebDataSourceImpl)
{
- visitor->trace(m_pluginLoadObserver);
DocumentLoader::trace(visitor);
}
« no previous file with comments | « third_party/WebKit/Source/web/WebDataSourceImpl.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698