diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 16:23:51 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 16:23:51 +0000 |
| commit | a7d94269905bb49fa0fb349a93d23ef121a96db0 (patch) | |
| tree | f1ad1be21092810cbe204942758228359d4ed927 /webkit | |
| parent | cc4502607a6519d923ba71170e48768d54bdec8c (diff) | |
| download | chromium_src-a7d94269905bb49fa0fb349a93d23ef121a96db0.zip chromium_src-a7d94269905bb49fa0fb349a93d23ef121a96db0.tar.gz chromium_src-a7d94269905bb49fa0fb349a93d23ef121a96db0.tar.bz2 | |
New baselines for webkit background color formatting change during editing
Webkit patch (http://trac.webkit.org/changeset/47008) preserves background color during editing, update related chromium baselines.
BUG=18995
TEST=Layout tests
Review URL: http://codereview.chromium.org/172070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
4 files changed, 3 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/select-element-1-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/select-element-1-expected.txt index db9ffbe..e80e438 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/select-element-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/select-element-1-expected.txt @@ -30,7 +30,7 @@ layer at (0,0) size 800x600 text run at (244,0) width 207: "All the options should be included." RenderBlock {DIV} at (0,36) size 784x16 RenderInline {FONT} at (0,0) size 0x16 - RenderInline {SPAN} at (0,0) size 0x16 + RenderInline {SPAN} at (0,0) size 0x16 [bgcolor=#DDDDDD] RenderBR {BR} at (0,0) size 0x16 RenderBlock {DIV} at (0,52) size 784x22 RenderMenuList {SELECT} at (2,2) size 55x18 [bgcolor=#DDDDDD] diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5994480-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5994480-2-expected.txt index 47dc7ec..782a165 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5994480-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5994480-2-expected.txt @@ -1 +1 @@ -<font class="Apple-style-span" face="Arial" size="3"><span class="Apple-style-span" style="font-size: 13px;"><br></span></font> +<font class="Apple-style-span" face="Arial" size="3"><span class="Apple-style-span" style="background-color: rgb(255, 255, 255); font-size: 13px;"><br></span></font> diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt index ee83e04..8eda5cf 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/select-element-1-expected.txt @@ -30,7 +30,7 @@ layer at (0,0) size 800x600 text run at (244,0) width 207: "All the options should be included." RenderBlock {DIV} at (0,36) size 784x16 RenderInline {FONT} at (0,0) size 0x16 - RenderInline {SPAN} at (0,0) size 0x16 + RenderInline {SPAN} at (0,0) size 0x16 [bgcolor=#FFFFFF] RenderBR {BR} at (0,0) size 0x16 RenderBlock {DIV} at (0,52) size 784x24 RenderMenuList {SELECT} at (2,2) size 57x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)] diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 4d801a9..4188ceb 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2792,10 +2792,6 @@ BUG18939 MAC : LayoutTests/fast/dom/offset-parent-positioned-and-inline.html = C // Flakiness from WebKit merge to 46977 BUG18966 LINUX : LayoutTests/fast/overflow/overflow-float-stacking.html = PASS CRASH -// Fallout from webkit roll 46977:47010 -BUG18995 LINUX WIN : LayoutTests/editing/inserting/5994480-2.html = FAIL -BUG18995 LINUX WIN : LayoutTests/editing/pasteboard/select-element-1.html = FAIL - // Fallout from webkit roll 47010:47034 BUG19028 MAC : LayoutTests/fast/dom/Window/window-open-parent-no-parent.html = PASS CRASH |