Drop ImageLoader in plugins

third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
index e74ced8e1c9621b12119ea393847c285e2891abe..7f739b2b9a70bedca497044b594b57994c2205e3 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
@@ -35,7 +35,6 @@
 #include "core/frame/Settings.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/HTMLContentElement.h"
-#include "core/html/HTMLImageLoader.h"
 #include "core/html/PluginDocument.h"
 #include "core/input/EventHandler.h"
 #include "core/inspector/ConsoleMessage.h"
@@ -91,15 +90,10 @@ HTMLPlugInElement::~HTMLPlugInElement() {
 }
 
 DEFINE_TRACE(HTMLPlugInElement) {
-  visitor->Trace(image_loader_);
   visitor->Trace(persisted_plugin_);
   HTMLFrameOwnerElement::Trace(visitor);
 }
 
-bool HTMLPlugInElement::HasPendingActivity() const {
-  return image_loader_ && image_loader_->HasPendingActivity();
-}
-
 void HTMLPlugInElement::SetPersistedPlugin(PluginView* plugin) {
   if (persisted_plugin_ == plugin)
     return;
@@ -172,12 +166,6 @@ void HTMLPlugInElement::RemoveAllEventListeners() {
     plugin->EventListenersRemoved();
 }
 
-void HTMLPlugInElement::DidMoveToNewDocument(Document& old_document) {
-  if (image_loader_)
-    image_loader_->ElementDidMoveToNewDocument();
-  HTMLFrameOwnerElement::DidMoveToNewDocument(old_document);
-}
-
 void HTMLPlugInElement::AttachLayoutTree(const AttachContext& context) {
   HTMLFrameOwnerElement::AttachLayoutTree(context);
 
@@ -191,14 +179,10 @@ void HTMLPlugInElement::AttachLayoutTree(const AttachContext& context) {
     return;
   }
 
-  if (IsImageType()) {
-    if (!image_loader_)
-      image_loader_ = HTMLImageLoader::Create(this);
-    image_loader_->UpdateFromElement();
-  } else if (NeedsPluginUpdate() && !GetLayoutEmbeddedItem().IsNull() &&
-             !GetLayoutEmbeddedItem().ShowsUnavailablePluginIndicator() &&
-             GetObjectContentType() != ObjectContentType::kPlugin &&
-             !is_delaying_load_event_) {
+  if (NeedsPluginUpdate() && !GetLayoutEmbeddedItem().IsNull() &&
+      !GetLayoutEmbeddedItem().ShowsUnavailablePluginIndicator() &&
+      GetObjectContentType() != ObjectContentType::kPlugin &&
+      !is_delaying_load_event_) {
     is_delaying_load_event_ = true;
     GetDocument().IncrementLoadEventDelayCount();
     GetDocument().LoadPluginsSoon();