| Index: third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp b/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp
|
| index 690698217d05a56dab409131204a665914da7c81..7e2eed1c9b2108ab0d1529d39ac2f083d9679d0b 100644
|
| --- a/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp
|
| +++ b/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp
|
| @@ -67,7 +67,7 @@ LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, floa
|
| return LayoutSize(width, height);
|
| }
|
|
|
| - return LayoutSize(m_containerSize);
|
| + return LayoutSize(); // TODO(davve): Is an empty size the best choice?
|
| }
|
|
|
| void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutObject, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
|
| @@ -89,9 +89,9 @@ void StyleGeneratedImage::removeClient(LayoutObject* layoutObject)
|
| m_imageGeneratorValue->removeClient(layoutObject);
|
| }
|
|
|
| -PassRefPtr<Image> StyleGeneratedImage::image(const LayoutObject* layoutObject, const IntSize& size) const
|
| +PassRefPtr<Image> StyleGeneratedImage::image(const LayoutObject* layoutObject, const IntSize& containerSize, float, const KURL&) const
|
| {
|
| - return m_imageGeneratorValue->image(layoutObject, size);
|
| + return m_imageGeneratorValue->image(layoutObject, containerSize);
|
| }
|
|
|
| bool StyleGeneratedImage::knownToBeOpaque(const LayoutObject* layoutObject) const
|
|
|