Changeset 118074 in webkit

Timestamp:

May 22, 2012 3:52:34 PM (12 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r105513): CSS max-width is not applied to SVG element
​https://bugs.webkit.org/show_bug.cgi?id=87050

Reviewed by Darin Adler.

Source/WebCore:

Tests: svg/css/max-height.html

svg/css/max-width.html

• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::computeReplacedLogicalWidth): Changed to also call into the base
class implementation of this function if max-width was specified.
(WebCore::RenderSVGRoot::computeReplacedLogicalHeight): Changed to call into the bas class
implementation of this function if either height or max-height were specified.

LayoutTests:

• svg/css/max-height-expected.png: Added.
• svg/css/max-height-expected.txt: Added.
• svg/css/max-height.html: Added.
• svg/css/max-width-expected.png: Added.
• svg/css/max-width-expected.txt: Added.
• svg/css/max-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/css/max-height-expected.png (added)
• LayoutTests/svg/css/max-height-expected.txt (added)
• LayoutTests/svg/css/max-height.html (added)
• LayoutTests/svg/css/max-width-expected.png (added)
• LayoutTests/svg/css/max-width-expected.txt (added)
• LayoutTests/svg/css/max-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGRoot.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-22  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r105513): CSS max-width is not applied to SVG element
+        https://bugs.webkit.org/show_bug.cgi?id=87050
+
+        Reviewed by Darin Adler.
+
+        * svg/css/max-height-expected.png: Added.
+        * svg/css/max-height-expected.txt: Added.
+        * svg/css/max-height.html: Added.
+        * svg/css/max-width-expected.png: Added.
+        * svg/css/max-width-expected.txt: Added.
+        * svg/css/max-width.html: Added.
+
 2012-05-22  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-22  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r105513): CSS max-width is not applied to SVG element
+        https://bugs.webkit.org/show_bug.cgi?id=87050
+
+        Reviewed by Darin Adler.
+
+        Tests: svg/css/max-height.html
+               svg/css/max-width.html
+
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::computeReplacedLogicalWidth): Changed to also call into the base
+        class implementation of this function if max-width was specified.
+        (WebCore::RenderSVGRoot::computeReplacedLogicalHeight): Changed to call into the bas class
+        implementation of this function if either height or max-height were specified.
+
 2012-05-22  Kentaro Hara  <haraken@chromium.org>
 

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

@@ -168 +168 @@
         return m_containerSize.width();
 
-    if (style()->logicalWidth().isSpecified())
+    if (style()->logicalWidth().isSpecified() || style()->logicalMaxWidth().isSpecified())
         return RenderReplaced::computeReplacedLogicalWidth(includeMaxWidth);
 
@@ -188 +188 @@
         return m_containerSize.height();
 
-    if (hasReplacedLogicalHeight())
+    if (style()->logicalHeight().isSpecified() || style()->logicalMaxHeight().isSpecified())
         return RenderReplaced::computeReplacedLogicalHeight();