Merge image sizing algorithms

third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h

 /*
  * Copyright (C) 1999 Lars Knoll <knoll@kde.org>
  * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
  * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 33 matching lines @@
     }
     void initialize(LayoutObject*) override;
     void shutdown() override;
 
     bool hasImage() const override { return true; }
     PassRefPtr<Image> image(const IntSize&, float) const override;
     bool errorOccurred() const override { return m_styleImage->errorOccurred(); }
 
     bool imageHasRelativeSize() const override { return m_styleImage->imageHasRelativeSize(); }
 
-    LayoutSize imageSize(float multiplier) const override { return m_styleImage->imageSize(m_layoutObject, multiplier); }
+    LayoutSize imageSize(float multiplier) const override
+    {
+        // TODO(davve): Find out the default object size, if any, in this context.
+        LayoutSize scaledImageSize = m_styleImage->imageSize(m_layoutObject, multiplier, LayoutSize());
+        scaledImageSize.scale(1 / m_styleImage->imageScaleFactor());

[fs, 2016/03/03 15:22:53]

Won't this double-scale if m_styleImage is an image-set?

[fs, 2016/03/03 15:24:43]

Ah, no, that code was no longer. You can disregard this then.

+        return scaledImageSize;
+    }
 
     WrappedImagePtr imagePtr() const override { return m_styleImage->data(); }
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     explicit LayoutImageResourceStyleImage(StyleImage*);
     RefPtrWillBeMember<StyleImage> m_styleImage;
 };
 
 } // namespace blink
 
 #endif // LayoutImageStyleImage_h