Remove RenderImage

sky/engine/core/rendering/RenderObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google 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
@@ skipping 12 matching lines @@
  *
  */
 
 #ifndef SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_
 #define SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_
 
 #include "sky/engine/core/dom/Document.h"
 #include "sky/engine/core/dom/DocumentLifecycle.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/editing/TextAffinity.h"
-#include "sky/engine/core/fetch/ImageResourceClient.h"
 #include "sky/engine/core/html/HTMLElement.h"
 #include "sky/engine/core/rendering/HitTestRequest.h"
 #include "sky/engine/core/rendering/RenderObjectChildList.h"
 #include "sky/engine/core/rendering/SubtreeLayoutScope.h"
 #include "sky/engine/core/rendering/style/RenderStyle.h"
 #include "sky/engine/core/rendering/style/StyleInheritedData.h"
 #include "sky/engine/platform/geometry/FloatQuad.h"
 #include "sky/engine/platform/geometry/LayoutRect.h"
 #include "sky/engine/platform/transforms/TransformationMatrix.h"
 
@@ skipping 51 matching lines @@
     bool draggable;
 };
 
 typedef WTF::HashMap<const RenderLayer*, Vector<LayoutRect> > LayerHitTestRects;
 
 #ifndef NDEBUG
 const int showTreeCharacterOffset = 39;
 #endif
 
 // Base class for all rendering tree objects.
-class RenderObject : public ImageResourceClient {
+class RenderObject {
     friend class RenderBlock;
     friend class RenderObjectChildList;
     WTF_MAKE_NONCOPYABLE(RenderObject);
 public:
     // TODO(ojan): Pass in a reference since the node can no longer be null.
     explicit RenderObject(Node*);
     virtual ~RenderObject();
 
     virtual const char* renderName() const = 0;
 
@@ skipping 130 matching lines @@
 #endif
 
 public:
     virtual bool isBoxModelObject() const { return false; }
     virtual bool isCanvas() const { return false; }
     virtual bool isImage() const { return false; }
     virtual bool isInlineBlock() const { return false; }
     virtual bool isRenderBlock() const { return false; }
     virtual bool isRenderCustomLayout() const { return false; }
     virtual bool isRenderParagraph() const { return false; }
-    virtual bool isRenderImage() const { return false; }
     virtual bool isRenderInline() const { return false; }
     virtual bool isRenderView() const { return false; }
 
     bool everHadLayout() const { return m_bitfields.everHadLayout(); }
 
     bool alwaysCreateLineBoxesForRenderInline() const
     {
         ASSERT(isRenderInline());
         return m_bitfields.alwaysCreateLineBoxesForRenderInline();
     }
@@ skipping 283 matching lines @@
     // Virtual function helper for the new FlexibleBox Layout (display: -webkit-flex).
     virtual bool isFlexibleBox() const { return false; }
 
     virtual int caretMinOffset() const;
     virtual int caretMaxOffset() const;
 
     virtual int previousOffset(int current) const;
     virtual int previousOffsetForBackwardDeletion(int current) const;
     virtual int nextOffset(int current) const;
 
-    virtual void imageChanged(ImageResource*, const IntRect* = 0) override final;
-    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
-    virtual bool willRenderImage(ImageResource*) override final;
-
     void selectionStartEnd(int& spos, int& epos) const;
 
     void remove() { if (parent()) parent()->removeChild(this); }
 
     bool supportsTouchAction() const;
 
     bool visibleToHitTestRequest(const HitTestRequest& request) const { return (request.ignorePointerEventsNone() || style()->pointerEvents() != PE_NONE); }
 
     bool visibleToHitTesting() const { return style()->pointerEvents() != PE_NONE; }
 
@@ skipping 283 matching lines @@
 void showTree(const blink::RenderObject*);
 void showLineTree(const blink::RenderObject*);
 void showRenderTree(const blink::RenderObject* object1);
 // We don't make object2 an optional parameter so that showRenderTree
 // can be called from gdb easily.
 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObject* object2);
 
 #endif
 
 #endif  // SKY_ENGINE_CORE_RENDERING_RENDEROBJECT_H_