Merge image sizing algorithms

third_party/WebKit/Source/core/style/StyleGeneratedImage.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 26 matching lines @@
     static PassRefPtrWillBeRawPtr<StyleGeneratedImage> create(const CSSImageGeneratorValue& value)
     {
         return adoptRefWillBeNoop(new StyleGeneratedImage(value));
     }
 
     WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); }
 
     PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
     PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;
 
-    LayoutSize imageSize(const LayoutObject*, float multiplier) const override;
+    LayoutSize imageSize(const LayoutObject*, float multiplier, const LayoutSize& defaultObjectSize) const override;
     bool imageHasRelativeSize() const override { return !m_fixedSize; }
     void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSize, FloatSize& intrinsicRatio) override;
     bool usesImageContainerSize() const override { return !m_fixedSize; }
     void addClient(LayoutObject*) override;
     void removeClient(LayoutObject*) override;
     PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const override;
     bool knownToBeOpaque(const LayoutObject*) const override;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     StyleGeneratedImage(const CSSImageGeneratorValue&);
 
     // TODO(sashab): Replace this with <const CSSImageGeneratorValue> once RefPtrWillBeMember<>
     // supports const types.
     RefPtrWillBeMember<CSSImageGeneratorValue> m_imageGeneratorValue;
     const bool m_fixedSize;
 };
 
 DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleGeneratedImage, isGeneratedImage());
 
 } // namespace blink
 #endif