[webkit-changes] [90379] trunk

tkent Mon, 04 Jul 2011 18:27:56 -0700

Title: [90379] trunk

Revision: 90379
Author: [email protected]
Date: 2011-07-04 18:27:45 -0700 (Mon, 04 Jul 2011)

Log Message

2011-07-04  Kent Tamura  <[email protected]>

        REGRESSION (r87067): Text overflows from short height text field.
        https://bugs.webkit.org/show_bug.cgi?id=61768

Reviewed by Dimitri Glazkov.

* fast/forms/textfield-overflow-by-value-update.html: Added.
* platform/chromium/test_expectations.txt: Add textfield-overflow-by-value-update.html.
* platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png: Added.
* platform/mac/fast/forms/textfield-overflow-by-value-update-expected.txt: Added.
2011-07-04 Kent Tamura <[email protected]>

REGRESSION (r87067): Text overflows from short height text field.
https://bugs.webkit.org/show_bug.cgi?id=61768

Reviewed by Dimitri Glazkov.

Since r87067, the RenderStyle for the inner text element is reset
by the value update, but the renderer for the inner text element
keeps to have metrics calculated by the previous style. So
RenderTextControlSingleLine::layout() didn't set a desired height
to the renderer for the inner text element.

This patch changes the style creation code so that it has the
desired height initially.

Test: fast/forms/textfield-overflow-by-value-update.html

* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::RenderTextControlSingleLine):
Initialize m_desiredInnerTextHeight.
(WebCore::RenderTextControlSingleLine::layout):
Update m_desiredInnerTextHeight.
(WebCore::RenderTextControlSingleLine::styleDidChange):
Reset m_desiredInnerTextHeight.
(WebCore::RenderTextControlSingleLine::createInnerTextStyle):
Sets the height if m_desiredInnerTextHeight has a concrete value.
* rendering/RenderTextControlSingleLine.h:
Declare m_desiredInnerTextHeight.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h

Added Paths

trunk/LayoutTests/fast/forms/textfield-overflow-by-value-update.html
trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png
trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.txt

Diff

Modified: trunk/LayoutTests/ChangeLog (90378 => 90379)


--- trunk/LayoutTests/ChangeLog	2011-07-05 01:11:41 UTC (rev 90378)
+++ trunk/LayoutTests/ChangeLog	2011-07-05 01:27:45 UTC (rev 90379)
@@ -1,3 +1,15 @@
+2011-07-04  Kent Tamura  <[email protected]>
+
+        REGRESSION (r87067): Text overflows from short height text field.
+        https://bugs.webkit.org/show_bug.cgi?id=61768
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/forms/textfield-overflow-by-value-update.html: Added.
+        * platform/chromium/test_expectations.txt: Add textfield-overflow-by-value-update.html.
+        * platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png: Added.
+        * platform/mac/fast/forms/textfield-overflow-by-value-update-expected.txt: Added.
+
 2011-07-04  MORITA Hajime  <[email protected]>
 
         Accessing ShadowRoot.nodeList causes an assertion failure.

Added: trunk/LayoutTests/fast/forms/textfield-overflow-by-value-update.html (0 => 90379)


--- trunk/LayoutTests/fast/forms/textfield-overflow-by-value-update.html	                        (rev 0)
+++ trunk/LayoutTests/fast/forms/textfield-overflow-by-value-update.html	2011-07-05 01:27:45 UTC (rev 90379)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<head>
+<script src=""
+<style>
+input {
+    -webkit-appearance: none;
+    font-size: 32px;
+    height: 0px;
+    width: 100px;
+    border-width: 0px;
+}
+</style>
+<body>
+<!-- The input value must not be shown outside the input border.
+     So, the test result should be just white. -->
+<input id="textfield">
+<script>
+$('textfield').offsetTop;
+$('textfield').value = "FAIL";
+</script>
+</body>

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (90378 => 90379)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-07-05 01:11:41 UTC (rev 90378)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-07-05 01:27:45 UTC (rev 90379)
@@ -3892,6 +3892,9 @@
 BUGWK62754 WIN LINUX : css2.1/20110323/replaced-elements-001.htm = IMAGE+TEXT
 BUGWK62754 WIN LINUX : css2.1/20110323/replaced-intrinsic-ratio-001.htm = IMAGE+TEXT
 
+// New test.
+BUGWK61768 : fast/forms/textfield-overflow-by-value-update.html = FAIL
+
 // Has been crashing since WebKit r88279-88297.
 BUGCR86239 MAC GPU : compositing/geometry/tall-page-composited.html = CRASH

