Changeset 31081 in webkit

Timestamp:

Mar 16, 2008 1:17:54 PM (16 years ago)

Author:

Darin Adler

Message:

WebCore:

2008-03-16 Darin Adler <Darin Adler>

Reviewed by Mitz.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14941 <rdar://problem/5404093> textarea value from JavaScript includes extra newline

Test: fast/forms/textarea-trailing-newline.html

• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::finishText): Added code to strip the trailing newline. It's possible there are some obscure cases where this is not wanted, but I couldn't find any. If someone finds a case where this is bad, we can make the code conditional.

LayoutTests:

2008-03-16 Darin Adler <Darin Adler>

Reviewed by Mitz.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=14941 <rdar://problem/5404093> textarea value from JavaScript includes extra newline

• fast/forms/textarea-paste-newline.html: Updated test to expect correct behavior instead of expecting the bug.

• fast/forms/textarea-trailing-newline-expected.txt: Added.
• fast/forms/textarea-trailing-newline.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/textarea-paste-newline.html (modified) (1 diff)
• LayoutTests/fast/forms/textarea-trailing-newline-expected.txt (added)
• LayoutTests/fast/forms/textarea-trailing-newline.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTextControl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-16  Darin Adler  <darin@apple.com>
+
+        Reviewed by Mitz.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=14941
+          <rdar://problem/5404093> textarea value from JavaScript includes extra newline
+
+        * fast/forms/textarea-paste-newline.html: Updated test to expect correct behavior instead
+        of expecting the bug.
+
+        * fast/forms/textarea-trailing-newline-expected.txt: Added.
+        * fast/forms/textarea-trailing-newline.html: Added.
+
 2008-03-15  Darin Adler  <darin@apple.com>
 

trunk/LayoutTests/fast/forms/textarea-paste-newline.html

@@ -15 +15 @@
     var result2 = ta.value;
 
-    if (result1 == "abc\n\n" && result2 == "abc\nabc\n\n")
+    if (result1 == "abc\n" && result2 == "abc\nabc\n")
         document.write("<p>Hooray, the test was successful!</p>");
     else if (result1 == "")
         document.write("<p>The test failed; doesn't work in release builds of Safari because paste is not allowed.</p>");
     else
-        document.write("<p>The test failed, result 1 was '" + result1.replace("\n", "\\n") + "' and result 2 was '" + result2.replace("\n", "\\n") + "'. This test demonstrates a bug (5299425): the final '\\n' in a textarea is reported by .value even if it is collapsed.</p>");
+        document.write("<p>The test failed, result 1 was '" + result1.replace("\n", "\\n") + "' and result 2 was '" + result2.replace("\n", "\\n") + "'.</p>");
 }
 </script>

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-16  Darin Adler  <darin@apple.com>
+
+        Reviewed by Mitz.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14941
+          <rdar://problem/5404093> textarea value from JavaScript includes extra newline
+
+        Test: fast/forms/textarea-trailing-newline.html
+
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::finishText): Added code to strip the trailing
+        newline. It's possible there are some obscure cases where this is not wanted,
+        but I couldn't find any. If someone finds a case where this is bad, we can
+        make the code conditional.
+
 2008-03-16  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -556 +556 @@
 String RenderTextControl::finishText(Vector<UChar>& result) const
 {
+    // Remove one trailing newline; there's always one that's collapsed out by rendering.
+    size_t size = result.size();
+    if (size && result[size - 1] == '\n')
+        result.shrink(--size);
+
+    // Convert backslash to currency symbol.
     UChar symbol = backslashAsCurrencySymbol();
     if (symbol != '\\') {
-        size_t size = result.size();
-        for (size_t i = 0; i < size; ++i)
+        for (size_t i = 0; i < size; ++i) {
             if (result[i] == '\\')
                 result[i] = symbol;
+        }
     }