Changeset 151100 in webkit

Timestamp:

Jun 3, 2013 3:30:07 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL]<select> element's text is clipped when a height is specified along with CSS line-height.
​https://bugs.webkit.org/show_bug.cgi?id=114862

Patch by Rashmi Kulakarni <​rashmi.vijay@samsung.com> on 2013-06-03
Reviewed by Gyuyoung Kim.

Source/WebCore:

Fix <select> element getting clipped when element height becomes less than the line-height.
Set minimum height for <select> element.

No new tests, no behavior change.

• platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::adjustMenuListButtonStyle):

LayoutTests:

Rebaselined the test case fast/forms/001.html.

• platform/efl/fast/forms/001-expected.png:
• platform/efl/fast/forms/001-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/fast/forms/001-expected.png (modified) (previous)
• LayoutTests/platform/efl/fast/forms/001-expected.txt (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/efl/RenderThemeEfl.cpp (modified) (1 diff, 1 prop)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-06-03  Rashmi Kulakarni  <rashmi.vijay@samsung.com>
+
+        [EFL]<select> element's text is clipped when a height is specified along with CSS line-height.
+        https://bugs.webkit.org/show_bug.cgi?id=114862
+
+        Reviewed by Gyuyoung Kim.
+
+        Rebaselined the test case fast/forms/001.html.
+
+        * platform/efl/fast/forms/001-expected.png:
+        * platform/efl/fast/forms/001-expected.txt:
+
 2013-06-03  Charles Wei  <chwei@blackberry.com>
 

trunk/LayoutTests/platform/efl/fast/forms/001-expected.txt

@@ -7 +7 @@
         RenderText {#text} at (0,0) size 234x36
           text run at (0,0) width 234: "Min-Width Tests"
-      RenderTable {TABLE} at (0,58) size 784x27 [border: (2px outset #808080)]
-        RenderTableSection {TBODY} at (2,2) size 780x22
-          RenderTableRow {TR} at (0,0) size 780x22
-            RenderTableCell {TD} at (0,0) size 90x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderMenuList {SELECT} at (3,1) size 84x20 [bgcolor=#FFFFFF]
+      RenderTable {TABLE} at (0,58) size 784x45 [border: (2px outset #808080)]
+        RenderTableSection {TBODY} at (2,2) size 780x40
+          RenderTableRow {TR} at (0,0) size 780x40
+            RenderTableCell {TD} at (0,0) size 90x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderMenuList {SELECT} at (3,1) size 84x38 [bgcolor=#FFFFFF]
                 RenderBlock (anonymous) at (15,10) size 28x18
                   RenderText at (0,0) size 28x17
                     text run at (0,0) width 28: "Foo"
-            RenderTableCell {TD} at (90,10) size 690x2 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-      RenderBlock {P} at (0,100) size 784x25
+            RenderTableCell {TD} at (90,19) size 690x2 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+      RenderBlock {P} at (0,118) size 784x25
         RenderTable {TABLE} at (0,0) size 784x24 [border: (2px outset #808080)]
           RenderTableSection {TBODY} at (2,2) size 780x20
@@ -23 +23 @@
                 RenderBlock {INPUT} at (5,4) size 13x12
               RenderTableCell {TD} at (23,9) size 757x2 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-      RenderBlock {P} at (0,140) size 784x25
+      RenderBlock {P} at (0,158) size 784x25
         RenderTable {TABLE} at (0,0) size 784x24 [border: (2px outset #808080)]
           RenderTableSection {TBODY} at (2,2) size 780x20
@@ -30 +30 @@
                 RenderBlock {INPUT} at (5,4) size 13x12
               RenderTableCell {TD} at (23,9) size 757x2 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-      RenderBlock {P} at (0,180) size 784x51
+      RenderBlock {P} at (0,198) size 784x51
         RenderTable {TABLE} at (0,0) size 784x50 [border: (2px outset #808080)]
           RenderTableSection {TBODY} at (2,2) size 780x46
@@ -40 +40 @@
                       text run at (0,0) width 28: "Foo"
               RenderTableCell {TD} at (68,22) size 712x2 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-      RenderBlock {P} at (0,246) size 784x268
+      RenderBlock {P} at (0,264) size 784x268
         RenderTable {TABLE} at (0,0) size 784x91 [border: (2px outset #808080)]
           RenderTableSection {TBODY} at (2,2) size 780x87

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-03  Rashmi Kulakarni  <rashmi.vijay@samsung.com>
+
+        [EFL]<select> element's text is clipped when a height is specified along with CSS line-height.
+        https://bugs.webkit.org/show_bug.cgi?id=114862
+
+        Reviewed by Gyuyoung Kim.
+
+        Fix <select> element getting clipped when element height becomes less than the line-height.
+        Set minimum height for <select> element.
+
+        No new tests, no behavior change.
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::adjustMenuListButtonStyle):
+
 2013-06-03  Charles Wei  <charles.wei@torchmobile.com.cn>
 

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

@@ -867 +867 @@
 void RenderThemeEfl::adjustMenuListButtonStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
 {
+    // Height is locked to auto if height is not specified.
+    style->setHeight(Length(Auto));
+
+    // The <select> box must be at least 12px high for the button to render the text inside the box without clipping.
+    const int dropDownBoxMinHeight = 12;
+
+    // Calculate min-height of the <select> element.
+    int minHeight = style->fontMetrics().height();
+    minHeight = max(minHeight, dropDownBoxMinHeight);
+    style->setMinHeight(Length(minHeight, Fixed));
+
     adjustMenuListStyle(styleResolver, style, element);
 }