Changeset 112399 in webkit

Timestamp:

Mar 28, 2012 8:00:42 AM (12 years ago)

Author:

yi.4.shen@nokia.com

Message:

An extra line break is inserted when pasting into a font element.
​https://bugs.webkit.org/show_bug.cgi?id=71207

Reviewed by Ryosuke Niwa.

Fix an editing bug where inserting text into a font element would
create an extra div element in the dom tree. The
WebCore::positionAvoidingPrecedingNodes() tries to set the correct
destination position by checking the next visible position, however,
it causes the position moves into the child element in somecase.
Instead, we should only check the position in parent after node.

Source/WebCore:

Test: editing/inserting/insert-text-into-font.html

• editing/ReplaceSelectionCommand.cpp:

(WebCore::positionAvoidingPrecedingNodes):

LayoutTests:

• editing/inserting/insert-text-into-font-expected.txt: Added.
• editing/inserting/insert-text-into-font.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/insert-text-into-font-expected.txt (added)
• LayoutTests/editing/inserting/insert-text-into-font.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/ReplaceSelectionCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-28  Yi Shen  <yi.4.shen@nokia.com>
+
+        An extra line break is inserted when pasting into a font element.
+        https://bugs.webkit.org/show_bug.cgi?id=71207
+
+        Reviewed by Ryosuke Niwa.
+
+        Fix an editing bug where inserting text into a font element would
+        create an extra div element in the dom tree. The
+        WebCore::positionAvoidingPrecedingNodes() tries to set the correct
+        destination position by checking the next visible position, however,
+        it causes the position moves into the child element in somecase.
+        Instead, we should only check the position in parent after node.
+
+        * editing/inserting/insert-text-into-font-expected.txt: Added.
+        * editing/inserting/insert-text-into-font.html: Added.
+
 2012-03-28  Mihai Balan  <mibalan@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-28  Yi Shen  <yi.4.shen@nokia.com>
+
+        An extra line break is inserted when pasting into a font element.
+        https://bugs.webkit.org/show_bug.cgi?id=71207
+
+        Reviewed by Ryosuke Niwa.
+
+        Fix an editing bug where inserting text into a font element would
+        create an extra div element in the dom tree. The
+        WebCore::positionAvoidingPrecedingNodes() tries to set the correct
+        destination position by checking the next visible position, however,
+        it causes the position moves into the child element in somecase.
+        Instead, we should only check the position in parent after node.
+
+        Test: editing/inserting/insert-text-into-font.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::positionAvoidingPrecedingNodes):
+
 2012-03-28  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -122 +122 @@
     //   <div>foo^</div>^
     // The two positions above are the same visual position, but we want to stay in the same block.
-    Node* stopNode = pos.deprecatedNode()->enclosingBlockFlowElement();
-    while (stopNode != pos.deprecatedNode() && VisiblePosition(pos) == VisiblePosition(pos.next()))
-        pos = pos.next();
+    Node* enclosingBlockNode = enclosingBlock(pos.containerNode());
+    for (Position nextPosition = pos; nextPosition.containerNode() != enclosingBlockNode; pos = nextPosition) {
+        if (pos.containerNode()->nonShadowBoundaryParentNode())
+            nextPosition = positionInParentAfterNode(pos.containerNode());
+        
+        if (nextPosition == pos 
+            || enclosingBlock(nextPosition.containerNode()) != enclosingBlockNode
+            || VisiblePosition(pos) != VisiblePosition(nextPosition))
+            break;
+    }
     return pos;
 }