summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:39:47 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:39:47 +0000
commit1e59d767e37888d61dbee21a3ef6d52409e21ea5 (patch)
tree791b764d41fbcdfec6e099f63b66951de30c34ab /webkit
parent90b9cd7885a04a15543a9b2bb16382724f88c39e (diff)
downloadchromium_src-1e59d767e37888d61dbee21a3ef6d52409e21ea5.zip
chromium_src-1e59d767e37888d61dbee21a3ef6d52409e21ea5.tar.gz
chromium_src-1e59d767e37888d61dbee21a3ef6d52409e21ea5.tar.bz2
Add regressions from the merge. They're most likely
from http://trac.webkit.org/changeset/47906 and probably just need a rebaseline. I'll look into this after the tree is green. TBR=michaeln@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/183023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e4e57a4..86ce457 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2469,3 +2469,6 @@ BUG_JORLOW : LayoutTests/editing/pasteboard/files-during-page-drags.html = FAIL
// This newly added test times out on Mac:
BUG20438 MAC : chrome/plugins/get-url-with-iframe-target.html = TIMEOUT
BUG20438 MAC : chrome/plugins/get-url-with-iframe-target-no-crash.html = TIMEOUT
+
+BUG_OJAN WIN LINUX : LayoutTests/fast/css/remove-shorthand.html = FAIL
+BUG_OJAN WIN LINUX : LayoutTests/fast/inspector/style.html = FAIL