Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 68aaf42452030ce5042bf12836c825ba598c0c92..66dac912b4cdcc210885d4662071fc379a20f2d9 100644
--- a/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp
+++ b/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp
@@ -46,7 +46,7 @@ PassRefPtrWillBeRawPtr<CSSValue> StyleGeneratedImage::computedCSSValue() const
return m_imageGeneratorValue->valueWithURLsMadeAbsolute();
}
-LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, float multiplier) const
+LayoutSize StyleGeneratedImage::concreteObjectSize(const LayoutObject* layoutObject, const FloatSize& defaultObjectSize, float multiplier) const
{
if (m_fixedSize) {
LayoutSize fixedSize(m_imageGeneratorValue->fixedSize(layoutObject));
@@ -66,13 +66,13 @@ LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, floa
return LayoutSize(width, height);
}
- return LayoutSize();
+ return LayoutSize(defaultObjectSize);
}
void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutObject, FloatSize& intrinsicSize, FloatSize& intrinsicRatio)
{
// At a zoom level of 1 the image is guaranteed to have an integer size.
- LayoutSize size = imageSize(layoutObject, 1);
+ LayoutSize size = concreteObjectSize(layoutObject, FloatSize(300, 150), 1); // TODO: defaultConcreteObjectSize
ASSERT(size.fraction().isZero());
intrinsicSize = intrinsicRatio = FloatSize(size);
}
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleGeneratedImage.h ('k') | third_party/WebKit/Source/core/style/StyleImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698