[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
rniwa at webkit.org
rniwa at webkit.org
Wed Dec 22 11:24:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9f424fda1c9e97e699255d0a27c21881d70ec85c
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 22 01:27:51 2010 +0000
dumpAsMarkup test conversion: create-list-from-range-selection.html and insert-list-empty-div.html
https://bugs.webkit.org/show_bug.cgi?id=42608
Reviewed by Ojan Vafai.
Converted the tests and removed the platform specific expected results.
* editing/execCommand/create-list-from-range-selection-expected.txt: Added.
* editing/execCommand/create-list-from-range-selection.html: Use dumpAsMarkup
* editing/execCommand/insert-list-empty-div-expected.txt: Added.
* editing/execCommand/insert-list-empty-div.html: Use dumpAsMarkup
* platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.checksum: Removed.
* platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.png: Removed.
* platform/chromium-linux/editing/execCommand/insert-list-empty-div-expected.checksum: Removed.
* platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.checksum: Removed.
* platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.png: Removed.
* platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.txt: Removed.
* platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.checksum: Removed.
* platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.png: Removed.
* platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
* platform/gtk/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
* platform/mac/editing/execCommand/create-list-from-range-selection-expected.checksum: Removed.
* platform/mac/editing/execCommand/create-list-from-range-selection-expected.png: Removed.
* platform/mac/editing/execCommand/create-list-from-range-selection-expected.txt: Removed.
* platform/mac/editing/execCommand/insert-list-empty-div-expected.checksum: Removed.
* platform/mac/editing/execCommand/insert-list-empty-div-expected.png: Removed.
* platform/mac/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
* platform/qt/editing/execCommand/create-list-from-range-selection-expected.txt: Removed.
* platform/qt/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
* resources/dump-as-markup.js: Added setNodeToDump.
(Markup.setNodeToDump):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63873 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 567b7f4..fcc61a5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,37 @@
+2010-07-21 Ryosuke Niwa <rniwa at webkit.org>
+
+ Reviewed by Ojan Vafai.
+
+ dumpAsMarkup test conversion: create-list-from-range-selection.html and insert-list-empty-div.html
+ https://bugs.webkit.org/show_bug.cgi?id=42608
+
+ Converted the tests and removed the platform specific expected results.
+
+ * editing/execCommand/create-list-from-range-selection-expected.txt: Added.
+ * editing/execCommand/create-list-from-range-selection.html: Use dumpAsMarkup
+ * editing/execCommand/insert-list-empty-div-expected.txt: Added.
+ * editing/execCommand/insert-list-empty-div.html: Use dumpAsMarkup
+ * platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.checksum: Removed.
+ * platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.png: Removed.
+ * platform/chromium-linux/editing/execCommand/insert-list-empty-div-expected.checksum: Removed.
+ * platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.checksum: Removed.
+ * platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.png: Removed.
+ * platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.txt: Removed.
+ * platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.checksum: Removed.
+ * platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.png: Removed.
+ * platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
+ * platform/gtk/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
+ * platform/mac/editing/execCommand/create-list-from-range-selection-expected.checksum: Removed.
+ * platform/mac/editing/execCommand/create-list-from-range-selection-expected.png: Removed.
+ * platform/mac/editing/execCommand/create-list-from-range-selection-expected.txt: Removed.
+ * platform/mac/editing/execCommand/insert-list-empty-div-expected.checksum: Removed.
+ * platform/mac/editing/execCommand/insert-list-empty-div-expected.png: Removed.
+ * platform/mac/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
+ * platform/qt/editing/execCommand/create-list-from-range-selection-expected.txt: Removed.
+ * platform/qt/editing/execCommand/insert-list-empty-div-expected.txt: Removed.
+ * resources/dump-as-markup.js: Added setNodeToDump.
+ (Markup.setNodeToDump):
+
2010-07-21 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/editing/execCommand/create-list-from-range-selection-expected.txt b/LayoutTests/editing/execCommand/create-list-from-range-selection-expected.txt
new file mode 100644
index 0000000..4fc5e36
--- /dev/null
+++ b/LayoutTests/editing/execCommand/create-list-from-range-selection-expected.txt
@@ -0,0 +1,26 @@
+
+<DIV id="test" contentEditable="true">
+<OL>
+<LI>
+<#text>asd</#text>
+<SPAN id="start">
+<#text>fo<selection-anchor>o</#text>
+</SPAN>
+</LI>
+<LI>
+<#text>bar</#text>
+</LI>
+<LI>
+<#text>baz</#text>
+</LI>
+<LI>
+<#text>foo</#text>
+</LI>
+<LI>
+<#text>bar</#text>
+</LI>
+<LI>
+<#text>ba<selection-focus>z</#text>
+</LI>
+</OL>
+</DIV>
diff --git a/LayoutTests/editing/execCommand/create-list-from-range-selection.html b/LayoutTests/editing/execCommand/create-list-from-range-selection.html
index c8c005d..43c723c 100644
--- a/LayoutTests/editing/execCommand/create-list-from-range-selection.html
+++ b/LayoutTests/editing/execCommand/create-list-from-range-selection.html
@@ -1,7 +1,4 @@
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpEditingCallbacks();
-</script>
+<script src="../../resources/dump-as-markup.js"></script>
<p>This tests Insert{Un}OrderedList on a range selection that contains a mix of list and non-list content.</p>
<div id="test" contenteditable="true">asd<span id="start">foo</span><br><ul><li>bar</li></ul>baz<br>foo<ol><li>bar</li></ol><span id="end">baz</span></div>
<script>
@@ -10,4 +7,5 @@ var start = document.getElementById("start").firstChild;
var end = document.getElementById("end").firstChild;
s.setBaseAndExtent(start, 2, end, 2);
document.execCommand("InsertOrderedList", false, "");
+Markup.setNodeToDump("test");
</script>
diff --git a/LayoutTests/editing/execCommand/insert-list-empty-div-expected.txt b/LayoutTests/editing/execCommand/insert-list-empty-div-expected.txt
new file mode 100644
index 0000000..aef2ae9
--- /dev/null
+++ b/LayoutTests/editing/execCommand/insert-list-empty-div-expected.txt
@@ -0,0 +1,8 @@
+
+<DIV id="div" contentEditable="true">
+<UL>
+<LI><selection-caret>
+<BR>
+</LI>
+</UL>
+</DIV>
diff --git a/LayoutTests/editing/execCommand/insert-list-empty-div.html b/LayoutTests/editing/execCommand/insert-list-empty-div.html
index 653b28d..80972f6 100644
--- a/LayoutTests/editing/execCommand/insert-list-empty-div.html
+++ b/LayoutTests/editing/execCommand/insert-list-empty-div.html
@@ -1,3 +1,4 @@
+<script src="../../resources/dump-as-markup.js"></script>
<p>This tests InsertList inside an empty div with no placeholder. You should see an empty list item with a caret inside of it.</p>
<div id="div" contenteditable="true"></div>
@@ -7,4 +8,5 @@ var div = document.getElementById("div");
sel.setPosition(div, 0);
document.execCommand("InsertUnorderedList");
+Markup.setNodeToDump("div");
</script>
diff --git a/LayoutTests/platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.checksum b/LayoutTests/platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.checksum
deleted file mode 100644
index d9dc40e..0000000
--- a/LayoutTests/platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-b3b88fea77a8239fb07c60b6b21dad37
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.png b/LayoutTests/platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.png
deleted file mode 100644
index 6cdeede..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/execCommand/create-list-from-range-selection-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-linux/editing/execCommand/insert-list-empty-div-expected.checksum b/LayoutTests/platform/chromium-linux/editing/execCommand/insert-list-empty-div-expected.checksum
deleted file mode 100644
index bd34af1..0000000
--- a/LayoutTests/platform/chromium-linux/editing/execCommand/insert-list-empty-div-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-db08f02eaf1c3938f4c53d7c51ba9478
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.checksum b/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.checksum
deleted file mode 100644
index badf8bf..0000000
--- a/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-fb027ce6fa2b921bb972b6245a2a1881
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.png b/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.png
deleted file mode 100644
index a9ac3f3..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.txt b/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.txt
deleted file mode 100644
index bff15d6..0000000
--- a/LayoutTests/platform/chromium-win/editing/execCommand/create-list-from-range-selection-expected.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 9 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of #text > SPAN > LI > OL > DIV > BODY > HTML > #document to 2 of #text > LI > OL > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 601x19
- text run at (0,0) width 601: "This tests Insert{Un}OrderedList on a range selection that contains a mix of list and non-list content."
- RenderBlock {DIV} at (0,36) size 784x120
- RenderBlock (anonymous) at (0,0) size 784x0
- RenderBlock {OL} at (0,0) size 784x120
- RenderListItem {LI} at (40,0) size 744x20
- RenderListMarker at (-21,0) size 16x19: "1"
- RenderText {#text} at (0,0) size 21x19
- text run at (0,0) width 21: "asd"
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (21,0) size 20x19
- text run at (21,0) width 20: "foo"
- RenderListItem {LI} at (40,20) size 744x20
- RenderListMarker at (-21,0) size 16x19: "2"
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "bar"
- RenderListItem {LI} at (40,40) size 744x20
- RenderListMarker at (-21,0) size 16x19: "3"
- RenderText {#text} at (0,0) size 21x19
- text run at (0,0) width 21: "baz"
- RenderListItem {LI} at (40,60) size 744x20
- RenderListMarker at (-21,0) size 16x19: "4"
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "foo"
- RenderListItem {LI} at (40,80) size 744x20
- RenderListMarker at (-21,0) size 16x19: "5"
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "bar"
- RenderListItem {LI} at (40,100) size 744x20
- RenderListMarker at (-21,0) size 16x19: "6"
- RenderText {#text} at (0,0) size 21x19
- text run at (0,0) width 21: "baz"
- RenderBlock (anonymous) at (0,136) size 784x0
-selection start: position 2 of child 0 {#text} of child 1 {SPAN} of child 0 {LI} of child 0 {OL} of child 2 {DIV} of body
-selection end: position 2 of child 0 {#text} of child 5 {LI} of child 0 {OL} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.checksum b/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.checksum
deleted file mode 100644
index 4077ae5..0000000
--- a/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-435ce1f751855608c1696dd295a402a1
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.png b/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.png
deleted file mode 100644
index 85086c4..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.txt b/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.txt
deleted file mode 100644
index 43360b3..0000000
--- a/LayoutTests/platform/chromium-win/editing/execCommand/insert-list-empty-div-expected.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 709x19
- text run at (0,0) width 365: "This tests InsertList inside an empty div with no placeholder. "
- text run at (365,0) width 344: "You should see an empty list item with a caret inside of it."
- RenderBlock {DIV} at (0,36) size 784x20
- RenderBlock {UL} at (0,0) size 784x20
- RenderListItem {LI} at (40,0) size 744x20
- RenderListMarker at (-18,0) size 7x19: bullet
- RenderBR {BR} at (0,0) size 0x19
- RenderBlock (anonymous) at (0,36) size 784x0
-caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/execCommand/insert-list-empty-div-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/insert-list-empty-div-expected.txt
deleted file mode 100644
index ac6eede..0000000
--- a/LayoutTests/platform/gtk/editing/execCommand/insert-list-empty-div-expected.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 750x20
- text run at (0,0) width 386: "This tests InsertList inside an empty div with no placeholder. "
- text run at (386,0) width 364: "You should see an empty list item with a caret inside of it."
- RenderBlock {DIV} at (0,36) size 784x20
- RenderBlock {UL} at (0,0) size 784x20
- RenderListItem {LI} at (40,0) size 744x20
- RenderListMarker at (-18,0) size 7x20: bullet
- RenderBR {BR} at (0,0) size 0x20
- RenderBlock (anonymous) at (0,36) size 784x0
-caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.checksum b/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.checksum
deleted file mode 100644
index 0c0e6e0..0000000
--- a/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-76b21f0ad6f3724d690246d9a925829f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.png b/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.png
deleted file mode 100644
index 6ee072b..0000000
Binary files a/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.txt b/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.txt
deleted file mode 100644
index e24430e..0000000
--- a/LayoutTests/platform/mac/editing/execCommand/create-list-from-range-selection-expected.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 9 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of #text > SPAN > LI > OL > DIV > BODY > HTML > #document to 2 of #text > LI > OL > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 632x18
- text run at (0,0) width 632: "This tests Insert{Un}OrderedList on a range selection that contains a mix of list and non-list content."
- RenderBlock {DIV} at (0,34) size 784x108
- RenderBlock (anonymous) at (0,0) size 784x0
- RenderBlock {OL} at (0,0) size 784x108
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (-20,0) size 16x18: "1"
- RenderText {#text} at (0,0) size 21x18
- text run at (0,0) width 21: "asd"
- RenderInline {SPAN} at (0,0) size 21x18
- RenderText {#text} at (21,0) size 21x18
- text run at (21,0) width 21: "foo"
- RenderListItem {LI} at (40,18) size 744x18
- RenderListMarker at (-20,0) size 16x18: "2"
- RenderText {#text} at (0,0) size 20x18
- text run at (0,0) width 20: "bar"
- RenderListItem {LI} at (40,36) size 744x18
- RenderListMarker at (-20,0) size 16x18: "3"
- RenderText {#text} at (0,0) size 22x18
- text run at (0,0) width 22: "baz"
- RenderListItem {LI} at (40,54) size 744x18
- RenderListMarker at (-20,0) size 16x18: "4"
- RenderText {#text} at (0,0) size 21x18
- text run at (0,0) width 21: "foo"
- RenderListItem {LI} at (40,72) size 744x18
- RenderListMarker at (-20,0) size 16x18: "5"
- RenderText {#text} at (0,0) size 20x18
- text run at (0,0) width 20: "bar"
- RenderListItem {LI} at (40,90) size 744x18
- RenderListMarker at (-20,0) size 16x18: "6"
- RenderText {#text} at (0,0) size 22x18
- text run at (0,0) width 22: "baz"
- RenderBlock (anonymous) at (0,124) size 784x0
-selection start: position 2 of child 0 {#text} of child 1 {SPAN} of child 0 {LI} of child 0 {OL} of child 2 {DIV} of body
-selection end: position 2 of child 0 {#text} of child 5 {LI} of child 0 {OL} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.checksum b/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.checksum
deleted file mode 100644
index dcb77f9..0000000
--- a/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-19bf62cc6280b7b82e38b75c7f24e410
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.png b/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.png
deleted file mode 100644
index f41ac66..0000000
Binary files a/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.txt b/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.txt
deleted file mode 100644
index 9cff0bb..0000000
--- a/LayoutTests/platform/mac/editing/execCommand/insert-list-empty-div-expected.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 750x18
- text run at (0,0) width 386: "This tests InsertList inside an empty div with no placeholder. "
- text run at (386,0) width 364: "You should see an empty list item with a caret inside of it."
- RenderBlock {DIV} at (0,34) size 784x18
- RenderBlock {UL} at (0,0) size 784x18
- RenderListItem {LI} at (40,0) size 744x18
- RenderListMarker at (-17,0) size 7x18: bullet
- RenderBR {BR} at (0,0) size 0x18
- RenderBlock (anonymous) at (0,34) size 784x0
-caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/execCommand/create-list-from-range-selection-expected.txt b/LayoutTests/platform/qt/editing/execCommand/create-list-from-range-selection-expected.txt
deleted file mode 100644
index 9d1f102..0000000
--- a/LayoutTests/platform/qt/editing/execCommand/create-list-from-range-selection-expected.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 9 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of #text > SPAN > LI > OL > DIV > BODY > HTML > #document to 2 of #text > LI > OL > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x578
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 630x19
- text run at (0,0) width 630: "This tests Insert{Un}OrderedList on a range selection that contains a mix of list and non-list content."
- RenderBlock {DIV} at (0,33) size 784x114
- RenderBlock (anonymous) at (0,0) size 784x0
- RenderBlock {OL} at (0,0) size 784x114
- RenderListItem {LI} at (40,0) size 744x19
- RenderListMarker at (-20,0) size 16x19: "1"
- RenderText {#text} at (0,0) size 23x19
- text run at (0,0) width 23: "asd"
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (23,0) size 20x19
- text run at (23,0) width 20: "foo"
- RenderListItem {LI} at (40,19) size 744x19
- RenderListMarker at (-20,0) size 16x19: "2"
- RenderText {#text} at (0,0) size 21x19
- text run at (0,0) width 21: "bar"
- RenderListItem {LI} at (40,38) size 744x19
- RenderListMarker at (-20,0) size 16x19: "3"
- RenderText {#text} at (0,0) size 23x19
- text run at (0,0) width 23: "baz"
- RenderListItem {LI} at (40,57) size 744x19
- RenderListMarker at (-20,0) size 16x19: "4"
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "foo"
- RenderListItem {LI} at (40,76) size 744x19
- RenderListMarker at (-20,0) size 16x19: "5"
- RenderText {#text} at (0,0) size 21x19
- text run at (0,0) width 21: "bar"
- RenderListItem {LI} at (40,95) size 744x19
- RenderListMarker at (-20,0) size 16x19: "6"
- RenderText {#text} at (0,0) size 23x19
- text run at (0,0) width 23: "baz"
- RenderBlock (anonymous) at (0,128) size 784x0
-selection start: position 2 of child 0 {#text} of child 1 {SPAN} of child 0 {LI} of child 0 {OL} of child 2 {DIV} of body
-selection end: position 2 of child 0 {#text} of child 5 {LI} of child 0 {OL} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/execCommand/insert-list-empty-div-expected.txt b/LayoutTests/platform/qt/editing/execCommand/insert-list-empty-div-expected.txt
deleted file mode 100644
index ac10cda..0000000
--- a/LayoutTests/platform/qt/editing/execCommand/insert-list-empty-div-expected.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x578
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 746x19
- text run at (0,0) width 384: "This tests InsertList inside an empty div with no placeholder. "
- text run at (384,0) width 362: "You should see an empty list item with a caret inside of it."
- RenderBlock {DIV} at (0,33) size 784x19
- RenderBlock {UL} at (0,0) size 784x19
- RenderListItem {LI} at (40,0) size 744x19
- RenderListMarker at (-17,0) size 7x19: bullet
- RenderBR {BR} at (0,0) size 0x19
- RenderBlock (anonymous) at (0,33) size 784x0
-caret: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body
diff --git a/LayoutTests/resources/dump-as-markup.js b/LayoutTests/resources/dump-as-markup.js
index 7427a5a..53a8504 100644
--- a/LayoutTests/resources/dump-as-markup.js
+++ b/LayoutTests/resources/dump-as-markup.js
@@ -1,3 +1,21 @@
+/**
+ * There are three basic use cases of dumpAsMarkup
+ *
+ * 1. Dump the entire DOM when the page is loaded
+ * When this script is included but no method of Markup is called,
+ * it dumps the DOM of each frame loaded.
+ *
+ * 2. Dump the content of a specific element when the page is loaded
+ * When Markup.setNodeToDump is called with some element or the id of some element,
+ * it dumps the content of the specified element as supposed to the entire DOM tree.
+ *
+ * 3. Dump the content of a specific element multiple times while the page is loading
+ * Calling Markup.dump would dump the content of the specified element or the entire DOM.
+ * On the page load, it dumps the content of the current node (set by setNodeToDump)
+ * or the entire DOM if the node was never set.
+ */
+
+
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.waitUntilDone();
@@ -17,11 +35,7 @@ Markup.description = function(description)
// a pre element when loaded manually, in order to aid debugging.
Markup.dump = function(opt_node)
{
- // Allow for using Markup.dump as an onload handler.
- if (opt_node instanceof Event)
- opt_node = undefined;
-
- var node = opt_node || document.body.parentElement
+ var node = opt_node || Markup._node || document.body.parentElement
var markup = Markup._description ? Markup._description + '\n' : "";
markup += Markup.get(node);
@@ -51,19 +65,26 @@ Markup.dump = function(opt_node)
}
container.innerText = markup;
-
- if (window.layoutTestController)
- layoutTestController.notifyDone();
}
Markup.waitUntilDone = function()
{
- window.removeEventListener('load', Markup.dump, false);
+ window.removeEventListener('load', Markup.notifyDone, false);
}
Markup.notifyDone = function()
{
Markup.dump();
+
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+
+Markup.setNodeToDump = function(node)
+{
+ if (typeof node == "string")
+ node = document.getElementById(node);
+ Markup._node = node
}
// Returns the markup for the given node. To be used for cases where a test needs
@@ -216,4 +237,4 @@ Markup._getSelectionMarker = function(node, index)
return '';
}
-window.addEventListener('load', Markup.dump, false);
+window.addEventListener('load', Markup.notifyDone, false);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list