Changeset 201604 in webkit

Timestamp:

Jun 2, 2016, 11:40:02 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

SVG content renders in incorrect vertical position when padding-left is not specified
​https://bugs.webkit.org/show_bug.cgi?id=158234

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2016-06-02
Reviewed by Darin Adler.

Source/WebCore:

Fix the optimization in RenderSVGRoot::buildLocalToBorderBoxTransform().
Use LayoutSize::isZero() instead of LayoutSize::isEmpty() to decide whether
there is borderAndPadding applied or not.

Test: svg/custom/svg-root-padding-individual.html

• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::buildLocalToBorderBoxTransform):

LayoutTests:

Make sure the SVG root element is positioned correctly when either the sum
of its (leftPadding + rightPadding) or the sum of its (topPadding + bottomPadding)
is equal to zero.

• svg/custom/svg-root-padding-individual-expected.html: Added.
• svg/custom/svg-root-padding-individual.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/svg-root-padding-individual-expected.html (added)
• LayoutTests/svg/custom/svg-root-padding-individual.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGRoot.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        SVG content renders in incorrect vertical position when padding-left is not specified
+        https://bugs.webkit.org/show_bug.cgi?id=158234
+
+        Reviewed by Darin Adler.
+
+        Make sure the SVG root element is positioned correctly when either the sum
+        of its (leftPadding + rightPadding) or the sum of its (topPadding + bottomPadding)
+        is equal to zero.
+
+        * svg/custom/svg-root-padding-individual-expected.html: Added.
+        * svg/custom/svg-root-padding-individual.html: Added.
+
 2016-06-02  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        SVG content renders in incorrect vertical position when padding-left is not specified
+        https://bugs.webkit.org/show_bug.cgi?id=158234
+
+        Reviewed by Darin Adler.
+
+        Fix the optimization in RenderSVGRoot::buildLocalToBorderBoxTransform().
+        Use LayoutSize::isZero() instead of LayoutSize::isEmpty() to decide whether
+        there is borderAndPadding applied or not.
+
+        Test: svg/custom/svg-root-padding-individual.html
+
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::buildLocalToBorderBoxTransform):
+
 2016-06-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

@@ -332 +332 @@
     LayoutSize borderAndPadding(borderLeft() + paddingLeft(), borderTop() + paddingTop());
     m_localToBorderBoxTransform = svgSVGElement().viewBoxToViewTransform(contentWidth() / scale, contentHeight() / scale);
-    if (borderAndPadding.isEmpty() && scale == 1 && translate == SVGPoint::zero())
+    if (borderAndPadding.isZero() && scale == 1 && translate == SVGPoint::zero())
         return;
     m_localToBorderBoxTransform = AffineTransform(scale, 0, 0, scale, borderAndPadding.width() + translate.x(), borderAndPadding.height() + translate.y()) * m_localToBorderBoxTransform;