Chromium Code Reviews| 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 499333d9726638cd4369921d6064d036c5770b7e..14e00ed42319b1771015bb55164c63b7b733f37e 100644 |
| --- a/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp |
| +++ b/third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp |
| @@ -69,13 +69,12 @@ LayoutSize StyleGeneratedImage::imageSize(const LayoutObject* layoutObject, floa |
| return LayoutSize(); |
| } |
| -void StyleGeneratedImage::computeIntrinsicDimensions(const LayoutObject* layoutObject, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) |
| +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. |
| - IntSize size = flooredIntSize(imageSize(layoutObject, 1)); |
| - intrinsicWidth = Length(size.width(), Fixed); |
| - intrinsicHeight = Length(size.height(), Fixed); |
| - intrinsicRatio = FloatSize(size); |
| + LayoutSize size = imageSize(layoutObject, 1); |
| + ASSERT(size.width().fraction() == 0 && size.height().fraction() == 0); |
|
fs
2016/02/12 11:24:46
Nit: size.fraction().isZero()?
davve
2016/02/12 11:58:29
Yes, much nicer.
|
| + intrinsicSize = intrinsicRatio = FloatSize(size); |
| } |
| void StyleGeneratedImage::addClient(LayoutObject* layoutObject) |