diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 12:13:11 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 12:13:11 +0000 |
| commit | a5365fc742f781b26d3438d61a8eb38628020159 (patch) | |
| tree | cb5b3478a9023dc4d8952fc82ea65d50768b5eb7 | |
| parent | c0ec883135b26d763520bcc3140695a5009d382d (diff) | |
| download | chromium_src-a5365fc742f781b26d3438d61a8eb38628020159.zip chromium_src-a5365fc742f781b26d3438d61a8eb38628020159.tar.gz chromium_src-a5365fc742f781b26d3438d61a8eb38628020159.tar.bz2 | |
Revert incorrect rebaselining in r8142.
This test looks broken upstream, but we shouldn't rebaseline a test asking to be displayed in Arial with an image displayed in Times New Roman.
See http://codereview.chromium.org/18114 for the original code review and comments.
Review URL: http://codereview.chromium.org/18146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8173 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 21 insertions, 15 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.checksum index 13a3c98..a2291ad 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.checksum @@ -1 +1 @@ -d713a004a9c9ea939a81708894fccf4f
\ No newline at end of file +0b71110f395122f2c2dcd9c449b5d003
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.png Binary files differindex 63642b0..09fb6d4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.txt index f452e36..cd757d4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-default-font-expected.txt @@ -4,19 +4,19 @@ 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 784x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Test for " - RenderInline {I} at (0,0) size 587x19 - RenderInline {A} at (0,0) size 305x19 [color=#0000EE] - RenderText {#text} at (51,0) size 305x19 - text run at (51,0) width 305: "http://bugs.webkit.org/show_bug.cgi?id=16348" - RenderText {#text} at (356,0) size 282x19 - text run at (356,0) width 4: " " - text run at (360,0) width 278: "@font-face does not affect the default style" - RenderText {#text} at (638,0) size 4x19 - text run at (638,0) width 4: "." - RenderBlock (anonymous) at (0,36) size 784x20 - RenderText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This text should be in Arial." + RenderText {#text} at (0,1) size 56x18 + text run at (0,1) width 56: "Test for " + RenderInline {I} at (0,0) size 626x19 + RenderInline {A} at (0,0) size 323x19 [color=#0000EE] + RenderText {#text} at (56,0) size 323x19 + text run at (56,0) width 323: "http://bugs.webkit.org/show_bug.cgi?id=16348" + RenderText {#text} at (379,0) size 303x19 + text run at (379,0) width 4: " " + text run at (383,0) width 299: "@font-face does not affect the default style" + RenderText {#text} at (682,1) size 4x18 + text run at (682,1) width 4: "." + RenderBlock (anonymous) at (0,36) size 784x19 + RenderText {#text} at (0,0) size 184x18 + text run at (0,0) width 184: "This text should be in Arial." RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index b10e918..912c49b 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -304,6 +304,12 @@ DEFER : LayoutTests/fast/js/kde/function_arguments.html = FAIL // error in the header of the following test. DEFER SKIP : LayoutTests/fast/css/disabled-author-styles.html = FAIL +// It looks like the upstream test is incorrectly using font-family: Times +// instead of font-family: times new roman. This broke when we recently moved +// more of our font default settings to 'times new roman' from 'Times'. This +// should be fixed upstream. https://bugs.webkit.org/show_bug.cgi?id=16348 +LINUX WIN : LayoutTests/fast/css/font-face-default-font.html = FAIL + // We don't support dynamic fonts on Linux. // Once we have the sandbox working, we should re-evaluate this. DEFER LINUX : LayoutTests/fast/css/font-face-remote.html = FAIL |
