Generalize ImageForContainer

Source/core/fetch/ImageResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 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.
 
     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 ImageResource_h
 #define ImageResource_h
 
 #include "core/fetch/Resource.h"
+#include "core/platform/graphics/ImageCache.h"
 #include "core/platform/graphics/ImageObserver.h"
 #include "core/platform/graphics/IntSizeHash.h"
-#include "core/svg/graphics/SVGImageCache.h"
-#include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutSize.h"
 #include "wtf/HashMap.h"
 
 namespace WebCore {
 
 class ImageResourceClient;
 class ResourceFetcher;
 class FloatSize;
 class MemoryCache;
 class RenderObject;
@@ skipping 67 matching lines @@
     // If not null, changeRect is the changed part of the image.
     void notifyObservers(const IntRect* changeRect = 0);
 
     virtual void switchClientsToRevalidatedResource() OVERRIDE;
 
     typedef pair<IntSize, float> SizeAndZoom;
     typedef HashMap<const ImageResourceClient*, SizeAndZoom> ContainerSizeRequests;
     ContainerSizeRequests m_pendingContainerSizeRequests;
 
     RefPtr<WebCore::Image> m_image;
-    OwnPtr<SVGImageCache> m_svgImageCache;
+    OwnPtr<ImageCache> m_imageCache;
     bool m_loadingMultipartContent;
 };
 
 }
 
 #endif