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

Unified Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGImage.cpp

Issue 2230963002: SVG Image intrinsic size should be used if css style size is 'auto' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 4 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/layout/svg/LayoutSVGImage.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGImage.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGImage.cpp
index 91867b267e3846e7871142f9b3e0af1f11131e9a..3d14a4dc6f61811bfd17dfd5bc3711cb26663c7d 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGImage.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGImage.cpp
@@ -66,11 +66,12 @@ void LayoutSVGImage::updateBoundingBox()
FloatRect oldBoundaries = m_objectBoundingBox;
SVGLengthContext lengthContext(element());
+ LayoutSize intrinsicSize = m_imageResource->imageSize(style()->effectiveZoom());
fs 2016/08/11 15:52:57 Probably needs to refine this a bit. (The end of)
Shanmuga Pandi 2016/08/16 10:24:57 Done.
m_objectBoundingBox = FloatRect(
lengthContext.valueForLength(styleRef().svgStyle().x(), styleRef(), SVGLengthMode::Width),
lengthContext.valueForLength(styleRef().svgStyle().y(), styleRef(), SVGLengthMode::Height),
- lengthContext.valueForLength(styleRef().width(), styleRef(), SVGLengthMode::Width),
- lengthContext.valueForLength(styleRef().height(), styleRef(), SVGLengthMode::Height));
+ styleRef().width().isAuto() ? intrinsicSize.width().toFloat() : lengthContext.valueForLength(styleRef().width(), styleRef(), SVGLengthMode::Width),
+ styleRef().height().isAuto() ? intrinsicSize.height().toFloat() : lengthContext.valueForLength(styleRef().height(), styleRef(), SVGLengthMode::Height));
m_needsBoundariesUpdate |= oldBoundaries != m_objectBoundingBox;
}

Powered by Google App Engine
This is Rietveld 408576698