summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplaymobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 01:50:28 +0000
committerplaymobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 01:50:28 +0000
commita2ebc68fd35bf1cfb955a6185b9af84acb1a79a3 (patch)
treec8346528440958f481dbf0d6a02a576cbc9356ce
parent829c2841a0e30b9f08453566ffc52d2c386a9045 (diff)
downloadchromium_src-a2ebc68fd35bf1cfb955a6185b9af84acb1a79a3.zip
chromium_src-a2ebc68fd35bf1cfb955a6185b9af84acb1a79a3.tar.gz
chromium_src-a2ebc68fd35bf1cfb955a6185b9af84acb1a79a3.tar.bz2
Really rebaseline LayoutTests/fast/block/positioning/002.html this time, also more tweaks to test_fixable.
Review URL: http://codereview.chromium.org/57084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12929 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/002-expected.txt2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/002-expected.txt
index e44d226..462ab14 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/002-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/002-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x228
+layer at (0,0) size 800x136
RenderBlock {HTML} at (0,0) size 800x136
RenderBody {BODY} at (8,8) size 784x120
RenderBlock (anonymous) at (0,0) size 784x20
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6577b28..9b2f6c6 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2380,7 +2380,7 @@ MAC : LayoutTests/svg/text/text-intro-05-t.svg = FAIL
// Changed in http://trac.webkit.org/changeset/42082
WIN LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT
-LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
+WIN LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
// Implement layoutTestController.waitForPolicyDelegate
// BUG: 9595