Changeset 89145 in webkit

Timestamp:

Jun 17, 2011 11:01:00 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-17 Annie Sullivan <​sullivan@chromium.org>

Reviewed by Ryosuke Niwa.

div can be a child of span on InsertParagraph
​https://bugs.webkit.org/show_bug.cgi?id=62687

Update layout test results with new code to prevent div inside of span.

• editing/inserting/return-key-span-start-expected.txt: The new result is the correct behavior.
• editing/inserting/return-with-object-element-expected.txt: An extra space has been added before the newline.

2011-06-17 Annie Sullivan <​sullivan@chromium.org>

Reviewed by Ryosuke Niwa.

div can be a child of span on InsertParagraph
​https://bugs.webkit.org/show_bug.cgi?id=62687

Handle the special case where the insertion point is the first position in the enclosing block node.
The div for the new paragraph should be inserted as a child of the enclosing block node, otherwise
it could be inserted as a child of a span or other inline element.

• editing/InsertParagraphSeparatorCommand.cpp: (WebCore::InsertParagraphSeparatorCommand::doApply):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/return-key-span-start-expected.txt (modified) (1 diff)
• LayoutTests/editing/inserting/return-with-object-element-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-17  Annie Sullivan  <sullivan@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        div can be a child of span on InsertParagraph
+        https://bugs.webkit.org/show_bug.cgi?id=62687
+
+        Update layout test results with new code to prevent div inside of span.
+
+        * editing/inserting/return-key-span-start-expected.txt: The new result is the correct behavior.
+        * editing/inserting/return-with-object-element-expected.txt: An extra space has been added before the newline.
+
 2011-06-17  Yuta Kitamura  <yutak@chromium.org>
 

trunk/LayoutTests/editing/inserting/return-key-span-start-expected.txt

@@ -1 +1 @@
 This sets the selection to the start of a span, and hits the enter key.
 Expected behavior: when the span is split, its ID should not be duplicated. See bug 62621.
+| <div>
+|   <span>
+|     <br>
 | <span>
 |   id="dupe"
-|   <div>
-|     <span>
-|       <br>
 |   "<#selection-caret>hello"

trunk/LayoutTests/editing/inserting/return-with-object-element-expected.txt

@@ -1 +1 @@
 
-
+ 
 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-17  Annie Sullivan  <sullivan@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        div can be a child of span on InsertParagraph
+        https://bugs.webkit.org/show_bug.cgi?id=62687
+
+        Handle the special case where the insertion point is the first position in the enclosing block node.
+        The div for the new paragraph should be inserted as a child of the enclosing block node, otherwise
+        it could be inserted as a child of a span or other inline element.
+
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        (WebCore::InsertParagraphSeparatorCommand::doApply):
+
 2011-06-17  Eric Uhrhane  <ericu@chromium.org>
 

trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp

@@ -264 +264 @@
         if (isFirstInBlock && !nestNewBlock)
             refNode = startBlock;
+        else if (isFirstInBlock && nestNewBlock) {
+            // startBlock should always have children, otherwise isLastInBlock would be true and it's handled above.
+            ASSERT(startBlock->firstChild());
+            refNode = startBlock->firstChild();
+        }
         else if (insertionPosition.deprecatedNode() == startBlock && nestNewBlock) {
             refNode = startBlock->childNode(insertionPosition.deprecatedEditingOffset());