[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
eric at webkit.org
eric at webkit.org
Wed Feb 10 22:18:47 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit a88212291c0e31bbc299e332dbbee6a808b030fb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 8 11:04:37 2010 +0000
2010-02-08 Tony Chang <tony at chromium.org>
Reviewed by Darin Adler.
Convert editing/execCommand/indent-paragraphs.html to use dumpAsText.
The test copies HTML to the text output, so it doesn't really need
to dump the render tree.
The test was added in r49985, but didn't include pixel results.
https://bugs.webkit.org/show_bug.cgi?id=34625
* platform/mac/editing/execCommand/indent-paragraphs-expected.txt: Modified.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54478 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8f857ef..89b4d17 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-08 Tony Chang <tony at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Convert editing/execCommand/indent-paragraphs.html to use dumpAsText.
+ The test copies HTML to the text output, so it doesn't really need
+ to dump the render tree.
+
+ The test was added in r49985, but didn't include pixel results.
+ https://bugs.webkit.org/show_bug.cgi?id=34625
+
+ * platform/mac/editing/execCommand/indent-paragraphs-expected.txt: Modified.
+
2010-02-07 Tony Chang <tony at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt b/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt
new file mode 100644
index 0000000..b9bc79b
--- /dev/null
+++ b/LayoutTests/editing/execCommand/indent-paragraphs-expected.txt
@@ -0,0 +1,16 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > DIV > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document to 6 of #text > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+This tests indenting three paragraphs with different hierarchies.
+Hello world
+Hello world
+Hello world
+
+Before indent: <div id="test"> <div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">Hello <img src="http://"> world</span></div> <div>Hello <img src="http://"> world</div> Hello <img src="http://"> world </div>
+After indent: <blockquote class="webkit-indent-blockquote" style="margin: 0 0 0 40px; border: none; padding: 0px;"><div id="test"><div><span class="Apple-style-span" style="background-color: rgb(255, 0, 0);">Hello <img src="http://"> world</span></div></div><div id="test"><div>Hello <img src="http://"> world</div></div><div id="test"> Hello <img src="http://"> world </div></blockquote>
diff --git a/LayoutTests/editing/execCommand/indent-paragraphs.html b/LayoutTests/editing/execCommand/indent-paragraphs.html
index 7267fc9..df0dd8d 100644
--- a/LayoutTests/editing/execCommand/indent-paragraphs.html
+++ b/LayoutTests/editing/execCommand/indent-paragraphs.html
@@ -18,6 +18,9 @@ This tests indenting three paragraphs with different hierarchies.
</ul>
<script type="text/javascript">
+if (window.layoutTestController)
+ window.layoutTestController.dumpAsText();
+
function editingTest()
{
var e = document.getElementById('root');
diff --git a/LayoutTests/platform/mac/editing/execCommand/indent-paragraphs-expected.txt b/LayoutTests/platform/mac/editing/execCommand/indent-paragraphs-expected.txt
deleted file mode 100644
index e37376b..0000000
--- a/LayoutTests/platform/mac/editing/execCommand/indent-paragraphs-expected.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > DIV > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > DIV > BLOCKQUOTE > DIV > BODY > HTML > #document to 6 of #text > DIV > BLOCKQUOTE > 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 (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 395x18
- text run at (0,0) width 395: "This tests indenting three paragraphs with different hierarchies."
- RenderBlock {DIV} at (0,18) size 784x72
- RenderBlock {BLOCKQUOTE} at (40,0) size 744x72
- RenderBlock {DIV} at (0,0) size 744x24
- RenderBlock {DIV} at (0,0) size 744x24
- RenderInline {SPAN} at (0,0) size 100x18 [bgcolor=#FF0000]
- RenderText {#text} at (0,6) size 39x18
- text run at (0,6) width 39: "Hello "
- RenderImage {IMG} at (39,0) size 20x20
- RenderText {#text} at (59,6) size 41x18
- text run at (59,6) width 41: " world"
- RenderBlock {DIV} at (0,24) size 744x24
- RenderBlock {DIV} at (0,0) size 744x24
- RenderText {#text} at (0,6) size 39x18
- text run at (0,6) width 39: "Hello "
- RenderImage {IMG} at (39,0) size 20x20
- RenderText {#text} at (59,6) size 41x18
- text run at (59,6) width 41: " world"
- RenderBlock {DIV} at (0,48) size 744x24
- RenderText {#text} at (0,6) size 39x18
- text run at (0,6) width 39: "Hello "
- RenderImage {IMG} at (39,0) size 20x20
- RenderText {#text} at (59,6) size 41x18
- text run at (59,6) width 41: " world"
- RenderBlock (anonymous) at (0,90) size 784x18
- RenderBR {BR} at (0,0) size 0x18
- RenderBlock {UL} at (0,124) size 784x126
- RenderListItem {LI} at (40,0) size 744x54
- RenderListMarker at (-17,0) size 7x18: bullet
- RenderText {#text} at (0,0) size 90x18
- text run at (0,0) width 90: "Before indent:"
- RenderInline {SPAN} at (0,0) size 692x54
- RenderText {#text} at (90,0) size 692x54
- text run at (90,0) width 106: " <div id=\"test\"> "
- text run at (196,0) width 479: "<div><span class=\"Apple-style-span\" style=\"background-color: rgb(255, 0,"
- text run at (0,18) width 333: "0);\">Hello <img src=\"http://\"> world</span></div> "
- text run at (333,18) width 287: "<div>Hello <img src=\"http://\"> world</div> "
- text run at (620,18) width 72: "Hello <img"
- text run at (0,36) width 173: "src=\"http://\"> world </div>"
- RenderListItem {LI} at (40,54) size 744x72
- RenderListMarker at (-17,0) size 7x18: bullet
- RenderText {#text} at (0,0) size 80x18
- text run at (0,0) width 80: "After indent:"
- RenderInline {SPAN} at (0,0) size 730x72
- RenderText {#text} at (80,0) size 730x72
- text run at (80,0) width 622: " <blockquote class=\"webkit-indent-blockquote\" style=\"margin: 0 0 0 40px; border: none; padding:"
- text run at (0,18) width 730: "0px;\"><div id=\"test\"><div><span class=\"Apple-style-span\" style=\"background-color: rgb(255, 0, 0);\">Hello <img"
- text run at (0,36) width 714: "src=\"http://\"> world</span></div></div><div id=\"test\"><div>Hello <img src=\"http://\"> world</div></div><div"
- text run at (0,54) width 69: "id=\"test\"> "
- text run at (69,54) width 341: "Hello <img src=\"http://\"> world </div></blockquote>"
-selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {DIV} of child 0 {DIV} of child 1 {BLOCKQUOTE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 6 of child 2 {#text} of child 2 {DIV} of child 1 {BLOCKQUOTE} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list