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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleImage.cpp

Issue 1912063004: Align image sizes for SVG with raster image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add NeedsManualRebaseline to tests Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/css/background-non-integer-viewbox-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/svg/css/background-non-integer-viewbox-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698