Changeset 108668 in webkit

Timestamp:

Feb 23, 2012 1:17:27 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r99076): WebKit pastes the trailing newline into a single-line text field
​https://bugs.webkit.org/show_bug.cgi?id=79305

Reviewed by Tony Chang.

Source/WebCore:

The bug was caused by ReplacementFragment::m_hasInterchangeNewlineAtEnd not reset even when
text field's beforeTextInserted event handler removed interchange new lines at the end.
Because the event handler is responsible for trimming new lines, we need to recompute the values
for m_hasInterchangeNewlineAt* after the event dispatch.

Test: editing/input/paste-text-ending-with-interchange-newline.html

• editing/ReplaceSelectionCommand.cpp:

(WebCore::ReplacementFragment::ReplacementFragment):

LayoutTests:

Add a regression test. Also make Markup.dump() dump the shadow DOM of the specififed node.

• editing/input/paste-text-ending-with-interchange-newline-expected.txt: Added.
• editing/input/paste-text-ending-with-interchange-newline.html: Added.
• resources/dump-as-markup.js:

(Markup._get):
(Markup._getShadowHostIfPossible):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/input/paste-text-ending-with-interchange-newline-expected.txt (added)
• LayoutTests/editing/input/paste-text-ending-with-interchange-newline.html (added)
• LayoutTests/resources/dump-as-markup.js (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/ReplaceSelectionCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r99076): WebKit pastes the trailing newline into a single-line text field
+        https://bugs.webkit.org/show_bug.cgi?id=79305
+
+        Reviewed by Tony Chang.
+
+        Add a regression test. Also make Markup.dump() dump the shadow DOM of the specififed node.
+
+        * editing/input/paste-text-ending-with-interchange-newline-expected.txt: Added.
+        * editing/input/paste-text-ending-with-interchange-newline.html: Added.
+        * resources/dump-as-markup.js:
+        (Markup._get):
+        (Markup._getShadowHostIfPossible):
+
 2012-02-23  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/resources/dump-as-markup.js

@@ -127 +127 @@
 Markup.get = function(node)
 {
+    var markup = Markup._getShadowHostIfPossible(node, 0);
+    if (markup)
+        return markup.substring(1);
+
     if (!node.firstChild)
         return '| ';
 
     // Don't print any markup for the root node.
-    var markup = '';
-    for (var i = 0, len = node.childNodes.length; i < len; i++) {
+    for (var i = 0, len = node.childNodes.length; i < len; i++)
         markup += Markup._get(node.childNodes[i], 0);
-    }
     return markup.substring(1);
 }
@@ -229 +231 @@
     }
 
-    if (!Markup._useHTML5libOutputFormat && node.nodeType == Node.ELEMENT_NODE && window.internals) {
-        var root = window.internals.shadowRoot(node);
-        if (root)
-            str += Markup._get(root, depth + 1);
-    }
+    str += Markup._getShadowHostIfPossible(node, depth);
     
     var selection = Markup._getSelectionMarker(node, i);
@@ -240 +238 @@
 
     return str;
+}
+
+Markup._getShadowHostIfPossible = function (node, depth)
+{
+    if (!Markup._useHTML5libOutputFormat && node.nodeType == Node.ELEMENT_NODE && window.internals) {
+        var root = window.internals.shadowRoot(node);
+        if (root)
+            return Markup._get(root, depth + 1);
+    }
+    return '';
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r99076): WebKit pastes the trailing newline into a single-line text field
+        https://bugs.webkit.org/show_bug.cgi?id=79305
+
+        Reviewed by Tony Chang.
+
+        The bug was caused by ReplacementFragment::m_hasInterchangeNewlineAtEnd not reset even when
+        text field's beforeTextInserted event handler removed interchange new lines at the end.
+        Because the event handler is responsible for trimming new lines, we need to recompute the values
+        for m_hasInterchangeNewlineAt* after the event dispatch.
+
+        Test: editing/input/paste-text-ending-with-interchange-newline.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplacementFragment::ReplacementFragment):
+
 2012-02-23  Andreas Kling  <awesomekling@apple.com>
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -294 +294 @@
 void ReplacementFragment::removeInterchangeNodes(Node* container)
 {
+    m_hasInterchangeNewlineAtStart = false;
+    m_hasInterchangeNewlineAtEnd = false;
+
     // Interchange newlines at the "start" of the incoming fragment must be
     // either the first node in the fragment or the first leaf in the fragment.