[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
rniwa at webkit.org
rniwa at webkit.org
Wed Dec 22 17:51:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3cfcc8721bb9f609af405dea92b04a3efa00c1b3
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 19:39:04 2010 +0000
2010-12-01 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r73047.
http://trac.webkit.org/changeset/73047
https://bugs.webkit.org/show_bug.cgi?id=50339
missing bug number (Requested by rniwa on #webkit).
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
* editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::doApply):
2010-12-01 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r73047.
http://trac.webkit.org/changeset/73047
https://bugs.webkit.org/show_bug.cgi?id=50339
missing bug number (Requested by rniwa on #webkit).
* editing/execCommand/switch-multiple-list-items-crash-expected.txt: Removed.
* editing/execCommand/switch-multiple-list-items-crash.html: Removed.
* editing/execCommand/switch-multiple-list-items-expected.txt: Removed.
* editing/execCommand/switch-multiple-list-items.html: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73049 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bfd726f..f2187e9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-01 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r73047.
+ http://trac.webkit.org/changeset/73047
+ https://bugs.webkit.org/show_bug.cgi?id=50339
+
+ missing bug number (Requested by rniwa on #webkit).
+
+ * editing/execCommand/switch-multiple-list-items-crash-expected.txt: Removed.
+ * editing/execCommand/switch-multiple-list-items-crash.html: Removed.
+ * editing/execCommand/switch-multiple-list-items-expected.txt: Removed.
+ * editing/execCommand/switch-multiple-list-items.html: Removed.
+
2010-12-01 Brian Weinstein <bweinstein at apple.com>
Add failing Windows expected results for tests that involve the xhr.arrayBuffer = 'arraybuffer',
diff --git a/LayoutTests/editing/execCommand/switch-multiple-list-items-crash-expected.txt b/LayoutTests/editing/execCommand/switch-multiple-list-items-crash-expected.txt
deleted file mode 100644
index 22741bb..0000000
--- a/LayoutTests/editing/execCommand/switch-multiple-list-items-crash-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This test ensures WebKit does not crash when switching the type of a list with multiple list items.
-PASS
diff --git a/LayoutTests/editing/execCommand/switch-multiple-list-items-crash.html b/LayoutTests/editing/execCommand/switch-multiple-list-items-crash.html
deleted file mode 100644
index 5dab1c0..0000000
--- a/LayoutTests/editing/execCommand/switch-multiple-list-items-crash.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html><head><script>
-
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
-function go() {
- document.execCommand("selectall");
- document.designMode="on";
- document.execCommand("InsertLineBreak");
- document.execCommand("insertimage");
- document.execCommand("InsertOrderedList");
- document.execCommand("inserthtml", false, "z");
- document.execCommand("InsertHorizontalRule");
- document.execCommand("selectall");
- document.execCommand("createlink", false, "z");
- document.execCommand("insertunorderedlist");
- document.body.innerHTML = 'This test ensures WebKit does not crash when switching the type of a list with multiple list items.<br>PASS';
-}
-</script></head><body onload="go();"></body></html>
diff --git a/LayoutTests/editing/execCommand/switch-multiple-list-items-expected.txt b/LayoutTests/editing/execCommand/switch-multiple-list-items-expected.txt
deleted file mode 100644
index 50a6990..0000000
--- a/LayoutTests/editing/execCommand/switch-multiple-list-items-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-This tests switching the list type of multiple list items at once. WebKit should not crash.
-
-One, Two, and Three should all be in a single ol, each followed by a single br.:
-| <ol>
-| <li>
-| "<#selection-anchor>One"
-| <br>
-| <li>
-| "Two"
-| <br>
-| <li>
-| "Three<#selection-focus>"
-| <br>
diff --git a/LayoutTests/editing/execCommand/switch-multiple-list-items.html b/LayoutTests/editing/execCommand/switch-multiple-list-items.html
deleted file mode 100644
index c97d76e..0000000
--- a/LayoutTests/editing/execCommand/switch-multiple-list-items.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script src="../../resources/dump-as-markup.js"></script>
-<div contenteditable="true"><ul><li>One<br></li><li>Two<br></li><li>Three<br></li></ul></div>
-<script>
-
-Markup.description('This tests switching the list type of multiple list items at once. WebKit should not crash.');
-
-var div = document.getElementsByTagName('div')[0];
-window.getSelection().selectAllChildren(div);
-document.execCommand('InsertOrderedList', false, null);
-
-Markup.dump(div, 'One, Two, and Three should all be in a single ol, each followed by a single br.');
-
-</script>
-</body>
-</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6117fec..2cba9cf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-01 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r73047.
+ http://trac.webkit.org/changeset/73047
+ https://bugs.webkit.org/show_bug.cgi?id=50339
+
+ missing bug number (Requested by rniwa on #webkit).
+
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
+ * editing/InsertListCommand.cpp:
+ (WebCore::InsertListCommand::doApply):
+
2010-12-01 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler, Tony Chang, and unofficially by Enrica Casucci.
diff --git a/WebCore/editing/CompositeEditCommand.cpp b/WebCore/editing/CompositeEditCommand.cpp
index 602ca0f..06cfd2b 100644
--- a/WebCore/editing/CompositeEditCommand.cpp
+++ b/WebCore/editing/CompositeEditCommand.cpp
@@ -776,8 +776,8 @@ void CompositeEditCommand::cloneParagraphUnderNewElement(Position& start, Positi
outerNode = outerNode->parentNode();
topNode = topNode->parentNode();
}
-
- for (Node* n = start.node()->traverseNextSibling(outerNode); n; n = n->traverseNextSibling(outerNode)) {
+
+ for (Node* n = start.node()->traverseNextSibling(outerNode); n; n = n->nextSibling()) {
if (n->parentNode() != start.node()->parentNode())
lastNode = topNode->lastChild();
diff --git a/WebCore/editing/InsertListCommand.cpp b/WebCore/editing/InsertListCommand.cpp
index bb3cd93..f90d5d3 100644
--- a/WebCore/editing/InsertListCommand.cpp
+++ b/WebCore/editing/InsertListCommand.cpp
@@ -156,11 +156,6 @@ void InsertListCommand::doApply()
doApplyForSingleParagraph(forceCreateList, listTag, currentSelection.get());
if (endOfSelection.isNull() || endOfSelection.isOrphan() || startOfLastParagraph.isNull() || startOfLastParagraph.isOrphan()) {
RefPtr<Range> lastSelectionRange = TextIterator::rangeFromLocationAndLength(document()->documentElement(), indexForEndOfSelection, 0, true);
- // If lastSelectionRange is null, then some contents have been deleted from the document.
- // This should never happen and if it did, exit early immediately because we've lost the loop invariant.
- ASSERT(lastSelectionRange);
- if (!lastSelectionRange)
- return;
endOfSelection = lastSelectionRange->startPosition();
startOfLastParagraph = startOfParagraph(endOfSelection);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list