Generalize ImageForContainer

Source/core/svg/graphics/SVGImageCache.cpp

Index: Source/core/svg/graphics/SVGImageCache.cpp
diff --git a/Source/core/svg/graphics/SVGImageCache.cpp b/Source/core/svg/graphics/SVGImageCache.cpp
deleted file mode 100644
index 81153b3739e78e05d6f9dc35fd7a606d6ce03f2f..0000000000000000000000000000000000000000
--- a/Source/core/svg/graphics/SVGImageCache.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
- * Copyright (C) 2013 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.
- */
-
-#include "config.h"
-#include "core/svg/graphics/SVGImageCache.h"
-
-#include "core/fetch/ImageResource.h"
-#include "core/page/FrameView.h"
-#include "core/page/Page.h"
-#include "core/platform/graphics/GraphicsContext.h"
-#include "core/platform/graphics/ImageBuffer.h"
-#include "core/rendering/svg/RenderSVGRoot.h"
-#include "core/svg/graphics/SVGImage.h"
-#include "core/svg/graphics/SVGImageForContainer.h"
-
-namespace WebCore {
-
-SVGImageCache::SVGImageCache(SVGImage* svgImage)
-    : m_svgImage(svgImage)
-{
-    ASSERT(m_svgImage);
-}
-
-SVGImageCache::~SVGImageCache()
-{
-    m_imageForContainerMap.clear();
-}
-
-void SVGImageCache::removeClientFromCache(const ImageResourceClient* client)
-{
-    ASSERT(client);
-
-    if (m_imageForContainerMap.contains(client))
-        m_imageForContainerMap.remove(client);
-}
-
-void SVGImageCache::setContainerSizeForRenderer(const ImageResourceClient* client, const IntSize& containerSize, float containerZoom)
-{
-    ASSERT(client);
-    ASSERT(!containerSize.isEmpty());
-    ASSERT(containerZoom);
-
-    FloatSize containerSizeWithoutZoom(containerSize);
-    containerSizeWithoutZoom.scale(1 / containerZoom);
-
-    m_imageForContainerMap.set(client, SVGImageForContainer::create(m_svgImage, containerSizeWithoutZoom, containerZoom));
-}
-
-IntSize SVGImageCache::imageSizeForRenderer(const RenderObject* renderer) const
-{
-    IntSize imageSize = m_svgImage->size();
-    if (!renderer)
-        return imageSize;
-
-    ImageForContainerMap::const_iterator it = m_imageForContainerMap.find(renderer);
-    if (it == m_imageForContainerMap.end())
-        return imageSize;
-
-    RefPtr<SVGImageForContainer> imageForContainer = it->value;
-    ASSERT(!imageForContainer->size().isEmpty());
-    return imageForContainer->size();
-}
-
-// FIXME: This doesn't take into account the animation timeline so animations will not
-// restart on page load, nor will two animations in different pages have different timelines.
-Image* SVGImageCache::imageForRenderer(const RenderObject* renderer)
-{
-    if (!renderer)
-        return Image::nullImage();
-
-    ImageForContainerMap::iterator it = m_imageForContainerMap.find(renderer);
-    if (it == m_imageForContainerMap.end())
-        return Image::nullImage();
-
-    RefPtr<SVGImageForContainer> imageForContainer = it->value;
-    ASSERT(!imageForContainer->size().isEmpty());
-    return imageForContainer.get();
-}
-
-} // namespace WebCore