Changeset 109503 in webkit

Timestamp:

Mar 1, 2012 9:43:01 PM (12 years ago)

Author:

tkent@chromium.org

Message:

REGRESSION(90089): Input type='search' text shakes up and down when the style is changed.
​https://bugs.webkit.org/show_bug.cgi?id=79445

Reviewed by Dimitri Glazkov.

Source/WebCore:

If the inner text height of a search field is smaller than the
content box height of the <input>, the height of the container
element should be same as the content box height.

When the element style is changed, the RenderStyle height of the
container element is cleared, but the renderer height of the
container element remains. We had a bug that layout() didn't set
the RenderStyle height in a case that the renderer height was the
desired height. It shrunk the renderer height as the result of
layout for children.

Tests: fast/forms/search/search-shaking-text.html

• rendering/RenderTextControlSingleLine.cpp:

(WebCore::RenderTextControlSingleLine::layout):
Always set the RenderStyle height explicitly.

LayoutTests:

• fast/forms/search/search-shaking-text-expected.html: Added.
• fast/forms/search/search-shaking-text.html: Added.
• platform/chromium/test_expectations.txt: This change might need a rebaseline of fast/repaint/search-field-cancel.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/search (added)
• LayoutTests/fast/forms/search/search-shaking-text-expected.html (added)
• LayoutTests/fast/forms/search/search-shaking-text.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-01  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(90089): Input type='search' text shakes up and down when the style is changed.
+        https://bugs.webkit.org/show_bug.cgi?id=79445
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/forms/search/search-shaking-text-expected.html: Added.
+        * fast/forms/search/search-shaking-text.html: Added.
+        * platform/chromium/test_expectations.txt:
+         This change might need a rebaseline of fast/repaint/search-field-cancel.html
+
 2012-03-01  Kentaro Hara  <haraken@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -4261 +4261 @@
 BUGWK78902 : svg/zoom/page/zoom-mask-with-percentages.svg = TEXT IMAGE IMAGE+TEXT PASS
 
+BUGWK79445 LINUX WIN : fast/repaint/search-field-cancel.html = FAIL
+
 // Need rebaselining.
 BUGWK69210 MAC : fast/encoding/utf-16-big-endian.html = IMAGE+TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-01  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(90089): Input type='search' text shakes up and down when the style is changed.
+        https://bugs.webkit.org/show_bug.cgi?id=79445
+
+        Reviewed by Dimitri Glazkov.
+
+        If the inner text height of a search field is smaller than the
+        content box height of the <input>, the height of the container
+        element should be same as the content box height.
+
+        When the element style is changed, the RenderStyle height of the
+        container element is cleared, but the renderer height of the
+        container element remains. We had a bug that layout() didn't set
+        the RenderStyle height in a case that the renderer height was the
+        desired height. It shrunk the renderer height as the result of
+        layout for children.
+
+        Tests: fast/forms/search/search-shaking-text.html
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::layout):
+        Always set the RenderStyle height explicitly.
+
 2012-03-01  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -251 +251 @@
             containerRenderer->style()->setHeight(Length(contentHeight(), Fixed));
             relayoutChildren = true;
-        }
+        } else
+            containerRenderer->style()->setHeight(Length(containerHeight, Fixed));
     }