[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/style/StyleImage.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 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 13 matching lines @@
 #ifndef StyleImage_h
 #define StyleImage_h
 
 #include "core/CoreExport.h"
 #include "platform/graphics/Image.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
 class CSSValue;
-class ImageResource;
+class ImageResourceContent;
 class IntSize;
 class LayoutObject;
 class LayoutSize;
 class SVGImage;
 
 typedef void* WrappedImagePtr;
 
 class CORE_EXPORT StyleImage : public GarbageCollectedFinalized<StyleImage> {
  public:
   virtual ~StyleImage() {}
@@ skipping 20 matching lines @@
   virtual void removeClient(LayoutObject*) = 0;
   // Note that the containerSize is assumed to be in the effective
   // zoom level given by multiplier, i.e if the multiplier is the
   // constant 1 the containerSize should be unzoomed.
   virtual PassRefPtr<Image> image(const LayoutObject&,
                                   const IntSize& containerSize,
                                   float multiplier) const = 0;
   virtual WrappedImagePtr data() const = 0;
   virtual float imageScaleFactor() const { return 1; }
   virtual bool knownToBeOpaque(const LayoutObject&) const = 0;
-  virtual ImageResource* cachedImage() const { return 0; }
+  virtual ImageResourceContent* cachedImage() const { return 0; }
 
   ALWAYS_INLINE bool isImageResource() const { return m_isImageResource; }
   ALWAYS_INLINE bool isPendingImage() const { return m_isPendingImage; }
   ALWAYS_INLINE bool isGeneratedImage() const { return m_isGeneratedImage; }
   ALWAYS_INLINE bool isImageResourceSet() const { return m_isImageResourceSet; }
   ALWAYS_INLINE bool isInvalidImage() const { return m_isInvalidImage; }
   ALWAYS_INLINE bool isPaintImage() const { return m_isPaintImage; }
 
   DEFINE_INLINE_VIRTUAL_TRACE() {}
 
@@ skipping 21 matching lines @@
 #define DEFINE_STYLE_IMAGE_TYPE_CASTS(thisType, function)                   \
   DEFINE_TYPE_CASTS(thisType, StyleImage, styleImage, styleImage->function, \
                     styleImage.function);                                   \
   inline thisType* to##thisType(const Member<StyleImage>& styleImage) {     \
     return to##thisType(styleImage.get());                                  \
   }                                                                         \
   typedef int NeedsSemiColonAfterDefineStyleImageTypeCasts
 
 }  // namespace blink
 #endif