Added: trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png (0 => 90379)


--- trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.png	2011-07-05 01:27:45 UTC (rev 90379)
@@ -0,0 +1,10 @@
+\x89PNG
+
+
+IHDR X\x9Av\x82p)tEXtchecksum853de00567d121bea0b7bece66a5d61c`7\xFF\xFB\xEEiCCPICC Profilex\x85T\xCFkA\xFE6n\xA9\xD0"Zk\xB2x\x90"IY\xABhE\xD46\xFDbk\xDB\xB6E\x90d3I\xD6n6\xEB\xEE&\xB5\xA5\x88\xE4\xE2\xD1*\xDEE\xED\xA1\xFF\x80z\xF0d/J\x85ZE(ޫ(b\xA1-\xF1\xCDnL\xB6\xA5\xEA\xC0\xCE~\xF3\xDE7\xEF}ov\xDF
+r\xD24\xF5\x80\xE4
+\xC7R\xA2il|Bj\xFC\x88\x8E\xA2	A4%U\xDB\xECN$A\x83s\xF9{\xE7\xD8z\x81[V\xC3{\xFBw\xB2w\xAD\x9AҶ\x9A\x84\xFD@\xE0G\x9A\xD9*\xB0\xEFq
+Y\x88<ߡ)\xC7t\xDF\xE3\xD8\xF2\xEC\x8F9Nyx\xC1\xB5+=\xC4Y"|@5-\xCEM\xB8S\xCD%\xD3@\x83H8\x94\xF5qR>\x9C׋\x94\xD7inf\xC6\xC8\xBDO\x90\xA6\xBB\xCC\xEE\xABb\xA1\x9CN\xF6\x90\xBD\x9D\xF4~N\xB3\xDE>\xC2!\xC2\xAD?F\xB8\x8D\x9E\xF5\x8C\xD5?\xE2a\xE1\xA4\xE6Ć=5\xF4\xF8`\xB7\xA9\xF85\xC2_M'\xA2Tq\xD9.
+\xF1\x98\xAE\xFDV\xF2J\x82p\x908\xCAda\x80sZHO\xD7Ln\xF8\xBA\x87}&\xD7\xAF\xE2wVQ\xE1y\x8Fg\xDE\xD4\xDD\xEFE\xDA\xAF0\x9A
+HPEa\x98\xB0P@\x86<14\xB2r?#\xAB\x93{2u$j\xBBtbD\xB1A{6\xDC=\xB7Q\xA4\xDD<\xFE("q\x94C\xB5\x92\xFCA\xFE*\xAF\xC9O\xE5y\xF9\xCB\\xB0\xD8V\x{1D4B5B}\x9A\xBA\xF2\xE0;\xC5噹\xD7\xD3\xC8\xE3sM^|\x95\xD4v\x93WG\x96\xACyz\xBC\x9A\xEC?\xECW\x971\xE6\x825\x8F\xC4s\xB0\xFB\xF1-_\x95̗)\x8C\xC5\xE3U\xF3\xEAK\x84uZ17ߟl;=\xE2.\xCF.\xB5\xD6s\xAD\x89\x8B7V\x9B\x97g\xFDjH\xFB\x93\xE6U\xF9O^\xF5\xF1\xFCg\xCD\xC4c\xE2)1&v\x8A\xE7!\x89\x97\xC5.\xF1\x92\xD8K\xAB\xE2`m\xC7\x9D\x95\x86)\xD2m\x91\xFA$\xD5``\x9A\xBC\xF5/]?[x\xBDF\xF5Q\x94\xCC\xD2T\x89\xF7\xC2*d4\x9D\xB9o\xFA\x8F\xDB\xC7\xFC\xE4\xF7\x8A\xE7\x9F(/l\xE0ș\xBAmSq\xEF\xA1e\xA5ns\xAE\xBF\xD1}\xF0\xB6nk\xA3~8\xFCX<\xAB\xADR5\x9F \xBCv\x87z\xE8)\x98Ӗ\x96\xCD9R\x87,\x9F\x93\xBA\xE9\xCAbR\xCCP\xDBCRR\xD7%\xD7eK\xB3\x99Ub\xE9vؙ\xD3n\xA19B\xF7ħJe\x93\xFA\xAF\xF1\xB0\xFD\xB0R\xF9\xF9\xACR\xD9~Nց\x97\xFAo\xC0\xBC\xFDE\xC0x\x8B\x89 IDATx\xEDױ
+ 1`\xFF\x9Db\x88\xAB\x9C^\xB2\xD2ܞw\xCB @\x80 @ 8\xC1\x86	 @\x80|\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2џ,\xA0IDAT @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\x81\xE9W\xACg̐IEND\xAEB`\x82
\ No newline at end of file

