Remove RenderImage

sky/engine/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 27 matching lines @@
 #include "sky/engine/core/fetch/ResourceLoader.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/html/HTMLElement.h"
 #include "sky/engine/core/page/EventHandler.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/HitTestResult.h"
 #include "sky/engine/core/rendering/RenderFlexibleBox.h"
 #include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderImage.h"
-#include "sky/engine/core/rendering/RenderImageResourceStyleImage.h"
 #include "sky/engine/core/rendering/RenderInline.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 #include "sky/engine/core/rendering/RenderObjectInlines.h"
 #include "sky/engine/core/rendering/RenderParagraph.h"
 #include "sky/engine/core/rendering/RenderText.h"
 #include "sky/engine/core/rendering/RenderTheme.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/core/rendering/style/ShadowList.h"
 #include "sky/engine/platform/JSONValues.h"
 #include "sky/engine/platform/Partitions.h"
@@ skipping 70 matching lines @@
         return new RenderFlexibleBox(element);
     }
 
     return 0;
 }
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter, ("RenderObject"));
 unsigned RenderObject::s_instanceCount = 0;
 
 RenderObject::RenderObject(Node* node)
-    : ImageResourceClient()
-    , m_style(nullptr)
+    : m_style(nullptr)
     , m_node(node)
     , m_parent(nullptr)
     , m_previous(nullptr)
     , m_next(nullptr)
 #if ENABLE(ASSERT)
     , m_setNeedsLayoutForbidden(false)
 #if ENABLE(OILPAN)
     , m_didCallDestroy(false)
 #endif
 #endif
@@ skipping 1564 matching lines @@
             overline.color = resultColor;
             overline.style = resultStyle;
         }
         if (decorations & TextDecorationLineThrough) {
             linethrough.color = resultColor;
             linethrough.style = resultStyle;
         }
     }
 }
 
-bool RenderObject::willRenderImage(ImageResource*)
-{
-    // FIXME(sky): Do we want to keep this?
-    // We will not render a new image when Active DOM is suspended
-    return !document().activeDOMObjectsAreSuspended();
-}
-
 int RenderObject::caretMinOffset() const
 {
     return 0;
 }
 
 int RenderObject::caretMaxOffset() const
 {
     if (isReplaced())
         return node() ? std::max(1U, node()->countChildren()) : 1;
     return 0;
@@ skipping 18 matching lines @@
 // According to the CSS Box Model Spec (http://dev.w3.org/csswg/css-box/#the-width-and-height-properties)
 // width applies to all elements but non-replaced inline elements, table rows, and row groups and
 // height applies to all elements but non-replaced inline elements, table columns, and column groups.
 bool RenderObject::supportsTouchAction() const
 {
     if (isInline() && !isReplaced())
         return false;
     return true;
 }
 
-void RenderObject::imageChanged(ImageResource* image, const IntRect* rect)
-{
-    imageChanged(static_cast<WrappedImagePtr>(image), rect);
-}
-
-void RenderObject::imageChanged(WrappedImagePtr, const IntRect*)
-{
-    if (parent())
-        document().scheduleVisualUpdate();
-}
-
 Element* RenderObject::offsetParent() const
 {
     Node* node = 0;
     for (RenderObject* ancestor = parent(); ancestor; ancestor = ancestor->parent()) {
         // Spec: http://www.w3.org/TR/cssom-view/#offset-attributes
         node = ancestor->node();
         if (!node)
             continue;
 
         if (ancestor->isPositioned())
@@ skipping 109 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif