summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 18:41:05 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 18:41:05 +0000
commit1c07511de3b12813e143f3ca090096991414008d (patch)
tree37e1598b572a14434d184bf5a518b11d6cafa652
parente3f9adeecf13633ff85524cecd429eab671f7506 (diff)
downloadchromium_src-1c07511de3b12813e143f3ca090096991414008d.zip
chromium_src-1c07511de3b12813e143f3ca090096991414008d.tar.gz
chromium_src-1c07511de3b12813e143f3ca090096991414008d.tar.bz2
Fix LayoutTests/editing/style/block-styles-007.html
Expectations changed upstream and we need to match. Review URL: http://codereview.chromium.org/50062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12201 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-styles-007-expected.txt1
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt2
2 files changed, 1 insertions, 2 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-styles-007-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-styles-007-expected.txt
index 884adcd..aee211d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-styles-007-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/block-styles-007-expected.txt
@@ -45,7 +45,6 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (2,2) size 780x28
RenderText {#text} at (0,0) size 32x27
text run at (0,0) width 32: "foo"
- RenderInline {B} at (0,0) size 0x26
RenderBlock {DIV} at (2,30) size 780x27
RenderInline {B} at (0,0) size 36x26
RenderText {#text} at (0,0) size 36x26
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index a5a24dc..0c05c02 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1851,7 +1851,7 @@ WIN DEBUG : LayoutTests/fast/js/large-expressions.html = FAIL
// Merge 41768:41807
// Perhaps just needs new baseline?
-MAC LINUX WIN : LayoutTests/editing/style/block-styles-007.html = FAIL
+MAC LINUX : LayoutTests/editing/style/block-styles-007.html = FAIL
// These tests were rebaselined with failure long ago. We shouldn't do this, and
// instead work upstream to improve tests so that they don't fail.
DEFER : LayoutTests/fast/forms/textarea-appearance-wrap.html = FAIL