Remove RenderImage

sky/engine/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  *
  * 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 14 matching lines @@
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/dom/IncrementLoadEventDelayCount.h"
 #include "sky/engine/core/dom/Microtask.h"
 #include "sky/engine/core/events/Event.h"
 #include "sky/engine/core/events/EventSender.h"
 #include "sky/engine/core/fetch/FetchRequest.h"
 #include "sky/engine/core/fetch/MemoryCache.h"
 #include "sky/engine/core/fetch/ResourceFetcher.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/html/parser/HTMLParserIdioms.h"
-#include "sky/engine/core/rendering/RenderImage.h"
 #include "sky/engine/platform/Logging.h"
 #include "sky/engine/public/platform/WebURLRequest.h"
 
 namespace blink {
 
 static ImageEventSender& loadEventSender()
 {
     DEFINE_STATIC_LOCAL(ImageEventSender, sender, (EventTypeNames::load));
     return sender;
 }
@@ skipping 102 matching lines @@
         if (m_hasPendingErrorEvent) {
             errorEventSender().cancelEvent(this);
             m_hasPendingErrorEvent = false;
         }
         m_imageComplete = true;
         if (newImage)
             newImage->addClient(this);
         if (oldImage)
             oldImage->removeClient(this);
     }
-
-    if (RenderImageResource* imageResource = renderImageResource())
-        imageResource->resetAnimation();
 }
 
 inline void ImageLoader::crossSiteOrCSPViolationOccured(AtomicString imageSourceURL)
 {
     m_failedLoadURL = imageSourceURL;
     m_hasPendingErrorEvent = true;
     errorEventSender().dispatchEventSoon(this);
 }
 
 inline void ImageLoader::clearFailedLoadURL()
@@ skipping 72 matching lines @@
         m_imageComplete = !newImage;
 
         updateRenderer();
         // If newImage exists and is cached, addClient() will result in the load event
         // being queued to fire. Ensure this happens after beforeload is dispatched.
         if (newImage)
             newImage->addClient(this);
 
         if (oldImage)
             oldImage->removeClient(this);
-    } else if (updateBehavior == UpdateSizeChanged && m_element->renderer() && m_element->renderer()->isImage()) {
-        toRenderImage(m_element->renderer())->intrinsicSizeChanged();
     }
 
-    if (RenderImageResource* imageResource = renderImageResource())
-        imageResource->resetAnimation();
-
     // Only consider updating the protection ref-count of the Element immediately before returning
     // from this function as doing so might result in the destruction of this ImageLoader.
     updatedHasPendingEvent();
 }
 
 void ImageLoader::updateFromElement(UpdateFromElementBehavior updateBehavior, LoadType loadType)
 {
     AtomicString imageSourceURL = m_element->imageSourceURL();
 
     if (updateBehavior == UpdateIgnorePreviousError)
@@ skipping 70 matching lines @@
     if (resource->wasCanceled()) {
         m_hasPendingLoadEvent = false;
         // Only consider updating the protection ref-count of the Element immediately before returning
         // from this function as doing so might result in the destruction of this ImageLoader.
         updatedHasPendingEvent();
         return;
     }
     loadEventSender().dispatchEventSoon(this);
 }
 
-RenderImageResource* ImageLoader::renderImageResource()
-{
-    RenderObject* renderer = m_element->renderer();
-
-    if (!renderer)
-        return 0;
-
-    if (renderer->isImage())
-        return toRenderImage(renderer)->imageResource();
-
-    return 0;
-}
-
 void ImageLoader::updateRenderer()
 {
-    RenderImageResource* imageResource = renderImageResource();
-
-    if (!imageResource)
-        return;
-
-    // Only update the renderer if it doesn't have an image or if what we have
-    // is a complete image.  This prevents flickering in the case where a dynamic
-    // change is happening between two images.
-    ImageResource* cachedImage = imageResource->cachedImage();
-    if (m_image != cachedImage && (m_imageComplete || !cachedImage))
-        imageResource->setImageResource(m_image.get());
 }
 
 void ImageLoader::updatedHasPendingEvent()
 {
     // If an Element that does image loading is removed from the DOM the load/error event for the image is still observable.
     // As long as the ImageLoader is actively loading, the Element itself needs to be ref'ed to keep it from being
     // destroyed by DOM manipulation or garbage collection.
     // If such an Element wishes for the load to stop when removed from the DOM it needs to stop the ImageLoader explicitly.
     bool wasProtected = m_elementIsProtected;
     m_elementIsProtected = m_hasPendingLoadEvent || m_hasPendingErrorEvent;
@@ skipping 102 matching lines @@
 void ImageLoader::sourceImageChanged()
 {
     HashSet<ImageLoaderClient*>::iterator end = m_clients.end();
     for (HashSet<ImageLoaderClient*>::iterator it = m_clients.begin(); it != end; ++it) {
         ImageLoaderClient* handle = *it;
         handle->notifyImageSourceChanged();
     }
 }
 
 }