[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:51:02 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 5386505c99563c94dc79737b9fdebe7e58183a5a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 23 22:25:58 2009 +0000
2009-10-23 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
[GTK] Modified the tests results according to the last changes due
to the fixes of the bug (r49985):
https://bugs.webkit.org/show_bug.cgi?id=29697.
* platform/gtk/editing/execCommand/4916541-expected.txt:
* platform/gtk/editing/execCommand/5138441-expected.txt:
* platform/gtk/editing/execCommand/5481523-expected.txt:
* platform/gtk/editing/execCommand/indent-paragraphs-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50005 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bb97606..85e1913 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-23 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Modified the tests results according to the last changes due
+ to the fixes of the bug (r49985):
+ https://bugs.webkit.org/show_bug.cgi?id=29697.
+
+ * platform/gtk/editing/execCommand/4916541-expected.txt:
+ * platform/gtk/editing/execCommand/5138441-expected.txt:
+ * platform/gtk/editing/execCommand/5481523-expected.txt:
+ * platform/gtk/editing/execCommand/indent-paragraphs-expected.txt: Added.
+
2009-10-23 Jon Honeycutt <jhoneycutt at apple.com>
MSAA: Name for image elements should use alt attribute text
diff --git a/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt
index 9faf579..1f8fd85 100644
--- a/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt
+++ b/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt
@@ -10,11 +10,13 @@ layer at (0,0) size 800x600
text run at (0,20) width 320: "'foo' and 'bar' before and after the indent operation."
RenderBlock {DIV} at (0,56) size 784x40
RenderBlock {BLOCKQUOTE} at (40,0) size 744x40
- RenderText {#text} at (0,0) size 21x20
- text run at (0,0) width 21: "foo"
- RenderBR {BR} at (21,15) size 0x0
- RenderText {#text} at (0,20) size 20x20
- text run at (0,20) width 20: "bar"
+ RenderInline {SPAN} at (0,0) size 21x20
+ RenderText {#text} at (0,0) size 21x20
+ text run at (0,0) width 21: "foo"
+ RenderBR {BR} at (21,15) size 0x0
+ RenderInline {SPAN} at (0,0) size 20x20
+ RenderText {#text} at (0,20) size 20x20
+ text run at (0,20) width 20: "bar"
RenderBlock (anonymous) at (0,40) size 784x0
-selection start: position 1 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 2 of child 2 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection start: position 1 of child 0 {#text} of child 0 {SPAN} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end: position 2 of child 0 {#text} of child 1 {SPAN} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt
index e9e8d3d..2aa65db 100644
--- a/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt
+++ b/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt
@@ -11,9 +11,10 @@ layer at (0,0) size 800x600
text run at (0,40) width 149: "to implement indenting."
RenderBlock {DIV} at (0,76) size 784x66
RenderBlock {BLOCKQUOTE} at (40,0) size 744x20
- RenderText {#text} at (0,0) size 230x20
- text run at (0,0) width 230: "This should be indented, not quoted."
+ RenderBlock {DIV} at (0,0) size 744x20
+ RenderText {#text} at (0,0) size 230x20
+ text run at (0,0) width 230: "This should be indented, not quoted."
RenderBlock {BLOCKQUOTE} at (8,28) size 768x38 [border: (1px dashed #AAAAAA)]
RenderText {#text} at (9,9) size 175x20
text run at (9,9) width 175: "This text should be Quoted."
-caret: position 0 of child 0 {#text} of child 1 {BLOCKQUOTE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 0 {DIV} of child 1 {BLOCKQUOTE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt
index c2e9992..715581e 100644
--- a/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt
+++ b/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt
@@ -27,7 +27,6 @@ layer at (0,0) size 800x600
RenderTableCell {TD} at (45,28) size 34x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 30x20
text run at (2,2) width 30: "Four"
- RenderBlock (anonymous) at (0,56) size 704x0
RenderBlock (anonymous) at (0,56) size 784x0
selection start: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 1 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end: position 2 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/execCommand/indent-paragraphs-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/indent-paragraphs-expected.txt
new file mode 100644
index 0000000..12689ba
--- /dev/null
+++ b/LayoutTests/platform/gtk/editing/execCommand/indent-paragraphs-expected.txt
@@ -0,0 +1,59 @@
+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 784x20
+ RenderText {#text} at (0,0) size 395x20
+ text run at (0,0) width 395: "This tests indenting three paragraphs with different hierarchies."
+ RenderBlock {DIV} at (0,20) size 784x75
+ RenderBlock {BLOCKQUOTE} at (40,0) size 744x75
+ RenderBlock {DIV} at (0,0) size 744x25
+ RenderBlock {DIV} at (0,0) size 744x25
+ RenderInline {SPAN} at (0,0) size 100x20 [bgcolor=#FF0000]
+ RenderText {#text} at (0,5) size 39x20
+ text run at (0,5) width 39: "Hello "
+ RenderImage {IMG} at (39,0) size 20x20
+ RenderText {#text} at (59,5) size 41x20
+ text run at (59,5) width 41: " world"
+ RenderBlock {DIV} at (0,25) size 744x25
+ RenderBlock {DIV} at (0,0) size 744x25
+ RenderText {#text} at (0,5) size 39x20
+ text run at (0,5) width 39: "Hello "
+ RenderImage {IMG} at (39,0) size 20x20
+ RenderText {#text} at (59,5) size 41x20
+ text run at (59,5) width 41: " world"
+ RenderBlock {DIV} at (0,50) size 744x25
+ RenderText {#text} at (0,5) size 39x20
+ text run at (0,5) width 39: "Hello "
+ RenderImage {IMG} at (39,0) size 20x20
+ RenderText {#text} at (59,5) size 41x20
+ text run at (59,5) width 41: " world"
+ RenderBlock (anonymous) at (0,95) size 784x20
+ RenderBR {BR} at (0,0) size 0x20
+ RenderBlock {UL} at (0,131) size 784x140
+ RenderListItem {LI} at (40,0) size 744x60
+ RenderListMarker at (-18,0) size 7x20: bullet
+ RenderText {#text} at (0,0) size 90x20
+ text run at (0,0) width 90: "Before indent:"
+ RenderInline {SPAN} at (0,0) size 692x60
+ RenderText {#text} at (90,0) size 692x60
+ 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,20) width 333: "0);\">Hello <img src=\"http://\"> world</span></div> "
+ text run at (333,20) width 287: "<div>Hello <img src=\"http://\"> world</div> "
+ text run at (620,20) width 72: "Hello <img"
+ text run at (0,40) width 173: "src=\"http://\"> world </div>"
+ RenderListItem {LI} at (40,60) size 744x80
+ RenderListMarker at (-18,0) size 7x20: bullet
+ RenderText {#text} at (0,0) size 80x20
+ text run at (0,0) width 80: "After indent:"
+ RenderInline {SPAN} at (0,0) size 730x80
+ RenderText {#text} at (80,0) size 730x80
+ 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,20) 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,40) width 714: "src=\"http://\"> world</span></div></div><div id=\"test\"><div>Hello <img src=\"http://\"> world</div></div><div"
+ text run at (0,60) width 69: "id=\"test\"> "
+ text run at (69,60) 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