Changeset 128013 in webkit

Timestamp:

Sep 9, 2012 8:34:30 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Wrong rendering results for square-button-appearance.html
​https://bugs.webkit.org/show_bug.cgi?id=85493

Patch by KyungTae Kim <​ktf.kim@samsung.com> on 2012-09-09
Reviewed by Gyuyoung Kim.

Source/WebCore:

A square-button is an element that has '-webkit-appearance: square-button' style.

If it is a block element,
the RenderBlock::recomputeLogicalWidth recalculate the width from the padding values.

But the recalculated width became wrong because the RenderThemeEfl::adjustSizeConstraints
called from RenderThemeEfl::adjustButtonStyle adds padding values for a button.

So, the adjustSizeConstraints must not be called for a square-button(SquareButtonPart).

Test : fast/css/square-button-appearance.html

• platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::adjustButtonStyle): Call adjustSizeConstrains only for PushButtonPart and ButtonPart

LayoutTests:

Remove fast/css/square-button-appearance.html from TestExpectations because it became PASS.

• platform/efl/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/efl/RenderThemeEfl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-09  KyungTae Kim  <ktf.kim@samsung.com>
+
+        [EFL] Wrong rendering results for square-button-appearance.html
+        https://bugs.webkit.org/show_bug.cgi?id=85493
+
+        Reviewed by Gyuyoung Kim.
+
+        Remove fast/css/square-button-appearance.html from TestExpectations because it became PASS.
+
+        * platform/efl/TestExpectations:
+
 2012-09-09  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -625 +625 @@
 BUGWK85484 : fast/forms/textarea-scrolled-type.html = MISSING
 
-BUGWK85493 : fast/css/square-button-appearance.html = TEXT
-
 BUGWK73766 : css3/unicode-bidi-isolate-aharon-failing.html = IMAGE IMAGE+TEXT
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-09  KyungTae Kim  <ktf.kim@samsung.com>
+
+        [EFL] Wrong rendering results for square-button-appearance.html
+        https://bugs.webkit.org/show_bug.cgi?id=85493
+
+        Reviewed by Gyuyoung Kim.
+
+        A square-button is an element that has '-webkit-appearance: square-button' style.
+        
+        If it is a block element, 
+        the RenderBlock::recomputeLogicalWidth recalculate the width from the padding values.
+        
+        But the recalculated width became wrong because the RenderThemeEfl::adjustSizeConstraints 
+        called from RenderThemeEfl::adjustButtonStyle adds padding values for a button.
+
+        So, the adjustSizeConstraints must not be called for a square-button(SquareButtonPart).
+
+        Test : fast/css/square-button-appearance.html
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::adjustButtonStyle): Call adjustSizeConstrains only for PushButtonPart and ButtonPart
+
 2012-09-09  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

@@ -879 +879 @@
     }
 
-    adjustSizeConstraints(style, Button);
+    // adjustSizeConstrains can make SquareButtonPart's size wrong (by adjusting paddings), so call it only for PushButtonPart and ButtonPart
+    if (style->appearance() == PushButtonPart || style->appearance() == ButtonPart)
+        adjustSizeConstraints(style, Button);
 }