Drop ImageLoader in plugins

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

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 17 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/Event.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
 #include "core/frame/LocalFrameView.h"
 #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"
 #include "core/layout/LayoutEmbeddedContent.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/api/LayoutEmbeddedItem.h"
 #include "core/loader/MixedContentChecker.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/plugins/PluginView.h"
@@ skipping 35 matching lines @@
       needs_plugin_update_(!created_by_parser),
       should_prefer_plug_ins_for_images_(prefer_plug_ins_for_images_option ==
                                          kShouldPreferPlugInsForImages) {}
 
 HTMLPlugInElement::~HTMLPlugInElement() {
   DCHECK(plugin_wrapper_.IsEmpty());  // cleared in detachLayoutTree()
   DCHECK(!is_delaying_load_event_);
 }
 
 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;
   if (persisted_plugin_) {
     persisted_plugin_->Hide();
     DisposePluginSoon(persisted_plugin_.Release());
   }
   persisted_plugin_ = plugin;
 }
 
@@ skipping 52 matching lines @@
   return r && (r->IsEmbeddedObject() || r->IsLayoutEmbeddedContent());
 }
 
 void HTMLPlugInElement::RemoveAllEventListeners() {
   HTMLFrameOwnerElement::RemoveAllEventListeners();
   PluginView* plugin = OwnedPlugin();
   if (plugin)
     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);
 
   if (!GetLayoutObject() || UseFallbackContent()) {
     // If we don't have a layoutObject we have to dispose of any plugins
     // which we persisted over a reattach.
     if (persisted_plugin_) {
       HTMLFrameOwnerElement::PluginDisposeSuspendScope suspend_plugin_dispose;
       SetPersistedPlugin(nullptr);
     }
     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();
   }
 }
 
 void HTMLPlugInElement::UpdatePlugin() {
   UpdatePluginInternal();
   if (is_delaying_load_event_) {
     is_delaying_load_event_ = false;
@@ skipping 466 matching lines @@
 
 void HTMLPlugInElement::LazyReattachIfNeeded() {
   if (!UseFallbackContent() && NeedsPluginUpdate() && GetLayoutObject() &&
       !IsImageType()) {
     LazyReattachIfAttached();
     SetPersistedPlugin(nullptr);
   }
 }
 
 }  // namespace blink