Merge image sizing algorithms

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef StyleInvalidImage_h
 #define StyleInvalidImage_h
 
 #include "core/css/CSSImageValue.h"
 #include "core/style/StyleImage.h"
 
 namespace blink {
 
 class StyleInvalidImage final : public StyleImage {
 public:
     static PassRefPtrWillBeRawPtr<StyleInvalidImage> create(const String& url)
     {
         return adoptRefWillBeNoop(new StyleInvalidImage(url));
     }
 
     WrappedImagePtr data() const override { return m_url.impl(); }
 
     PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return CSSImageValue::create(AtomicString(m_url)); }
 
     PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override { return cssValue(); }
 
-    LayoutSize imageSize(const LayoutObject*, float /*multiplier*/) const override { return LayoutSize(); }
+    LayoutSize imageSize(const LayoutObject*, float /*multiplier*/, const LayoutSize& /*defaultObjectSize*/) const override { return LayoutSize(); }
     bool imageHasRelativeSize() const override { return false; }
     void computeIntrinsicDimensions(const LayoutObject*, FloatSize& /* intrinsicSize */, FloatSize& /* intrinsicRatio */) override { }
     bool usesImageContainerSize() const override { return false; }
     void addClient(LayoutObject*) override { }
     void removeClient(LayoutObject*) override { }
     PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const override
     {
         return nullptr;
     }
     bool knownToBeOpaque(const LayoutObject*) const override { return false; }
@@ skipping 10 matching lines @@
         m_isInvalidImage = true;
     }
 
     String m_url;
 };
 
 DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleInvalidImage, isInvalidImage());
 
 } // namespace blink
 #endif