Title: [144213] trunk
Revision
144213
Author
[email protected]
Date
2013-02-27 10:43:52 -0800 (Wed, 27 Feb 2013)

Log Message

REGRESSION(r124739): fast/lists/list-marker-remove-crash.html hits an assertion in MoveParagraphs
https://bugs.webkit.org/show_bug.cgi?id=93247

Reviewed by Darin Adler.

Source/WebCore:

The listifyParagraph function inside InsertListCommand triggered a layout for the new list and updated
only the "start" Position. The insertion and layout may have changed the "end" Position as well. The patch
makes sure "end" is also recomputed.

Test: No new test, the patch fixes a regression.

* editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::listifyParagraph):

LayoutTests:

Update TestExpectations because the test doesn't crash any more.

* platform/chromium/TestExpectations:
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/mac/TestExpectations:
* platform/qt-4.8/TestExpectations:
* platform/qt-mac/TestExpectations:
* platform/qt/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (144212 => 144213)


--- trunk/LayoutTests/ChangeLog	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/ChangeLog	2013-02-27 18:43:52 UTC (rev 144213)
@@ -1,3 +1,20 @@
+2013-02-27  Andrei Bucur  <[email protected]>
+
+        REGRESSION(r124739): fast/lists/list-marker-remove-crash.html hits an assertion in MoveParagraphs
+        https://bugs.webkit.org/show_bug.cgi?id=93247
+
+        Reviewed by Darin Adler.
+
+        Update TestExpectations because the test doesn't crash any more.
+
+        * platform/chromium/TestExpectations:
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/qt-4.8/TestExpectations:
+        * platform/qt-mac/TestExpectations:
+        * platform/qt/TestExpectations:
+
 2013-02-27  Aaron Colwell  <[email protected]>
 
         Fix SourceBufferList so SourceBuffer.append() calls are always rejected after the MediaSource is closed.

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (144212 => 144213)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2013-02-27 18:43:52 UTC (rev 144213)
@@ -3741,8 +3741,6 @@
 webkit.org/b/85856 scrollbars/rtl/div-horizontal.html [ Failure ]
 webkit.org/b/85856 platform/chromium/virtual/gpu/compositedscrolling/scrollbars/rtl/div-horizontal.html [ Failure ]
 
-webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
-
 webkit.org/b/93565 [ Debug ] fast/dom/Document/document-reopen.html [ Failure Pass ]
 webkit.org/b/93566 [ Debug ] fast/parser/iframe-sets-parent-to-_javascript_-url.html [ Failure Pass ]
 webkit.org/b/93567 [ Debug ] fast/parser/_javascript_-url-compat-mode.html [ Failure Pass ]

Modified: trunk/LayoutTests/platform/efl/TestExpectations (144212 => 144213)


--- trunk/LayoutTests/platform/efl/TestExpectations	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/platform/efl/TestExpectations	2013-02-27 18:43:52 UTC (rev 144213)
@@ -1495,8 +1495,6 @@
 
 webkit.org/b/93976 fast/css-generated-content/quotes-lang.html [ ImageOnlyFailure ]
 
-webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
-
 # This has always failed on Gtk/Efl - exposed by bug 89826
 webkit.org/b/94009 css2.1/20110323/c541-word-sp-000.htm [ ImageOnlyFailure ]
 

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (144212 => 144213)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2013-02-27 18:43:52 UTC (rev 144213)
@@ -440,8 +440,6 @@
 
 webkit.org/b/86176 [ Debug ] ietestcenter/css3/valuesandunits/units-000.htm [ Crash ]
 
-webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
-
 webkit.org/b/93812 [ Debug ] svg/custom/use-instanceRoot-as-event-target.xhtml [ Crash Pass ]
 
 webkit.org/b/90957 [ Release ] fast/js/random-array-gc-stress.html [ Crash Pass ]

Modified: trunk/LayoutTests/platform/mac/TestExpectations (144212 => 144213)


--- trunk/LayoutTests/platform/mac/TestExpectations	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2013-02-27 18:43:52 UTC (rev 144213)
@@ -1255,8 +1255,6 @@
 # Needs a rebaseline after WK108429 lands.
 webkit.org/b/108429 svg/custom/text-ctm.svg [ Pass Failure ]
 
-webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
-
 # (r125790): Newly added test inspector/timeline/timeline-decode-resize.html is failing on mac
 webkit.org/b/94374 inspector/timeline/timeline-decode-resize.html [ Failure ]
 

Modified: trunk/LayoutTests/platform/qt/TestExpectations (144212 => 144213)


--- trunk/LayoutTests/platform/qt/TestExpectations	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/platform/qt/TestExpectations	2013-02-27 18:43:52 UTC (rev 144213)
@@ -2492,8 +2492,6 @@
 
 webkit.org/b/99756 fast/events/touch/touch-slider.html [ Failure ]
 
-webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
-
 # This has always failed on Qt - exposed by bug 89826
 webkit.org/b/94004 css2.1/20110323/c541-word-sp-000.htm [ ImageOnlyFailure ]
 

Modified: trunk/LayoutTests/platform/qt-4.8/TestExpectations (144212 => 144213)


--- trunk/LayoutTests/platform/qt-4.8/TestExpectations	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/platform/qt-4.8/TestExpectations	2013-02-27 18:43:52 UTC (rev 144213)
@@ -748,8 +748,6 @@
 # Require rebaseline after bug 93148
 webkit.org/b/93148 fast/css/nested-layers-with-hover.html [ Failure ]
 
-webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
-
 webkit.org/b/93654 [ Debug ] fast/events/keyevent-iframe-removed-crash.html [ Crash ]
 
 # This has always failed on Qt - exposed by bug 89826

Modified: trunk/LayoutTests/platform/qt-mac/TestExpectations (144212 => 144213)


--- trunk/LayoutTests/platform/qt-mac/TestExpectations	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/LayoutTests/platform/qt-mac/TestExpectations	2013-02-27 18:43:52 UTC (rev 144213)
@@ -5847,8 +5847,6 @@
 webkit.org/b/93148 tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html [ Failure ]
 webkit.org/b/93148 fast/css/nested-layers-with-hover.html [ Failure ]
 
-webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]
-
 webkit.org/b/93654 [ Debug ] fast/events/keyevent-iframe-removed-crash.html [ Crash ]
 
 # Require rebaselining after  https://bugs.webkit.org/show_bug.cgi?id=89826

Modified: trunk/Source/WebCore/ChangeLog (144212 => 144213)


--- trunk/Source/WebCore/ChangeLog	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/Source/WebCore/ChangeLog	2013-02-27 18:43:52 UTC (rev 144213)
@@ -1,3 +1,19 @@
+2013-02-27  Andrei Bucur  <[email protected]>
+
+        REGRESSION(r124739): fast/lists/list-marker-remove-crash.html hits an assertion in MoveParagraphs
+        https://bugs.webkit.org/show_bug.cgi?id=93247
+
+        Reviewed by Darin Adler.
+
+        The listifyParagraph function inside InsertListCommand triggered a layout for the new list and updated
+        only the "start" Position. The insertion and layout may have changed the "end" Position as well. The patch
+        makes sure "end" is also recomputed.
+
+        Test: No new test, the patch fixes a regression.
+
+        * editing/InsertListCommand.cpp:
+        (WebCore::InsertListCommand::listifyParagraph):
+
 2013-02-27  Zach Kuznia  <[email protected]>
 
         Add ENABLE_STREAM guards to FileReaderLoader

Modified: trunk/Source/WebCore/editing/InsertListCommand.cpp (144212 => 144213)


--- trunk/Source/WebCore/editing/InsertListCommand.cpp	2013-02-27 18:38:44 UTC (rev 144212)
+++ trunk/Source/WebCore/editing/InsertListCommand.cpp	2013-02-27 18:43:52 UTC (rev 144213)
@@ -376,9 +376,11 @@
         // 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
         // Layout is necessary since start's node's inline renderers may have been destroyed by the insertion
+        // The end of the content may have changed after the insertion and layout so update it as well.
         if (insertionPos == start.deepEquivalent()) {
             listElement->document()->updateLayoutIgnorePendingStylesheets();
             start = startOfParagraph(originalStart, CanSkipOverEditingBoundary);
+            end = endOfParagraph(start, CanSkipOverEditingBoundary);
         }
     }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to