Added: trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.txt (0 => 90379)


--- trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/forms/textfield-overflow-by-value-update-expected.txt	2011-07-05 01:27:45 UTC (rev 90379)
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x34
+  RenderBlock {HTML} at (0,0) size 800x34
+    RenderBody {BODY} at (8,8) size 784x18
+      RenderTextControl {INPUT} at (0,12) size 102x2 [bgcolor=#FFFFFF]
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0

Modified: trunk/Source/WebCore/ChangeLog (90378 => 90379)


--- trunk/Source/WebCore/ChangeLog	2011-07-05 01:11:41 UTC (rev 90378)
+++ trunk/Source/WebCore/ChangeLog	2011-07-05 01:27:45 UTC (rev 90379)
@@ -1,3 +1,33 @@
+2011-07-04  Kent Tamura  <[email protected]>
+
+        REGRESSION (r87067): Text overflows from short height text field.
+        https://bugs.webkit.org/show_bug.cgi?id=61768
+
+        Reviewed by Dimitri Glazkov.
+
+        Since r87067, the RenderStyle for the inner text element is reset
+        by the value update, but the renderer for the inner text element
+        keeps to have metrics calculated by the previous style. So
+        RenderTextControlSingleLine::layout() didn't set a desired height
+        to the renderer for the inner text element.
+
+        This patch changes the style creation code so that it has the
+        desired height initially.
+
+        Test: fast/forms/textfield-overflow-by-value-update.html
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::RenderTextControlSingleLine):
+        Initialize m_desiredInnerTextHeight.
+        (WebCore::RenderTextControlSingleLine::layout):
+        Update m_desiredInnerTextHeight.
+        (WebCore::RenderTextControlSingleLine::styleDidChange):
+        Reset m_desiredInnerTextHeight.
+        (WebCore::RenderTextControlSingleLine::createInnerTextStyle):
+        Sets the height if m_desiredInnerTextHeight has a concrete value.
+        * rendering/RenderTextControlSingleLine.h:
+        Declare m_desiredInnerTextHeight.
+
 2011-07-04  MORITA Hajime  <[email protected]>
 
         Accessing ShadowRoot.nodeList causes an assertion failure.

Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (90378 => 90379)


--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2011-07-05 01:11:41 UTC (rev 90378)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2011-07-05 01:27:45 UTC (rev 90379)
@@ -73,6 +73,7 @@
     : RenderTextControl(node, placeholderVisible)
     , m_searchPopupIsVisible(false)
     , m_shouldDrawCapsLockIndicator(false)
+    , m_desiredInnerTextHeight(-1)
     , m_searchEventTimer(this, &RenderTextControlSingleLine::searchEventTimerFired)
     , m_searchPopup(0)
 {
@@ -292,6 +293,7 @@
         if (desiredHeight != currentHeight)
             relayoutChildren = true;
         innerTextRenderer->style()->setHeight(Length(desiredHeight, Fixed));
+        m_desiredInnerTextHeight = desiredHeight;
         if (innerBlockRenderer)
             innerBlockRenderer->style()->setHeight(Length(desiredHeight, Fixed));
     }
@@ -372,6 +374,7 @@
 
 void RenderTextControlSingleLine::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
+    m_desiredInnerTextHeight = -1;
     RenderTextControl::styleDidChange(diff, oldStyle);
 
     // We may have set the width and the height in the old style in layout().
@@ -545,6 +548,8 @@
     textBlockStyle->setOverflowX(OHIDDEN);
     textBlockStyle->setOverflowY(OHIDDEN);
 
+    if (m_desiredInnerTextHeight >= 0)
+        textBlockStyle->setHeight(Length(m_desiredInnerTextHeight, Fixed));
     // Do not allow line-height to be smaller than our default.
     if (textBlockStyle->fontMetrics().lineSpacing() > lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes))
         textBlockStyle->setLineHeight(Length(-100.0f, Percent));

Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h (90378 => 90379)


--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h	2011-07-05 01:11:41 UTC (rev 90378)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h	2011-07-05 01:27:45 UTC (rev 90379)
@@ -143,7 +143,7 @@
 
     bool m_searchPopupIsVisible;
     bool m_shouldDrawCapsLockIndicator;
-
+    LayoutUnit m_desiredInnerTextHeight;
     Timer<RenderTextControlSingleLine> m_searchEventTimer;
     RefPtr<SearchPopupMenu> m_searchPopup;
     Vector<String> m_recentSearches;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes