[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:47:54 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 74752ce868eec84a7bb2f856b200ca2418abdec6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 19 18:59:27 2009 +0000
2009-10-19 Zan Dobersek <zandobersek at gmail.com>
Reviewed by Gustavo Noronha.
Update test results and Skipped list after changes in r49791.
Some test results were accidentally committed in r49192. At that time
results were incorrect, but testing still succeeded because of
unimplemented features. After r49791 tests, though generating semantically
equal output to Mac's render trees, started to fail and need to have
generated results updated. This patch does just that.
* platform/gtk/Skipped: Skip a test that does not generate semantically
equal render trees.
* platform/gtk/editing/inserting/insert-3907422-fix-expected.txt:
* platform/gtk/editing/pasteboard/4076267-2-expected.txt:
* platform/gtk/editing/pasteboard/4076267-3-expected.txt:
* platform/gtk/editing/pasteboard/4076267-expected.txt:
* platform/gtk/editing/pasteboard/paste-table-001-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-001-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-002-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-003-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-004-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-005-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-006-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-007-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-008-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-009-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-010-expected.txt:
* platform/gtk/editing/pasteboard/paste-text-015-expected.txt:
* platform/gtk/editing/pasteboard/paste-xml-expected.txt:
* platform/gtk/editing/pasteboard/select-element-1-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49797 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 56d3fc1..b8b212d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,36 @@
+2009-10-19 Zan Dobersek <zandobersek at gmail.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Update test results and Skipped list after changes in r49791.
+
+ Some test results were accidentally committed in r49192. At that time
+ results were incorrect, but testing still succeeded because of
+ unimplemented features. After r49791 tests, though generating semantically
+ equal output to Mac's render trees, started to fail and need to have
+ generated results updated. This patch does just that.
+
+ * platform/gtk/Skipped: Skip a test that does not generate semantically
+ equal render trees.
+ * platform/gtk/editing/inserting/insert-3907422-fix-expected.txt:
+ * platform/gtk/editing/pasteboard/4076267-2-expected.txt:
+ * platform/gtk/editing/pasteboard/4076267-3-expected.txt:
+ * platform/gtk/editing/pasteboard/4076267-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-table-001-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-001-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-002-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-003-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-004-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-005-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-006-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-007-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-008-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-009-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-010-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-text-015-expected.txt:
+ * platform/gtk/editing/pasteboard/paste-xml-expected.txt:
+ * platform/gtk/editing/pasteboard/select-element-1-expected.txt: Removed.
+
2009-10-19 Nate Chapin <japhet at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index abaf772..d5ad63c 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1075,6 +1075,7 @@ editing/pasteboard/pasting-object.html
editing/pasteboard/pasting-tabs.html
editing/pasteboard/prevent-block-nesting-01.html
editing/pasteboard/quirks-mode-br-1.html
+editing/pasteboard/select-element-1.html
editing/pasteboard/smart-paste-001.html
editing/pasteboard/smart-paste-002.html
editing/pasteboard/smart-paste-003.html
diff --git a/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt b/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt
index 64e485c..c2cf456 100644
--- a/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt
+++ b/LayoutTests/platform/gtk/editing/inserting/insert-3907422-fix-expected.txt
@@ -3,6 +3,28 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x20
- RenderBR {BR} at (0,0) size 0x20
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderBlock {DIV} at (0,0) size 784x92
+ RenderBlock (anonymous) at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 21x20
+ text run at (0,0) width 21: "foo"
+ RenderBlock {BLOCKQUOTE} at (40,36) size 704x20
+ RenderText {#text} at (0,0) size 20x20
+ text run at (0,0) width 20: "bar"
+ RenderBlock (anonymous) at (0,72) size 784x20
+ RenderText {#text} at (0,0) size 22x20
+ text run at (0,0) width 22: "baz"
+ RenderText {#text} at (22,0) size 21x20
+ text run at (22,0) width 21: "foo"
+ RenderBlock (anonymous) at (0,92) size 784x0
+ RenderBlock {BLOCKQUOTE} at (40,108) size 704x20
+ RenderText {#text} at (0,0) size 20x20
+ text run at (0,0) width 20: "bar"
+ RenderBlock (anonymous) at (0,144) size 784x20
+ RenderText {#text} at (0,0) size 22x20
+ text run at (0,0) width 22: "baz"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+caret: position 3 of child 3 {#text} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/4076267-2-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/4076267-2-expected.txt
index 73d2414..3b14d09 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/4076267-2-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/4076267-2-expected.txt
@@ -9,6 +9,6 @@ layer at (0,0) size 800x600
RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,46) size 784x28 [border: (2px solid #FFAAAA)]
RenderBlock {DIV} at (2,2) size 780x24 [border: (2px solid #AAAAFF)]
- RenderText {#text} at (2,2) size 4x20
- text run at (2,2) width 4: "."
-caret: position 0 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderText {#text} at (2,2) size 573x20
+ text run at (2,2) width 573: "there should be a single trailing space between the '.' and the last character in this sentence ."
+caret: position 96 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/4076267-3-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/4076267-3-expected.txt
index dcc8f34..2c87fa2 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/4076267-3-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/4076267-3-expected.txt
@@ -9,25 +9,35 @@ layer at (0,0) size 800x600
RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,46) size 784x220
RenderBlock (anonymous) at (0,0) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 20x20
+ text run at (0,0) width 20: "x x"
RenderBlock {DIV} at (0,20) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 24x20
+ text run at (0,0) width 24: "x x"
RenderBlock {DIV} at (0,40) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 28x20
+ text run at (0,0) width 28: "x x"
RenderBlock {DIV} at (0,60) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 32x20
+ text run at (0,0) width 32: "x x"
RenderBlock {DIV} at (0,80) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 36x20
+ text run at (0,0) width 36: "x x"
RenderBlock {DIV} at (0,100) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 40x20
+ text run at (0,0) width 40: "x x"
RenderBlock {DIV} at (0,120) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 44x20
+ text run at (0,0) width 44: "x x"
RenderBlock {DIV} at (0,140) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 48x20
+ text run at (0,0) width 48: "x x"
RenderBlock {DIV} at (0,160) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 52x20
+ text run at (0,0) width 52: "x x"
RenderBlock {DIV} at (0,180) size 784x20
- RenderBR {BR} at (0,0) size 0x20
+ RenderText {#text} at (0,0) size 56x20
+ text run at (0,0) width 56: "x x"
RenderBlock {DIV} at (0,200) size 784x20
RenderBR {BR} at (0,0) size 0x20
caret: position 0 of child 0 {BR} of child 10 {DIV} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/4076267-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/4076267-expected.txt
index 52467f7..bb0ceb0 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/4076267-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/4076267-expected.txt
@@ -9,5 +9,6 @@ layer at (0,0) size 800x600
RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,46) size 784x20
RenderBlock {DIV} at (0,0) size 784x20
- RenderBR {BR} at (0,0) size 0x20
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderText {#text} at (0,0) size 330x20
+ text run at (0,0) width 330: " this text should have a single leading space before it"
+caret: position 55 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-table-001-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-table-001-expected.txt
index 42c8409..c6b5510 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-table-001-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-table-001-expected.txt
@@ -3,13 +3,13 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x164 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (0,0) size 784x222 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 756x30
RenderInline {SPAN} at (0,0) size 161x30
RenderText {#text} at (0,0) size 161x30
text run at (0,0) width 161: "Empty table cell"
RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (14,68) size 756x58
+ RenderBlock {P} at (14,68) size 756x116
RenderTable {TABLE} at (0,0) size 292x58 [border: (2px outset #808080)]
RenderTableSection {TBODY} at (2,2) size 288x54
RenderTableRow {TR} at (0,2) size 288x24
@@ -24,4 +24,20 @@ layer at (0,0) size 800x600
RenderTableCell {TD} at (85,28) size 201x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {#text} at (2,2) size 197x20
text run at (2,2) width 197: "I should be in the right column."
-caret: position 2 of child 1 {TABLE} of child 3 {P} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderTable {TABLE} at (0,58) size 292x58 [border: (2px outset #808080)]
+ RenderTableSection {TBODY} at (2,2) size 288x54
+ RenderTableRow {TR} at (0,2) size 288x24
+ RenderTableCell {TD} at (2,2) size 81x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 77x20
+ text run at (2,2) width 77: "Left column"
+ RenderTableCell {TD} at (85,2) size 201x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 86x20
+ text run at (2,2) width 86: "Right column"
+ RenderTableRow {TR} at (0,28) size 288x24
+ RenderTableCell {TD} at (2,38) size 81x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (85,28) size 201x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 197x20
+ text run at (2,2) width 197: "I should be in the right column."
+ RenderBlock (anonymous) at (0,116) size 756x0
+ RenderText {#text} at (0,0) size 0x0
+caret: position 32 of child 0 {#text} of child 1 {TD} of child 1 {TR} of child 0 {TBODY} of child 2 {TABLE} of child 3 {P} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-001-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-001-expected.txt
index 1bdb240..b6f1968 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-001-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-001-expected.txt
@@ -4,8 +4,12 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)]
- RenderInline {SPAN} at (0,0) size 109x30
- RenderText {#text} at (14,14) size 109x30
- text run at (14,14) width 109: "foo bar baz"
+ RenderInline {SPAN} at (0,0) size 140x30
+ RenderText {#text} at (14,14) size 69x30
+ text run at (14,14) width 69: "foo bar"
+ RenderText {#text} at (83,14) size 31x30
+ text run at (83,14) width 31: "bar"
+ RenderText {#text} at (114,14) size 40x30
+ text run at (114,14) width 40: " baz"
RenderText {#text} at (0,0) size 0x0
-caret: position 7 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 3 of child 1 {#text} of child 1 {SPAN} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-002-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-002-expected.txt
index ca2fd23..32f62d7 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-002-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-002-expected.txt
@@ -4,16 +4,24 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 348x30
- text run at (14,14) width 348: "There is a tide in the affairs of men,"
+ RenderText {#text} at (14,14) size 63x30
+ text run at (14,14) width 63: "There "
+ RenderText {#text} at (77,14) size 285x30
+ text run at (77,14) width 285: "is a tide in the affairs of men,"
RenderBlock {DIV} at (0,58) size 784x58 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 434x30
- text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
+ RenderText {#text} at (14,14) size 124x30
+ text run at (14,14) width 124: "Which taken"
+ RenderText {#text} at (138,14) size 285x30
+ text run at (138,14) width 285: "is a tide in the affairs of men,"
RenderBlock {DIV} at (0,116) size 784x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 124x30
+ text run at (14,14) width 124: "Which taken"
+ RenderText {#text} at (138,14) size 310x30
+ text run at (138,14) width 310: " at the flood leads on to fortune."
+ RenderBlock {DIV} at (0,174) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 351x30
text run at (14,14) width 351: "Omitted, all the voyage of their life,"
- RenderBlock {DIV} at (0,174) size 784x58 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (0,232) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 357x30
text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection start: position 6 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 11 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 11 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-003-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-003-expected.txt
index ba8eb39..10c57d8 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-003-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-003-expected.txt
@@ -3,20 +3,35 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x232 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (0,0) size 784x376 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 756x30
- RenderText {#text} at (0,0) size 348x30
- text run at (0,0) width 348: "There is a tide in the affairs of men,"
- RenderBlock {DIV} at (14,44) size 756x174 [border: (2px solid #FF0000)]
- RenderBlock (anonymous) at (14,14) size 728x30
- RenderText {#text} at (0,0) size 434x30
- text run at (0,0) width 434: "Which taken at the flood leads on to fortune."
- RenderBlock {DIV} at (14,44) size 728x116 [border: (2px solid #FF0000)]
+ RenderText {#text} at (0,0) size 63x30
+ text run at (0,0) width 63: "There "
+ RenderText {#text} at (63,0) size 285x30
+ text run at (63,0) width 285: "is a tide in the affairs of men,"
+ RenderBlock {DIV} at (14,44) size 756x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 434x30
+ text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
+ RenderBlock (anonymous) at (14,102) size 756x0
+ RenderBlock {DIV} at (14,102) size 756x260 [border: (2px solid #FF0000)]
+ RenderBlock (anonymous) at (14,14) size 728x0
+ RenderBlock {DIV} at (14,14) size 728x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 80x30
+ text run at (14,14) width 80: "Omitted"
+ RenderText {#text} at (94,14) size 285x30
+ text run at (94,14) width 285: "is a tide in the affairs of men,"
+ RenderBlock (anonymous) at (14,72) size 728x0
+ RenderBlock {DIV} at (14,72) size 728x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 434x30
+ text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
+ RenderBlock (anonymous) at (14,130) size 728x0
+ RenderBlock {DIV} at (14,130) size 728x116 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 700x30
- RenderText {#text} at (0,0) size 351x30
- text run at (0,0) width 351: "Omitted, all the voyage of their life,"
+ RenderText {#text} at (0,0) size 80x30
+ text run at (0,0) width 80: "Omitted"
+ RenderText {#text} at (80,0) size 271x30
+ text run at (80,0) width 271: ", all the voyage of their life,"
RenderBlock {DIV} at (14,44) size 700x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 357x30
text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection start: position 6 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 7 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 7 of child 0 {#text} of child 2 {DIV} of child 3 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-004-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-004-expected.txt
index fc93b98..5257ab8 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-004-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-004-expected.txt
@@ -4,8 +4,10 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 348x30
- text run at (14,14) width 348: "There is a tide in the affairs of men,"
+ RenderText {#text} at (14,14) size 63x30
+ text run at (14,14) width 63: "There "
+ RenderText {#text} at (77,14) size 285x30
+ text run at (77,14) width 285: "is a tide in the affairs of men,"
RenderBlock {DIV} at (0,58) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 434x30
text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
@@ -15,5 +17,4 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (0,174) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 357x30
text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection start: position 6 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 0 of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-005-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-005-expected.txt
index fc93b98..8bcda2d 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-005-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-005-expected.txt
@@ -4,16 +4,20 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x58 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 348x30
- text run at (14,14) width 348: "There is a tide in the affairs of men,"
+ RenderText {#text} at (14,14) size 63x30
+ text run at (14,14) width 63: "There "
+ RenderText {#text} at (77,14) size 285x30
+ text run at (77,14) width 285: "is a tide in the affairs of men,"
RenderBlock {DIV} at (0,58) size 784x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 285x30
+ text run at (14,14) width 285: "is a tide in the affairs of men,"
+ RenderBlock {DIV} at (0,116) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 434x30
text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
- RenderBlock {DIV} at (0,116) size 784x58 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (0,174) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 351x30
text run at (14,14) width 351: "Omitted, all the voyage of their life,"
- RenderBlock {DIV} at (0,174) size 784x58 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (0,232) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 357x30
text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection start: position 6 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 0 of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-006-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-006-expected.txt
index 41f7b26..b5ac571 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-006-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-006-expected.txt
@@ -7,13 +7,15 @@ layer at (0,0) size 800x600
RenderText {#text} at (14,14) size 348x30
text run at (14,14) width 348: "There is a tide in the affairs of men,"
RenderBlock {DIV} at (0,58) size 784x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 348x30
+ text run at (14,14) width 348: "There is a tide in the affairs of men,"
+ RenderBlock {DIV} at (0,116) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 434x30
text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
- RenderBlock {DIV} at (0,116) size 784x58 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (0,174) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 351x30
text run at (14,14) width 351: "Omitted, all the voyage of their life,"
- RenderBlock {DIV} at (0,174) size 784x58 [border: (2px solid #FF0000)]
+ RenderBlock {DIV} at (0,232) size 784x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 357x30
text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 0 of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-007-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-007-expected.txt
index b55592d..2e3f8fb 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-007-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-007-expected.txt
@@ -3,11 +3,14 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x232 [border: (2px solid #FF0000)]
- RenderBlock (anonymous) at (14,14) size 756x30
+ RenderBlock {DIV} at (0,0) size 784x262 [border: (2px solid #FF0000)]
+ RenderBlock (anonymous) at (14,14) size 756x60
RenderText {#text} at (0,0) size 348x30
text run at (0,0) width 348: "There is a tide in the affairs of men,"
- RenderBlock {DIV} at (14,44) size 756x174 [border: (2px solid #FF0000)]
+ RenderBR {BR} at (348,23) size 0x0
+ RenderText {#text} at (0,30) size 348x30
+ text run at (0,30) width 348: "There is a tide in the affairs of men,"
+ RenderBlock {DIV} at (14,74) size 756x174 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 728x30
RenderText {#text} at (0,0) size 434x30
text run at (0,0) width 434: "Which taken at the flood leads on to fortune."
@@ -18,5 +21,4 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (14,44) size 700x58 [border: (2px solid #FF0000)]
RenderText {#text} at (14,14) size 357x30
text run at (14,14) width 357: "Is bound in shallows and in miseries."
-selection start: position 0 of child 0 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 0 of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-008-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-008-expected.txt
index 2553d92..1250889 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-008-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-008-expected.txt
@@ -8,10 +8,19 @@ layer at (0,0) size 800x600
RenderText {#text} at (0,0) size 351x30
text run at (0,0) width 351: "Omitted, all the voyage of their life,"
RenderBlock {DIV} at (14,44) size 756x58 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 357x30
- text run at (14,14) width 357: "Is bound in shallows and in miseries."
+ RenderText {#text} at (14,14) size 114x30
+ text run at (14,14) width 114: "Is bound in "
+ RenderText {#text} at (128,14) size 243x30
+ text run at (128,14) width 243: "shallows and in miseries."
RenderBlock (anonymous) at (14,102) size 756x30
- RenderText {#text} at (0,0) size 382x30
- text run at (0,0) width 382: "Upon such a full sea are we now afloat,"
-selection start: position 12 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 20 of child 2 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderText {#text} at (0,0) size 197x30
+ text run at (0,0) width 197: "Upon such a full sea"
+ RenderText {#text} at (197,0) size 243x30
+ text run at (197,0) width 243: "shallows and in miseries."
+ RenderBlock (anonymous) at (0,146) size 784x0
+ RenderBlock {DIV} at (0,146) size 784x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 197x30
+ text run at (14,14) width 197: "Upon such a full sea"
+ RenderText {#text} at (211,14) size 185x30
+ text run at (211,14) width 185: " are we now afloat,"
+caret: position 20 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt
index ac276da..e20e8bf 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-009-expected.txt
@@ -11,7 +11,12 @@ layer at (0,0) size 800x600
RenderText {#text} at (14,14) size 357x30
text run at (14,14) width 357: "Is bound in shallows and in miseries."
RenderBlock (anonymous) at (14,102) size 756x30
- RenderText {#text} at (0,0) size 382x30
- text run at (0,0) width 382: "Upon such a full sea are we now afloat,"
-selection start: position 37 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 1 of child 2 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderText {#text} at (0,0) size 17x30
+ text run at (0,0) width 17: "U"
+ RenderBlock (anonymous) at (0,146) size 784x0
+ RenderBlock {DIV} at (0,146) size 784x58 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 17x30
+ text run at (14,14) width 17: "U"
+ RenderText {#text} at (31,14) size 365x30
+ text run at (31,14) width 365: "pon such a full sea are we now afloat,"
+caret: position 1 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt
index 9219565..61a1596 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-010-expected.txt
@@ -8,5 +8,13 @@ layer at (0,0) size 800x600
text run at (14,14) width 348: "There is a tide in the affairs of men."
RenderBR {BR} at (362,37) size 0x0
RenderBR {BR} at (14,44) size 0x30
- RenderBR {BR} at (14,74) size 0x30
-caret: position 0 of child 3 {BR} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderText {#text} at (14,74) size 74x30
+ text run at (14,74) width 74: "of men."
+ RenderText {#text} at (88,74) size 74x30
+ text run at (88,74) width 74: "of men."
+ RenderBlock (anonymous) at (0,118) size 784x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+caret: position 7 of child 4 {#text} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-015-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-015-expected.txt
index 2ea5011..fc08d8e 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-text-015-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-text-015-expected.txt
@@ -3,10 +3,22 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 784x88
- RenderBlock {DIV} at (0,0) size 784x88 [border: (2px solid #FF0000)]
- RenderBlock {P} at (14,14) size 756x30
- RenderBR {BR} at (0,0) size 0x30
- RenderBlock {P} at (14,44) size 756x30
- RenderBR {BR} at (0,0) size 0x30
-caret: position 0 of child 0 {BR} of child 1 {P} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+ RenderBlock {DIV} at (0,0) size 784x148
+ RenderBlock {DIV} at (0,0) size 784x148 [border: (2px solid #FF0000)]
+ RenderBlock {P} at (14,14) size 756x120
+ RenderBlock {P} at (0,0) size 756x30
+ RenderText {#text} at (0,0) size 32x30
+ text run at (0,0) width 32: "foo"
+ RenderBlock {P} at (0,30) size 756x30
+ RenderText {#text} at (0,0) size 31x30
+ text run at (0,0) width 31: "bar"
+ RenderBlock (anonymous) at (0,60) size 756x0
+ RenderBlock {P} at (0,60) size 756x60
+ RenderBlock {P} at (0,0) size 756x30
+ RenderText {#text} at (0,0) size 32x30
+ text run at (0,0) width 32: "foo"
+ RenderBlock {P} at (0,30) size 756x30
+ RenderText {#text} at (0,0) size 31x30
+ text run at (0,0) width 31: "bar"
+ RenderBlock (anonymous) at (0,60) size 756x0
+caret: position 3 of child 0 {#text} of child 1 {P} of child 2 {P} of child 0 {P} of child 1 {DIV} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-xml-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-xml-expected.txt
index 57818d1..db5709d 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/paste-xml-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/paste-xml-expected.txt
@@ -4,8 +4,12 @@ layer at (0,0) size 800x74
RenderBlock {html} at (0,0) size 800x74
RenderBody {body} at (8,8) size 784x58
RenderBlock {div} at (0,0) size 784x58 [border: (2px solid #FF0000)]
- RenderInline {span} at (0,0) size 109x30
- RenderText {#text} at (14,14) size 109x30
- text run at (14,14) width 109: "foo bar baz"
+ RenderInline {span} at (0,0) size 140x30
+ RenderText {#text} at (14,14) size 69x30
+ text run at (14,14) width 69: "foo bar"
+ RenderText {#text} at (83,14) size 31x30
+ text run at (83,14) width 31: "bar"
+ RenderText {#text} at (114,14) size 40x30
+ text run at (114,14) width 40: " baz"
RenderText {#text} at (0,0) size 0x0
-caret: position 7 of child 0 {#text} of child 1 {span} of child 1 {div} of child 3 {body} of child 1 {html} of document
+caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of child 3 {body} of child 1 {html} of document
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/select-element-1-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/select-element-1-expected.txt
deleted file mode 100644
index 8017bb0..0000000
--- a/LayoutTests/platform/gtk/editing/pasteboard/select-element-1-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-CONSOLE MESSAGE: line 43: TypeError: Result of expression 'select' [null] is not an object.
-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 473x20
- text run at (0,0) width 253: "This tests copy/paste of select elements. "
- text run at (253,0) width 220: "All the options should be included."
- RenderBlock {DIV} at (0,36) size 784x20
- RenderInline {SPAN} at (0,0) size 0x20 [bgcolor=#FFFFFF]
- RenderBR {BR} at (0,0) size 0x20
- RenderBlock {DIV} at (0,56) size 784x20
- RenderBlock {UL} at (0,92) size 784x20
- RenderListItem {LI} at (40,0) size 744x20
- RenderListMarker at (-18,0) size 7x20: bullet
- RenderText {#text} at (0,0) size 43x20
- text run at (0,0) width 43: "Passed"
-caret: position 0 of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list