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

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.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, 1 month 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/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index d0e9bbb04981714c12a5a1f00027e51b88fbea6a..00741deb6c05cd7334bb05f0f71eafbf4b114013 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -1927,6 +1927,17 @@ void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional,
client()->didFailProvisionalLoad(this, webError, webCommitType);
else
client()->didFailLoad(this, webError, webCommitType);
+ if (WebPluginContainerImpl* plugin = pluginContainerFromFrame(frame()))
+ plugin->didFailLoading(error);
+}
+
+void WebLocalFrameImpl::didFinish()
+{
+ if (!client())
+ return;
+ client()->didFinishLoad(this);
+ if (WebPluginContainerImpl* plugin = pluginContainerFromFrame(frame()))
+ plugin->didFinishLoading();
}
void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars)

Powered by Google App Engine
This is Rietveld 408576698