Changeset 123785 in webkit

Timestamp:

Jul 26, 2012, 1:10:26 PM (13 years ago)

Author:

mitz@apple.com

Message:

<svg> element with no intrinsic size and max-width gets sized incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=92410

Reviewed by Dean Jackson.

Source/WebCore:

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

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::computeReplacedLogicalWidth): The rule for computing the width for
elements whose computed width and height are both auto and which have no intrinsic size, but
have an intrinsic ratio was applied only to elements with a content renderer (such as <img>
with an SVG source). Removed the requirement to have a content renderer, so that it will
apply to all elements including <svg>.

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-26  Dan Bernstein  <mitz@apple.com>
+
+        <svg> element with no intrinsic size and max-width gets sized incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=92410
+
+        Reviewed by Dean Jackson.
+
+        * svg/css/max-width-2-expected.html: Added.
+        * svg/css/max-width-2.html: Added.
+
 2012-07-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-26  Dan Bernstein  <mitz@apple.com>
+
+        <svg> element with no intrinsic size and max-width gets sized incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=92410
+
+        Reviewed by Dean Jackson.
+
+        Test: svg/css/max-width-2.html
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::computeReplacedLogicalWidth): The rule for computing the width for
+        elements whose computed width and height are both auto and which have no intrinsic size, but
+        have an intrinsic ratio was applied only to elements with a content renderer (such as <img>
+        with an SVG source). Removed the requirement to have a content renderer, so that it will
+        apply to all elements including <svg>.
+
 2012-07-26  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -366 +366 @@
             // 'width' is undefined in CSS 2.1. However, it is suggested that, if the containing block's width does not itself depend on the replaced element's width, then
             // the used value of 'width' is calculated from the constraint equation used for block-level, non-replaced elements in normal flow.
-            if (heightIsAuto && !hasIntrinsicWidth && !hasIntrinsicHeight && contentRenderer) {
+            if (heightIsAuto && !hasIntrinsicWidth && !hasIntrinsicHeight) {
                 // The aforementioned 'constraint equation' used for block-level, non-replaced elements in normal flow:
                 // 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block