Diff
Modified: trunk/LayoutTests/ChangeLog (135031 => 135032)
--- trunk/LayoutTests/ChangeLog 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/ChangeLog 2012-11-17 04:32:55 UTC (rev 135032)
@@ -1,3 +1,15 @@
+2012-11-16 Simon Fraser <simon.fra...@apple.com>
+
+ Rebaseline some editing tests.
+
+ * platform/mac-wk2/editing/selection/caret-ltr-right-expected.txt: Removed.
+ * platform/mac-wk2/editing/selection/caret-rtl-right-expected.txt: Removed.
+ * platform/mac/TestExpectations:
+ * platform/mac/editing/pasteboard/innerText-inline-table-expected.txt:
+ * platform/mac/editing/selection/iframe-expected.txt:
+ * platform/mac/editing/selection/inline-table-expected.txt:
+ * platform/mac/editing/selection/table-caret-3-expected.txt:
+
2012-11-16 David Grogan <dgro...@chromium.org>
IndexedDB: setVersion excision batch 10
Modified: trunk/LayoutTests/platform/mac/TestExpectations (135031 => 135032)
--- trunk/LayoutTests/platform/mac/TestExpectations 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2012-11-17 04:32:55 UTC (rev 135032)
@@ -1075,12 +1075,6 @@
# IETC namespace failures
webkit.org/b/86142 ietestcenter/css3/namespaces/syntax-021.xml [ ImageOnlyFailure ]
-# Rebaseline required after https://bugs.webkit.org/show_bug.cgi?id=84167
-webkit.org/b/84167 editing/pasteboard/innerText-inline-table.html [ Failure ]
-webkit.org/b/84167 editing/selection/iframe.html [ Failure ]
-webkit.org/b/84167 editing/selection/inline-table.html [ Failure ]
-webkit.org/b/84167 editing/selection/table-caret-3.html [ Failure ]
-
# Safari needs to be fixed after bug 84195 updated the layout tests
webkit.org/b/85918 compositing/backface-visibility/backface-visibility-3d.html [ ImageOnlyFailure ]
webkit.org/b/85918 compositing/backface-visibility/backface-visibility-hierarchical-transform.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/platform/mac/editing/pasteboard/innerText-inline-table-expected.txt (135031 => 135032)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/innerText-inline-table-expected.txt 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/innerText-inline-table-expected.txt 2012-11-17 04:32:55 UTC (rev 135032)
@@ -6,29 +6,29 @@
RenderBlock {DIV} at (0,0) size 784x18
RenderText {#text} at (0,0) size 490x18
text run at (0,0) width 490: "Checks that the text iterator is emitting a space before and after an inline table."
- RenderBlock {DIV} at (0,18) size 784x28
- RenderText {#text} at (0,10) size 31x18
- text run at (0,10) width 31: "hello"
+ RenderBlock {DIV} at (0,18) size 784x25
+ RenderText {#text} at (0,7) size 31x18
+ text run at (0,7) width 31: "hello"
RenderTable {TABLE} at (31,0) size 14x24
RenderTableSection {TBODY} at (0,0) size 14x24
RenderTableRow {TR} at (0,2) size 14x20
RenderTableCell {TD} at (2,2) size 10x20 [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 8x18
text run at (1,1) width 8: "1"
- RenderText {#text} at (45,10) size 37x18
- text run at (45,10) width 37: "world"
- RenderBlock {DIV} at (0,46) size 784x28
- RenderText {#text} at (0,10) size 25x18
- text run at (0,10) width 25: "foo "
+ RenderText {#text} at (45,7) size 37x18
+ text run at (45,7) width 37: "world"
+ RenderBlock {DIV} at (0,43) size 784x25
+ RenderText {#text} at (0,7) size 25x18
+ text run at (0,7) width 25: "foo "
RenderTable {TABLE} at (25,0) size 14x24
RenderTableSection {TBODY} at (0,0) size 14x24
RenderTableRow {TR} at (0,2) size 14x20
RenderTableCell {TD} at (2,2) size 10x20 [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 8x18
text run at (1,1) width 8: "2"
- RenderText {#text} at (39,10) size 24x18
- text run at (39,10) width 24: " bar"
- RenderBlock {UL} at (0,90) size 784x18
+ RenderText {#text} at (39,7) size 24x18
+ text run at (39,7) width 24: " bar"
+ RenderBlock {UL} at (0,84) size 784x18
RenderListItem {LI} at (40,0) size 744x18
RenderBlock {PRE} at (0,0) size 744x18
RenderListMarker at (-17,0) size 7x18: bullet
Modified: trunk/LayoutTests/platform/mac/editing/selection/iframe-expected.txt (135031 => 135032)
--- trunk/LayoutTests/platform/mac/editing/selection/iframe-expected.txt 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/platform/mac/editing/selection/iframe-expected.txt 2012-11-17 04:32:55 UTC (rev 135032)
@@ -197,24 +197,24 @@
RenderText {#text} at (0,188) size 48x18
text run at (0,188) width 48: "iframe: "
RenderPartObject {IFRAME} at (48,0) size 402x202 [border: (1px solid #000000)]
- layer at (0,0) size 385x202
- RenderView at (0,0) size 385x200
- layer at (0,0) size 385x202
- RenderBlock {HTML} at (0,0) size 385x202
- RenderBody {BODY} at (8,8) size 369x186
- RenderBlock {P} at (0,0) size 369x90
- RenderText {#text} at (0,0) size 365x90
+ layer at (0,0) size 400x200
+ RenderView at (0,0) size 400x200
+ layer at (0,0) size 400x200
+ RenderBlock {HTML} at (0,0) size 400x200
+ RenderBody {BODY} at (8,8) size 384x184
+ RenderBlock {P} at (0,0) size 384x90
+ RenderText {#text} at (0,0) size 382x90
text run at (0,0) width 316: "This tests caret movement through an inline table. "
text run at (316,0) width 37: "There"
- text run at (0,18) width 365: "should be visual positions before and after the inline table,"
- text run at (0,36) width 142: "as if it were an image. "
- text run at (142,36) width 216: "The caret shouldn't skip across the"
- text run at (0,54) width 348: "table, but should enter it (unless we later decide that we"
- text run at (0,72) width 160: "don't want this behavior)."
- RenderBlock {DIV} at (0,106) size 369x80
- RenderBlock {DIV} at (0,0) size 369x80
- RenderText {#text} at (0,62) size 80x18
- text run at (0,62) width 80: "Inline Table:"
+ text run at (0,18) width 382: "should be visual positions before and after the inline table, as"
+ text run at (0,36) width 125: "if it were an image. "
+ text run at (125,36) width 254: "The caret shouldn't skip across the table,"
+ text run at (0,54) width 380: "but should enter it (unless we later decide that we don't want"
+ text run at (0,72) width 90: "this behavior)."
+ RenderBlock {DIV} at (0,106) size 384x76
+ RenderBlock {DIV} at (0,0) size 384x76
+ RenderText {#text} at (0,9) size 80x18
+ text run at (0,9) width 80: "Inline Table:"
RenderTable {TABLE} at (80,0) size 132x76 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 130x74
RenderTableRow {TR} at (0,2) size 130x22
@@ -247,8 +247,8 @@
RenderTableCell {TD} at (87,50) size 41x22 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 31x18
text run at (2,2) width 31: "Nine"
- RenderText {#text} at (212,62) size 67x18
- text run at (212,62) width 67: "The End..."
+ RenderText {#text} at (212,9) size 67x18
+ text run at (212,9) width 67: "The End..."
RenderText {#text} at (450,188) size 66x18
text run at (450,188) width 66: " the end ..."
caret: position 1 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/mac/editing/selection/inline-table-expected.txt (135031 => 135032)
--- trunk/LayoutTests/platform/mac/editing/selection/inline-table-expected.txt 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/platform/mac/editing/selection/inline-table-expected.txt 2012-11-17 04:32:55 UTC (rev 135032)
@@ -151,10 +151,10 @@
text run at (0,18) width 100: "were an image. "
text run at (100,18) width 664: "The caret shouldn't skip across the table, but should enter it (unless we later decide that we don't want this"
text run at (0,36) width 64: "behavior)."
- RenderBlock {DIV} at (0,70) size 784x80
- RenderBlock {DIV} at (0,0) size 784x80
- RenderText {#text} at (0,62) size 80x18
- text run at (0,62) width 80: "Inline Table:"
+ RenderBlock {DIV} at (0,70) size 784x76
+ RenderBlock {DIV} at (0,0) size 784x76
+ RenderText {#text} at (0,9) size 80x18
+ text run at (0,9) width 80: "Inline Table:"
RenderTable {TABLE} at (80,0) size 132x76 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 130x74
RenderTableRow {TR} at (0,2) size 130x22
@@ -187,6 +187,6 @@
RenderTableCell {TD} at (87,50) size 41x22 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 31x18
text run at (2,2) width 31: "Nine"
- RenderText {#text} at (212,62) size 67x18
- text run at (212,62) width 67: "The End..."
+ RenderText {#text} at (212,9) size 67x18
+ text run at (212,9) width 67: "The End..."
caret: position 1 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/mac/editing/selection/table-caret-3-expected.txt (135031 => 135032)
--- trunk/LayoutTests/platform/mac/editing/selection/table-caret-3-expected.txt 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/platform/mac/editing/selection/table-caret-3-expected.txt 2012-11-17 04:32:55 UTC (rev 135032)
@@ -9,9 +9,9 @@
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 377x18
text run at (0,0) width 377: "This tests the caret position for the caret after an inline table."
- RenderBlock {DIV} at (0,34) size 784x80
- RenderText {#text} at (0,62) size 21x18
- text run at (0,62) width 21: "foo"
+ RenderBlock {DIV} at (0,34) size 784x76
+ RenderText {#text} at (0,9) size 21x18
+ text run at (0,9) width 21: "foo"
RenderTable {TABLE} at (21,0) size 51x76 [border: (1px solid #999999)]
RenderTableSection {TBODY} at (1,1) size 49x74
RenderTableRow {TR} at (0,2) size 49x22
@@ -26,6 +26,6 @@
RenderTableCell {TD} at (2,50) size 45x22 [border: (1px solid #999999)] [r=2 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 41x18
text run at (2,2) width 41: "a table"
- RenderText {#text} at (72,62) size 22x18
- text run at (72,62) width 22: "baz"
+ RenderText {#text} at (72,9) size 22x18
+ text run at (72,9) width 22: "baz"
caret: position 1 of child 1 {TABLE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-wk2/editing/selection/caret-ltr-right-expected.txt (135031 => 135032)
--- trunk/LayoutTests/platform/mac-wk2/editing/selection/caret-ltr-right-expected.txt 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/platform/mac-wk2/editing/selection/caret-ltr-right-expected.txt 2012-11-17 04:32:55 UTC (rev 135032)
@@ -1,19 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x139
- RenderBlock {HTML} at (0,0) size 800x139
- RenderBody {BODY} at (8,16) size 784x115
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 758x36
- text run at (0,0) width 758: "This tests that clicking in a contenteditable div will set the caret in the right position for LTR text in a LTR block. To test"
- text run at (0,18) width 465: "manually, click the right of the text. The caret should be on the right edge."
- RenderBlock {DIV} at (0,52) size 201x45 [border: (1px solid #000000)]
- RenderText {#text} at (11,11) size 74x23
- text run at (11,11) width 74: "WebKit2"
- RenderBlock (anonymous) at (0,97) size 784x18
- RenderText {#text} at (0,0) size 186x18
- text run at (0,0) width 186: "FAIL: selection not collapsed"
- RenderBR {BR} at (186,0) size 0x18
- RenderText {#text} at (0,0) size 0x0
-selection start: position 0 of child 0 {#text} of child 3 {DIV} of body
-selection end: position 7 of child 0 {#text} of child 3 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-wk2/editing/selection/caret-rtl-right-expected.txt (135031 => 135032)
--- trunk/LayoutTests/platform/mac-wk2/editing/selection/caret-rtl-right-expected.txt 2012-11-17 04:19:27 UTC (rev 135031)
+++ trunk/LayoutTests/platform/mac-wk2/editing/selection/caret-rtl-right-expected.txt 2012-11-17 04:32:55 UTC (rev 135032)
@@ -1,19 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x140
- RenderBlock {HTML} at (0,0) size 800x140
- RenderBody {BODY} at (8,16) size 784x116
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 758x36
- text run at (0,0) width 758: "This tests that clicking in a contenteditable div will set the caret in the right position for RTL text in a RTL block. To test"
- text run at (0,18) width 465: "manually, click the right of the text. The caret should be on the right edge."
- RenderBlock {DIV} at (0,52) size 201x46 [border: (1px solid #000000)]
- RenderText {#text} at (118,12) size 72x23
- text run at (118,12) width 72 RTL: "\x{5E9}\x{5D3}\x{5D4} \x{5D1}\x{5D5}\x{5E8}"
- RenderBlock (anonymous) at (0,98) size 784x18
- RenderText {#text} at (0,0) size 186x18
- text run at (0,0) width 186: "FAIL: selection not collapsed"
- RenderBR {BR} at (186,0) size 0x18
- RenderText {#text} at (0,0) size 0x0
-selection start: position 0 of child 0 {#text} of child 3 {DIV} of body
-selection end: position 3 of child 0 {#text} of child 3 {DIV} of body
