Index: Source/core/platform/graphics/ImageForContainer.h |
diff --git a/Source/core/svg/graphics/SVGImageForContainer.h b/Source/core/platform/graphics/ImageForContainer.h |
similarity index 84% |
rename from Source/core/svg/graphics/SVGImageForContainer.h |
rename to Source/core/platform/graphics/ImageForContainer.h |
index 8fc79b34696c88fbf383202d47621cd041ff9abd..7ec107e5629deac927b2715f1d29c54cfafe691a 100644 |
--- a/Source/core/svg/graphics/SVGImageForContainer.h |
+++ b/Source/core/platform/graphics/ImageForContainer.h |
@@ -23,24 +23,23 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef SVGImageForContainer_h |
-#define SVGImageForContainer_h |
+#ifndef ImageForContainer_h |
+#define ImageForContainer_h |
#include "core/platform/graphics/Image.h" |
-#include "core/svg/graphics/SVGImage.h" |
#include "platform/geometry/FloatRect.h" |
#include "platform/geometry/FloatSize.h" |
namespace WebCore { |
-class SVGImageForContainer : public Image { |
+class ImageForContainer : public Image { |
public: |
- static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatSize& containerSize, float zoom) |
+ static PassRefPtr<ImageForContainer> create(Image* image, const FloatSize& containerSize, float zoom) |
{ |
- return adoptRef(new SVGImageForContainer(image, containerSize, zoom)); |
+ return adoptRef(new ImageForContainer(image, containerSize, zoom)); |
} |
- virtual bool isSVGImage() const OVERRIDE { return true; } |
+ virtual bool isSVGImage() const OVERRIDE { return m_image->isSVGImage(); } |
virtual IntSize size() const OVERRIDE; |
@@ -62,7 +61,7 @@ public: |
virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE; |
private: |
- SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom) |
+ ImageForContainer(Image* image, const FloatSize& containerSize, float zoom) |
: m_image(image) |
, m_containerSize(containerSize) |
, m_zoom(zoom) |
@@ -72,10 +71,10 @@ private: |
virtual void destroyDecodedData(bool) OVERRIDE { } |
virtual unsigned decodedSize() const OVERRIDE { return 0; } |
- SVGImage* m_image; |
+ Image* m_image; |
const FloatSize m_containerSize; |
const float m_zoom; |
}; |
} |
-#endif // SVGImageForContainer_h |
+#endif // ImageForContainer_h |