Title: [111947] releases/WebKitGTK/webkit-1.8

Diff

Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (111946 => 111947)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog	2012-03-24 00:54:04 UTC (rev 111946)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog	2012-03-24 00:54:19 UTC (rev 111947)
@@ -1,5 +1,17 @@
 2012-03-23  Kent Tamura  <[email protected]>
 
+        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-23  Kent Tamura  <[email protected]>
+
         REGRESSION(r106388): Form state is restored to a wrong document.
         https://bugs.webkit.org/show_bug.cgi?id=79206
 

Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text-expected.html (0 => 111947)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text-expected.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text-expected.html	2012-03-24 00:54:19 UTC (rev 111947)
@@ -0,0 +1,11 @@
+<!DOCTYPE>
+<body>
+<style>
+#testField {
+    width: 200px;
+    height: 30px;
+    -webkit-appearance: none;
+}
+</style>
+<input type="search" id="testField" value="Shaking!">
+</body>
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text-expected.html
___________________________________________________________________

Added: svn:eol-style

Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text.html (0 => 111947)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text.html	2012-03-24 00:54:19 UTC (rev 111947)
@@ -0,0 +1,23 @@
+<!DOCTYPE>
+<body _onload_="startTest()">
+<style>
+#testField {
+    width: 100px;
+    height: 30px;
+    -webkit-appearance: none;
+}
+</style>
+<input type="search" id="testField" value="Shaking!">
+
+<script>
+function startTest() {
+    document.getElementById('testField').offsetTop;
+    document.getElementById('testField').style.width = '200px';
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+}
+
+if (window.layoutTestController)
+    layoutTestController.waitUntilDone();
+</script>
+</body>
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/forms/search/search-shaking-text.html
___________________________________________________________________

Added: svn:eol-style

Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/platform/chromium/test_expectations.txt (111946 => 111947)


--- releases/WebKitGTK/webkit-1.8/LayoutTests/platform/chromium/test_expectations.txt	2012-03-24 00:54:04 UTC (rev 111946)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/platform/chromium/test_expectations.txt	2012-03-24 00:54:19 UTC (rev 111947)
@@ -4194,6 +4194,8 @@
 // Started failing http://trac.webkit.org/log/?verbose=on&rev=107837&stop_rev=107836
 BUGWK78755 : compositing/culling/scrolled-within-boxshadow.html = IMAGE
 
+BUGWK79445 LINUX WIN : fast/repaint/search-field-cancel.html = FAIL
+
 // Need rebaselining.
 BUGWK69210 MAC : fast/encoding/utf-16-big-endian.html = IMAGE+TEXT
 BUGWK69210 MAC : fast/encoding/utf-16-little-endian.html = IMAGE+TEXT

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (111946 => 111947)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-03-24 00:54:04 UTC (rev 111946)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog	2012-03-24 00:54:19 UTC (rev 111947)
@@ -1,5 +1,29 @@
 2012-03-23  Kent Tamura  <[email protected]>
 
+        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-23  Kent Tamura  <[email protected]>
+
         REGRESSION(r106388): Form state is restored to a wrong document.
         https://bugs.webkit.org/show_bug.cgi?id=79206
 

Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (111946 => 111947)


--- releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2012-03-24 00:54:04 UTC (rev 111946)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2012-03-24 00:54:19 UTC (rev 111947)
@@ -250,7 +250,8 @@
         } else if (containerRenderer->height() < contentHeight()) {
             containerRenderer->style()->setHeight(Length(contentHeight(), Fixed));
             relayoutChildren = true;
-        }
+        } else
+            containerRenderer->style()->setHeight(Length(containerHeight, Fixed));
     }
 
     RenderBlock::layoutBlock(relayoutChildren);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to