Changeset 121357 in webkit

Timestamp:

Jun 27, 2012 12:42:22 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION (Safari 5?): Pasting a line into textarea inserts two newlines
​https://bugs.webkit.org/show_bug.cgi?id=49288

Reviewed by Tony Chang.

Source/WebCore:

The bug was caused by positionAvoidingPrecedingNodes getting out of a block when the insertion point is at a line break.
It caused the subsequent code to be misinformed of the insertion position and ended up not pruning the extra line break.

Fixed the bug by checking this special case and bailing out so that we don't crawl out of the enclosing block.
It's similar to checks several lines below it.

Test: editing/pasteboard/copy-paste-pre-line-content.html

• editing/ReplaceSelectionCommand.cpp:

(WebCore::positionAvoidingPrecedingNodes):

LayoutTests:

Add a test regerssion test for copying & pasting a line in pre into textarea twice.

• editing/pasteboard/copy-paste-pre-line-content-expected.txt: Added.
• editing/pasteboard/copy-paste-pre-line-content.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/copy-paste-pre-line-content-expected.txt (added)
• LayoutTests/editing/pasteboard/copy-paste-pre-line-content.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/ReplaceSelectionCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (Safari 5?): Pasting a line into textarea inserts two newlines
+        https://bugs.webkit.org/show_bug.cgi?id=49288
+
+        Reviewed by Tony Chang.
+
+        Add a test regerssion test for copying & pasting a line in pre into textarea twice.
+
+        * editing/pasteboard/copy-paste-pre-line-content-expected.txt: Added.
+        * editing/pasteboard/copy-paste-pre-line-content.html: Added.
+
 2012-06-27  Alpha Lam  <hclam@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (Safari 5?): Pasting a line into textarea inserts two newlines
+        https://bugs.webkit.org/show_bug.cgi?id=49288
+
+        Reviewed by Tony Chang.
+
+        The bug was caused by positionAvoidingPrecedingNodes getting out of a block when the insertion point is at a line break.
+        It caused the subsequent code to be misinformed of the insertion position and ended up not pruning the extra line break.
+
+        Fixed the bug by checking this special case and bailing out so that we don't crawl out of the enclosing block.
+        It's similar to checks several lines below it.
+
+        Test: editing/pasteboard/copy-paste-pre-line-content.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::positionAvoidingPrecedingNodes):
+
 2012-06-27  Andrei Onea  <onea@adobe.com>
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -124 +124 @@
     Node* enclosingBlockNode = enclosingBlock(pos.containerNode());
     for (Position nextPosition = pos; nextPosition.containerNode() != enclosingBlockNode; pos = nextPosition) {
+        if (lineBreakExistsAtPosition(pos))
+            break;
+
         if (pos.containerNode()->nonShadowBoundaryParentNode())
             nextPosition = positionInParentAfterNode(pos.containerNode());