Changeset 44375 in webkit

Timestamp:

Jun 2, 2009 5:19:22 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-06-02 Eric Seidel <​eric@webkit.org>

Reviewed by Maciej Stachowiak.

Insert*List on an stand-alone image in a content editable region ASSERTS
ASSERTION FAILED: isStartOfParagraph(startOfParagraphToMove)
​https://bugs.webkit.org/show_bug.cgi?id=19066

Attempt to fix this by noticing that we inserted the list inside
the selection which includes the image, and re-adjust the selection
to not include the list before trying to move the image into
the list item.

Test: editing/execCommand/list-wrapping-image-crash.html

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/list-wrapping-image-crash-expected.txt (added)
• LayoutTests/editing/execCommand/list-wrapping-image-crash.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/InsertListCommand.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-06-02  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        Insert*List on an stand-alone image in a content editable region ASSERTS
+        ASSERTION FAILED: isStartOfParagraph(startOfParagraphToMove)
+        https://bugs.webkit.org/show_bug.cgi?id=19066
+
+        * editing/execCommand/list-wrapping-image-crash-expected.txt: Added.
+        * editing/execCommand/list-wrapping-image-crash.html: Added.
+
 2009-06-02  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ -1 +1 @@
 2009-06-02  Eric Seidel  <eric@webkit.org>
 
+        Reviewed by Maciej Stachowiak.
+
+        Insert*List on an stand-alone image in a content editable region ASSERTS
+        ASSERTION FAILED: isStartOfParagraph(startOfParagraphToMove)
+        https://bugs.webkit.org/show_bug.cgi?id=19066
+
+        Attempt to fix this by noticing that we inserted the list inside
+        the selection which includes the image, and re-adjust the selection
+        to not include the list before trying to move the image into
+        the list item.
+        
+        Test: editing/execCommand/list-wrapping-image-crash.html
+
+        * editing/InsertListCommand.cpp:
+        (WebCore::InsertListCommand::doApply):
+
+2009-06-02  Eric Seidel  <eric@webkit.org>
+
         Reviewed by Darin Adler.
 
-        Rename PositionIterator members in hope of futher clarity
+        Rename PositionIterator members in hope of further clarity
         https://bugs.webkit.org/show_bug.cgi?id=24854
 

trunk/WebCore/editing/InsertListCommand.cpp

@@ -203 +203 @@
     if (!listChildNode || switchListType || m_forceCreateList) {
         // Create list.
-        VisiblePosition start = startOfParagraph(endingSelection().visibleStart());
+        VisiblePosition originalStart = endingSelection().visibleStart();
+        VisiblePosition start = startOfParagraph(originalStart);
         VisiblePosition end = endOfParagraph(endingSelection().visibleEnd());
         
@@ -252 +253 @@
             if (listChild && listChild->hasTagName(liTag))
                 insertionPos = positionBeforeNode(listChild);
-                
+
             insertNodeAt(listElement, insertionPos);
+
+            // We inserted the list at the start of the content we're about to move
+            // Update the start of content, so we don't try to move the list into itself.  bug 19066
+            if (insertionPos == start.deepEquivalent())
+                start = startOfParagraph(originalStart);
         }
         moveParagraph(start, end, VisiblePosition(Position(placeholder.get(), 0)), true);
         if (nextList && previousList)
-            mergeIdenticalElements(static_cast<Element*>(previousList), static_cast<Element*>(nextList));
+            mergeIdenticalElements(previousList, nextList);
     }
 }