Changeset 55705 in webkit

Timestamp:

Mar 8, 2010 8:32:08 PM (14 years ago)

Author:

tony@chromium.org

Message:

2010-03-08 Tony Chang <​tony@chromium.org>

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=32131
Work around a crash when inserting an ordered list. This was caused
by incorrect logic when trying to restore a range from a location.
We compute the offset using TextIterator, but were sometimes using
VisiblePosition::next() to iterate instead.

• editing/execCommand/insert-ordered-list-expected.txt: Added.
• editing/execCommand/insert-ordered-list.html: Added.

2010-03-08 Tony Chang <​tony@chromium.org>

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=32131
Crash when inserting an ordered list.

Test: editing/execCommand/insert-ordered-list.html

• editing/CompositeEditCommand.cpp: (WebCore::CompositeEditCommand::moveParagraphs):
• editing/TextIterator.cpp: (WebCore::TextIterator::rangeFromLocationAndLength):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/insert-ordered-list-expected.txt (added)
• LayoutTests/editing/execCommand/insert-ordered-list.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/CompositeEditCommand.cpp (modified) (2 diffs)
• WebCore/editing/TextIterator.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-08  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32131
+        Work around a crash when inserting an ordered list.  This was caused
+        by incorrect logic when trying to restore a range from a location.
+        We compute the offset using TextIterator, but were sometimes using
+        VisiblePosition::next() to iterate instead.
+
+        * editing/execCommand/insert-ordered-list-expected.txt: Added.
+        * editing/execCommand/insert-ordered-list.html: Added.
+
 2010-03-08  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-08  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32131
+        Crash when inserting an ordered list.
+
+        Test: editing/execCommand/insert-ordered-list.html
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::moveParagraphs):
+        * editing/TextIterator.cpp:
+        (WebCore::TextIterator::rangeFromLocationAndLength):
+
 2010-03-08  Darin Adler  <darin@apple.com>
 

trunk/WebCore/editing/CompositeEditCommand.cpp

@@ -951 +951 @@
 
     cleanupAfterDeletion();
+    ASSERT(destination.deepEquivalent().node()->inDocument());
 
     // Add a br if pruning an empty block level element caused a collapse. For example:
@@ -972 +973 @@
     
     setEndingSelection(destination);
+    ASSERT(endingSelection().isCaretOrRange());
     applyCommandToComposite(ReplaceSelectionCommand::create(document(), fragment, true, false, !preserveStyle, false, true));
     

trunk/WebCore/editing/TextIterator.cpp

@@ -2038 +2038 @@
         // Fix textRunRange->endPosition(), but only if foundStart || foundEnd, because it is only
         // in those cases that textRunRange is used.
-        if (foundStart || foundEnd) {
+        if (foundEnd) {
             // FIXME: This is a workaround for the fact that the end of a run is often at the wrong
             // position for emitted '\n's.
             if (len == 1 && it.characters()[0] == '\n') {
-                Position runStart = textRunRange->startPosition();
-                Position runEnd = VisiblePosition(runStart).next().deepEquivalent();
-                if (runEnd.isNotNull()) {
+                scope->document()->updateLayoutIgnorePendingStylesheets();
+                it.advance();
+                if (!it.atEnd()) {
+                    RefPtr<Range> range = it.range();
                     ExceptionCode ec = 0;
-                    textRunRange->setEnd(runEnd.node(), runEnd.deprecatedEditingOffset(), ec);
+                    textRunRange->setEnd(range->startContainer(), range->startOffset(), ec);
                     ASSERT(!ec);
+                } else {
+                    Position runStart = textRunRange->startPosition();
+                    Position runEnd = VisiblePosition(runStart).next().deepEquivalent();
+                    if (runEnd.isNotNull()) {
+                        ExceptionCode ec = 0;
+                        textRunRange->setEnd(runEnd.node(), runEnd.deprecatedEditingOffset(), ec);
+                        ASSERT(!ec);
+                    }
                 }
             }