diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 21:43:07 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 21:43:07 +0000 |
| commit | aa26febe094b0c76c0c6e1bbd8ced0ce23ebbcf7 (patch) | |
| tree | 3454cd5f53ec487df95d4f402186909e06f9199a | |
| parent | c806036c626e061b0768c234566d384e97644a56 (diff) | |
| download | chromium_src-aa26febe094b0c76c0c6e1bbd8ced0ce23ebbcf7.zip chromium_src-aa26febe094b0c76c0c6e1bbd8ced0ce23ebbcf7.tar.gz chromium_src-aa26febe094b0c76c0c6e1bbd8ced0ce23ebbcf7.tar.bz2 | |
Rebaseline two tests from the last 2 merges. These tests changed upstream.
TBR=dglazkov
Review URL: http://codereview.chromium.org/125215
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18542 0039d316-1c4b-4281-b951-d872f2087c98
9 files changed, 33 insertions, 42 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.checksum index 0c1d651..cf1bedb 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.checksum @@ -1 +1 @@ -f5a6f354697074360aa4cd3cbb5d2723
\ No newline at end of file +620507fcd8981871ca8ad6eb3d5878e5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.png Binary files differindex 5078f67..8628614 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/5368833-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.checksum index c36a7c0..1be3c9f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.checksum @@ -1 +1 @@ -5404c0243384ae1eac943b5f73063fb9
\ No newline at end of file +28e2088937a3300a69187d7be4103817
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.png Binary files differindex 32ecd07..916291b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.txt index 2f24b87..47c0d8c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5368833-expected.txt @@ -8,7 +8,7 @@ layer at (0,0) size 800x600 text run at (0,0) width 425: "We copy and paste a blockquoted paragraph plus a paragraph break. " text run at (425,0) width 354: "The paragraph break shouldn't be inside the blockquote on" text run at (0,20) width 40: "paste. " - text run at (40,20) width 577: "You should see 'hello' (blockquoted), empty paragraph, 'hello' (blockquoted), empty paragraph." + text run at (40,20) width 662: "You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted), empty paragraph." RenderBlock {DIV} at (0,56) size 784x80 RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)] RenderText {#text} at (7,0) size 28x19 @@ -16,12 +16,12 @@ layer at (0,0) size 800x600 RenderBR {BR} at (35,15) size 0x0 RenderBlock (anonymous) at (0,20) size 784x0 RenderBlock {DIV} at (0,20) size 784x20 - RenderInline {FONT} at (0,0) size 0x19 [color=#0000FF] - RenderBR {BR} at (0,0) size 0x19 + RenderText {#text} at (0,0) size 35x19 + text run at (0,0) width 35: "world" RenderBlock {BLOCKQUOTE} at (0,40) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)] RenderText {#text} at (7,0) size 28x19 text run at (7,0) width 28: "hello" RenderBR {BR} at (35,15) size 0x0 RenderBlock (anonymous) at (0,60) size 784x20 RenderBR {BR} at (0,0) size 0x19 -caret: position 0 of child 0 {BR} of child 0 {FONT} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document +caret: position 5 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.checksum index a9d3f46..385cc1c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.checksum @@ -1 +1 @@ -d3767690b2b6aac831594a76ad3c39f2
\ No newline at end of file +c681221c91a37288b5110a88807a779a
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.png Binary files differindex 668ed96..fffed86 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.txt index 13b3b01..a46391b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-attribute-expected.txt @@ -17,22 +17,22 @@ layer at (0,0) size 800x600 layer at (0,0) size 300x150 layerType: foreground only RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (0,0) size 300x150 - RenderTable {TABLE} at (0,0) size 300x12 - RenderTableSection {TBODY} at (0,0) size 300x12 - RenderTableRow {TR} at (0,0) size 300x12 - RenderTableCell {TD} at (0,0) size 31x12 [color=#808080] [bgcolor=#F0F0F0] [border: none (1px solid #BBBBBB) none] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (0,0) size 300x16 + RenderTableSection {TBODY} at (0,0) size 300x16 + RenderTableRow {TR} at (0,0) size 300x16 + RenderTableCell {TD} at (0,3) size 31x12 [color=#808080] [bgcolor=#F0F0F0] [border: none (1px solid #BBBBBB) none] [r=0 c=0 rs=1 cs=1] RenderInline (generated) at (0,0) size 5x12 RenderCounter at (21,0) size 5x12 text run at (21,0) width 5: "1" - RenderTableCell {TD} at (31,1) size 269x10 [r=0 c=1 rs=1 cs=1] - RenderInline {SPAN} at (0,0) size 18x10 [color=#881280] - RenderText {#text} at (5,0) size 18x10 - text run at (5,0) width 18: "<p>" - RenderText {#text} at (23,0) size 66x10 - text run at (23,0) width 66: "hello world" - RenderInline {SPAN} at (0,0) size 24x10 [color=#881280] - RenderText {#text} at (89,0) size 24x10 - text run at (89,0) width 24: "</p>" + RenderTableCell {TD} at (31,0) size 269x16 [r=0 c=1 rs=1 cs=1] + RenderInline {SPAN} at (0,0) size 24x16 [color=#881280] + RenderText {#text} at (5,0) size 24x16 + text run at (5,0) width 24: "<p>" + RenderText {#text} at (29,0) size 88x16 + text run at (29,0) width 88: "hello world" + RenderInline {SPAN} at (0,0) size 32x16 [color=#881280] + RenderText {#text} at (117,0) size 32x16 + text run at (117,0) width 32: "</p>" RenderText {#text} at (304,139) size 4x19 text run at (304,139) width 4: " " RenderPartObject {IFRAME} at (308,0) size 304x154 [border: (2px inset #000000)] @@ -50,22 +50,22 @@ layer at (0,0) size 800x600 layer at (0,0) size 300x150 layerType: foreground only RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (0,0) size 300x150 - RenderTable {TABLE} at (0,0) size 300x12 - RenderTableSection {TBODY} at (0,0) size 300x12 - RenderTableRow {TR} at (0,0) size 300x12 - RenderTableCell {TD} at (0,0) size 31x12 [color=#808080] [bgcolor=#F0F0F0] [border: none (1px solid #BBBBBB) none] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (0,0) size 300x16 + RenderTableSection {TBODY} at (0,0) size 300x16 + RenderTableRow {TR} at (0,0) size 300x16 + RenderTableCell {TD} at (0,3) size 31x12 [color=#808080] [bgcolor=#F0F0F0] [border: none (1px solid #BBBBBB) none] [r=0 c=0 rs=1 cs=1] RenderInline (generated) at (0,0) size 5x12 RenderCounter at (21,0) size 5x12 text run at (21,0) width 5: "1" - RenderTableCell {TD} at (31,1) size 269x10 [r=0 c=1 rs=1 cs=1] - RenderInline {SPAN} at (0,0) size 18x10 [color=#881280] - RenderText {#text} at (5,0) size 18x10 - text run at (5,0) width 18: "<p>" - RenderText {#text} at (23,0) size 66x10 - text run at (23,0) width 66: "hello world" - RenderInline {SPAN} at (0,0) size 24x10 [color=#881280] - RenderText {#text} at (89,0) size 24x10 - text run at (89,0) width 24: "</p>" + RenderTableCell {TD} at (31,0) size 269x16 [r=0 c=1 rs=1 cs=1] + RenderInline {SPAN} at (0,0) size 24x16 [color=#881280] + RenderText {#text} at (5,0) size 24x16 + text run at (5,0) width 24: "<p>" + RenderText {#text} at (29,0) size 88x16 + text run at (29,0) width 88: "hello world" + RenderInline {SPAN} at (0,0) size 32x16 [color=#881280] + RenderText {#text} at (117,0) size 32x16 + text run at (117,0) width 32: "</p>" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 41b6e53..984b789 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2765,12 +2765,3 @@ BUG14061 : LayoutTests/svg/filters/subRegion-two-effects.svg = FAIL // New version of V8. Seems unrelated, see test. BUG14207 LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug28341.html = FAIL - -// WebKit 44682:44699 -// Test expectation changed upstream in -// http://trac.webkit.org/changeset/44695 -BUGMERGE REBASELINE WIN : LayoutTests/fast/frames/viewsource-attribute.html = FAIL - -// WebKit 44699:44726 -// Test expectation changed upstream in r44712 -BUGMERGE REBASELINE WIN : LayoutTests/editing/pasteboard/5368833.html = FAIL |
