Merge image sizing algorithms

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 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.
@@ skipping 20 matching lines @@
 #include "platform/graphics/Image.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class ImageResource;
 class CSSValue;
 class LayoutObject;
+class SVGImage;
 
 typedef void* WrappedImagePtr;
 
 class CORE_EXPORT StyleImage : public RefCountedWillBeGarbageCollectedFinalized<StyleImage> {
 public:
     virtual ~StyleImage() { }
 
     bool operator==(const StyleImage& other) const
     {
         return data() == other.data();
     }
 
     virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const = 0;
     virtual PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const = 0;
 
     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;
     virtual void addClient(LayoutObject*) = 0;
     virtual void removeClient(LayoutObject*) = 0;
     virtual PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const = 0;
     virtual WrappedImagePtr data() const = 0;
     virtual float imageScaleFactor() const { return 1; }
     virtual bool knownToBeOpaque(const LayoutObject*) const = 0;
     virtual ImageResource* cachedImage() const { return 0; }
@@ skipping 13 matching lines @@
         , m_isGeneratedImage(false)
         , m_isImageResourceSet(false)
         , m_isInvalidImage(false)
     {
     }
     bool m_isImageResource:1;
     bool m_isPendingImage:1;
     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) \
     DEFINE_TYPE_CASTS(thisType, StyleImage, styleImage, styleImage->function, styleImage.function); \
     inline thisType* to##thisType(const RefPtrWillBeMember<StyleImage>& styleImage) { return to##thisType(styleImage.get()); } \
     typedef int NeedsSemiColonAfterDefineStyleImageTypeCasts
 
 } // namespace blink
 #endif