Merge image sizing algorithms

third_party/WebKit/Source/core/style/StyleImage.h

Index: third_party/WebKit/Source/core/style/StyleImage.h
diff --git a/third_party/WebKit/Source/core/style/StyleImage.h b/third_party/WebKit/Source/core/style/StyleImage.h
index 49a050c50ad72504e7272ff7a0b8809677b88724..4caa2c42513d4512878f52fddf20d28599676cb8 100644
--- a/third_party/WebKit/Source/core/style/StyleImage.h
+++ b/third_party/WebKit/Source/core/style/StyleImage.h
@@ -38,6 +38,7 @@ namespace blink {
 class ImageResource;
 class CSSValue;
 class LayoutObject;
+class SVGImage;
 
 typedef void* WrappedImagePtr;
 
@@ -56,7 +57,7 @@ public:
     virtual bool canRender() const { return true; }
     virtual bool isLoaded() const { return true; }
     virtual bool errorOccurred() const { return false; }
-    virtual LayoutSize imageSize(const LayoutObject*, float multiplier) const = 0;
+    virtual LayoutSize imageSize(const LayoutObject*, float multiplier, const LayoutSize& defaultObjectSize) const = 0;
     virtual void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSize, FloatSize& intrinsicRatio) = 0;
     virtual bool imageHasRelativeSize() const = 0;
     virtual bool usesImageContainerSize() const = 0;
@@ -90,6 +91,9 @@ protected:
     bool m_isGeneratedImage:1;
     bool m_isImageResourceSet:1;
     bool m_isInvalidImage:1;
+
+    static LayoutSize applyZoom(const LayoutSize&, float multiplier);
+    LayoutSize imageSizeForSVGImage(SVGImage*, float multiplier, const LayoutSize& defaultObjectSize) const;
 };
 
 #define DEFINE_STYLE_IMAGE_TYPE_CASTS(thisType, function) \