Changeset 85009 in webkit

Timestamp:

Apr 26, 2011 9:29:18 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-26 Dawit Alemayehu <​adawit@kde.org>

Reviewed by Andreas Kling.

Added qtwebkit layout test for the button line break fix (Bug 50521).

[Qt] Improper rendering of <button> tag when it contains a <br>
​https://bugs.webkit.org/show_bug.cgi?id=50521

• platform/qt/fast/forms/button-line-break-expected.txt: Added.
• platform/qt/fast/forms/button-line-break.html: Added.

2011-04-26 Dawit Alemayehu <​adawit@kde.org>

Reviewed by Andreas Kling.

[Qt] Improper rendering of <button> tag when it contains a <br>
​https://bugs.webkit.org/show_bug.cgi?id=50521

Test: platform/qt/fast/forms/button-line-break.html

• platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::computeSizeBasedOnStyle): (WebCore::RenderThemeQt::setButtonPadding):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/fast/forms/button-line-break-expected.txt (added)
• LayoutTests/platform/qt/fast/forms/button-line-break.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/qt/RenderThemeQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-26  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Andreas Kling.
+
+        Added qtwebkit layout test for the button line break fix (Bug 50521).
+
+        [Qt] Improper rendering of <button> tag when it contains a <br>
+        https://bugs.webkit.org/show_bug.cgi?id=50521
+
+        * platform/qt/fast/forms/button-line-break-expected.txt: Added.
+        * platform/qt/fast/forms/button-line-break.html: Added.
+
 2011-04-26  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-26  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Improper rendering of <button> tag when it contains a <br>
+        https://bugs.webkit.org/show_bug.cgi?id=50521
+
+        Test: platform/qt/fast/forms/button-line-break.html
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::computeSizeBasedOnStyle):
+        (WebCore::RenderThemeQt::setButtonPadding):
+
 2011-04-26  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

@@ -528 +528 @@
     // FIXME: Check is flawed, since it doesn't take min-width/max-width into account.
     if (renderStyle->width().isIntrinsicOrAuto() && size.width() > 0)
-        renderStyle->setWidth(Length(size.width(), Fixed));
+        renderStyle->setMinWidth(Length(size.width(), Fixed));
     if (renderStyle->height().isAuto() && size.height() > 0)
-        renderStyle->setHeight(Length(size.height(), Fixed));
+        renderStyle->setMinHeight(Length(size.height(), Fixed));
 }
 
@@ -608 +608 @@
     int paddingLeft = buttonMargin;
     int paddingRight = buttonMargin;
-    int paddingTop = 1;
-    int paddingBottom = 0;
+    int paddingTop = buttonMargin;
+    int paddingBottom = buttonMargin;
 
     // Then check if the style uses layout margins