Generalize ImageForContainer

Source/core/platform/graphics/ImageCache.h

 /*
  * Copyright (C) 2011 Research In Motion Limited. 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SVGImageCache_h
-#define SVGImageCache_h
+#ifndef ImageCache_h
+#define ImageCache_h
 
 #include "core/platform/graphics/Image.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/geometry/IntSize.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
 class ImageResource;
 class ImageResourceClient;
 class ImageBuffer;
-class SVGImage;
-class SVGImageForContainer;
+class Image;
+class ImageForContainer;
 class RenderObject;
 
-class SVGImageCache {
+class ImageCache {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    ~SVGImageCache();
+    ~ImageCache();
 
-    static PassOwnPtr<SVGImageCache> create(SVGImage* image)
+    static PassOwnPtr<ImageCache> create(Image* image)
     {
-        return adoptPtr(new SVGImageCache(image));
+        return adoptPtr(new ImageCache(image));
     }
 
     void removeClientFromCache(const ImageResourceClient*);
 
     void setContainerSizeForRenderer(const ImageResourceClient*, const IntSize&, float);
     IntSize imageSizeForRenderer(const RenderObject*) const;
 
     Image* imageForRenderer(const RenderObject*);
 
 private:
-    SVGImageCache(SVGImage*);
+    ImageCache(Image*);
 
-    typedef HashMap<const ImageResourceClient*, RefPtr<SVGImageForContainer> > ImageForContainerMap;
+    typedef HashMap<const ImageResourceClient*, RefPtr<ImageForContainer> > ImageForContainerMap;
 
-    SVGImage* m_svgImage;
+    Image* m_image;
     ImageForContainerMap m_imageForContainerMap;
 };
 
 } // namespace WebCore
 
-#endif // SVGImageCache_h
+#endif // ImageCache_h