Generalize ImageForContainer

Source/core/platform/graphics/ImageForContainer.cpp

 /*
  * Copyright (C) 2013 Google 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/SVGImageForContainer.h"
+#include "core/platform/graphics/ImageForContainer.h"
 
 #include "core/platform/graphics/Image.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "wtf/PassRefPtr.h"
 
 namespace WebCore {
 
-IntSize SVGImageForContainer::size() const
+IntSize ImageForContainer::size() const
 {
+    if (!isSVGImage())
+        return m_image->size();

[pdr., 2013/10/04 21:08:04]

Is this necessary? I thought we'd go through the lines below this.

[Yoav Weiss, 2013/10/08 08:47:24]

m_containerSize and m_zoom are not defined for non-SVG images, so this is how I
handled it. I could also defined them for bitmap images, if that's preferable.

     FloatSize scaledContainerSize(m_containerSize);
     scaledContainerSize.scale(m_zoom);
     return roundedIntSize(scaledContainerSize);
 }
 
-void SVGImageForContainer::draw(GraphicsContext* context, const FloatRect& dstRect,
+void ImageForContainer::draw(GraphicsContext* context, const FloatRect& dstRect,
     const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode)
 {
     m_image->drawForContainer(context, m_containerSize, m_zoom, dstRect, srcRect, compositeOp, blendMode);
 }
 
-void SVGImageForContainer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const FloatSize& scale,
+void ImageForContainer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const FloatSize& scale,
     const FloatPoint& phase, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
 {
     m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, scale, phase, compositeOp, dstRect, blendMode);
 }
 
-PassRefPtr<NativeImageSkia> SVGImageForContainer::nativeImageForCurrentFrame()
+PassRefPtr<NativeImageSkia> ImageForContainer::nativeImageForCurrentFrame()
 {
     return m_image->nativeImageForCurrentFrame();
 }
 
 } // namespace WebCore