Changeset 125050 in webkit

Timestamp:

Aug 8, 2012, 10:46:50 AM (13 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r123171): <svg> element with intrinsic size and max-width gets sized incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=93388

Reviewed by Beth Dakin.

Source/WebCore:

Test: svg/css/max-width-3.html

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::computeAspectRatioInformationForRenderBox): Added code to set
m_intrinsicSize in the no-contentRenderer branch of this function so that the calls to
RenderBox::computeReplacedLogical{Height,Width} in the end use the right intrinsic size.
This is similar to what the contentRenderer branch of this function already does.

LayoutTests:

• svg/css/max-width-3-expected.html: Added.
• svg/css/max-width-3.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/css/max-width-3-expected.html (added)
• LayoutTests/svg/css/max-width-3.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-08  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r123171): <svg> element with intrinsic size and max-width gets sized incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=93388
+
+        Reviewed by Beth Dakin.
+
+        * svg/css/max-width-3-expected.html: Added.
+        * svg/css/max-width-3.html: Added.
+
 2012-08-08  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-08  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r123171): <svg> element with intrinsic size and max-width gets sized incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=93388
+
+        Reviewed by Beth Dakin.
+
+        Test: svg/css/max-width-3.html
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::computeAspectRatioInformationForRenderBox): Added code to set
+        m_intrinsicSize in the no-contentRenderer branch of this function so that the calls to
+        RenderBox::computeReplacedLogical{Height,Width} in the end use the right intrinsic size.
+        This is similar to what the contentRenderer branch of this function already does.
+
 2012-08-08  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -298 +298 @@
     } else {
         computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
-        if (intrinsicRatio)
+        if (intrinsicRatio) {
             ASSERT(!isPercentageIntrinsicSize);
+            if (!intrinsicSize.isEmpty())
+                m_intrinsicSize = isHorizontalWritingMode() ? flooredIntSize(intrinsicSize) : flooredIntSize(intrinsicSize).transposedSize(); // FIXME: This introduces precision errors. We should convert m_intrinsicSize to be a float.
+        }
     }