summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 21:48:28 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 21:48:28 +0000
commit75770d7ad9e3640339da08020b9879eac45bd265 (patch)
treec79a557bed19490f63b26ab16d5ac90e16a706a3 /webkit
parent8f704c814eb2f513ead209887f38c55eea34b636 (diff)
downloadchromium_src-75770d7ad9e3640339da08020b9879eac45bd265.zip
chromium_src-75770d7ad9e3640339da08020b9879eac45bd265.tar.gz
chromium_src-75770d7ad9e3640339da08020b9879eac45bd265.tar.bz2
* Rebaseline for LayoutTests/editing/selection/5057506.html
The text differences came from webkit r38735 (enables selection of trailing whitespace for Chromium only) and Chromium r7157 (i think the windows results file got rebaselined from linux output). Review URL: http://codereview.chromium.org/17279 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.pngbin8092 -> 8107 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt60
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt2
4 files changed, 32 insertions, 32 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.checksum
index daedc87..f89ad0d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.checksum
@@ -1 +1 @@
-b489804ef9a9dbcde640a76920328be1 \ No newline at end of file
+52c8e2bddf2a36362fd455dd7206c667 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.png
index bd8eb45..26e18a1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt
index 77edce2..3658a7e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/5057506-expected.txt
@@ -1,30 +1,30 @@
-ALERT: 33
-ALERT: 136.5
-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 784x584
- RenderBlock {P} at (0,0) size 784x80
- RenderText {#text} at (0,0) size 771x79
- text run at (0,0) width 477: "This tests double clicking after the last character in the last cell of a block table. "
- text run at (477,0) width 294: "The paragraph break (the space between the last"
- text run at (0,20) width 448: "character and the first character in the next paragraph) should be selected. "
- text run at (448,20) width 272: "Selection painting problems might prevent the"
- text run at (0,40) width 373: "paragraph break from appearing as selected even though it is. "
- text run at (373,40) width 377: "To test manually, double click inside the table cell, after the last"
- text run at (0,60) width 152: "character, and hit delete. "
- text run at (152,60) width 265: "Afterward, the table should contain 'foobar'."
- RenderBlock {DIV} at (0,96) size 784x50
- RenderTable {TABLE} at (0,0) size 110x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 108x28
- RenderTableRow {TR} at (0,2) size 108x24
- RenderTableCell {TD} at (2,2) size 104x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (2,2) size 20x19
- text run at (2,2) width 20: "foo"
- RenderBlock {DIV} at (0,30) size 784x20
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "bar"
-selection start: position 3 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
-selection end: position 0 of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+ALERT: 33
+ALERT: 116.5
+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 784x584
+ RenderBlock {P} at (0,0) size 784x80
+ RenderText {#text} at (0,0) size 771x79
+ text run at (0,0) width 477: "This tests double clicking after the last character in the last cell of a block table. "
+ text run at (477,0) width 294: "The paragraph break (the space between the last"
+ text run at (0,20) width 448: "character and the first character in the next paragraph) should be selected. "
+ text run at (448,20) width 272: "Selection painting problems might prevent the"
+ text run at (0,40) width 373: "paragraph break from appearing as selected even though it is. "
+ text run at (373,40) width 377: "To test manually, double click inside the table cell, after the last"
+ text run at (0,60) width 152: "character, and hit delete. "
+ text run at (152,60) width 265: "Afterward, the table should contain 'foobar'."
+ RenderBlock {DIV} at (0,96) size 784x50
+ RenderTable {TABLE} at (0,0) size 110x30 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 108x28
+ RenderTableRow {TR} at (0,2) size 108x24
+ RenderTableCell {TD} at (2,2) size 104x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderInline {SPAN} at (0,0) size 20x19
+ RenderText {#text} at (2,2) size 20x19
+ text run at (2,2) width 20: "foo"
+ RenderBlock {DIV} at (0,30) size 784x20
+ RenderText {#text} at (0,0) size 20x19
+ text run at (0,0) width 20: "bar"
+selection start: position 3 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+selection end: position 0 of child 0 {#text} of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index adc34b0..2bb619a 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1356,7 +1356,7 @@ LINUX WIN : LayoutTests/fast/repaint/change-transform.html = FAIL
// MERGE 38653:38729: Expectations changed upstream
// Flaky on Linux, maybe on Windows too?
-LINUX WIN : LayoutTests/editing/selection/5057506.html = PASS FAIL
+LINUX : LayoutTests/editing/selection/5057506.html = PASS FAIL
LINUX WIN : LayoutTests/editing/inserting/insert-before-link-1.html = FAIL
LINUX : LayoutTests/editing/execCommand/19089.html = FAIL
LINUX : LayoutTests/fast/block/positioning/047.html = FAIL