OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/style/StyleImage.h" | 5 #include "core/style/StyleImage.h" |
6 | 6 |
7 #include "core/svg/graphics/SVGImage.h" | 7 #include "core/svg/graphics/SVGImage.h" |
8 #include "core/svg/graphics/SVGImageForContainer.h" | 8 #include "core/svg/graphics/SVGImageForContainer.h" |
9 | 9 |
10 namespace blink { | 10 namespace blink { |
(...skipping 13 matching lines...) Expand all Loading... |
24 if (size.height() > LayoutUnit()) | 24 if (size.height() > LayoutUnit()) |
25 height = std::max(LayoutUnit(1), height); | 25 height = std::max(LayoutUnit(1), height); |
26 | 26 |
27 return LayoutSize(width, height); | 27 return LayoutSize(width, height); |
28 } | 28 } |
29 | 29 |
30 LayoutSize StyleImage::imageSizeForSVGImage(SVGImage* svgImage, float multiplier
, const LayoutSize& defaultObjectSize) const | 30 LayoutSize StyleImage::imageSizeForSVGImage(SVGImage* svgImage, float multiplier
, const LayoutSize& defaultObjectSize) const |
31 { | 31 { |
32 FloatSize unzoomedDefaultObjectSize(defaultObjectSize); | 32 FloatSize unzoomedDefaultObjectSize(defaultObjectSize); |
33 unzoomedDefaultObjectSize.scale(1 / multiplier); | 33 unzoomedDefaultObjectSize.scale(1 / multiplier); |
34 return applyZoom(LayoutSize(svgImage->concreteObjectSize(svgImage->concreteO
bjectSize(unzoomedDefaultObjectSize))), multiplier); | 34 LayoutSize imageSize(roundedIntSize(svgImage->concreteObjectSize(unzoomedDef
aultObjectSize))); |
| 35 return applyZoom(imageSize, multiplier); |
35 } | 36 } |
36 | 37 |
37 } // namespace blink | 38 } // namespace blink |
OLD | NEW |