summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 22:43:37 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 22:43:37 +0000
commit42f1cf254b4ed6a21f126d750aba19ba840f002a (patch)
tree5a6f4ccf65c741cfa1ea0f1728613597c7830528 /webkit
parentc77043fc18d43d6e858ec0920a5801438eae566f (diff)
downloadchromium_src-42f1cf254b4ed6a21f126d750aba19ba840f002a.zip
chromium_src-42f1cf254b4ed6a21f126d750aba19ba840f002a.tar.gz
chromium_src-42f1cf254b4ed6a21f126d750aba19ba840f002a.tar.bz2
WebKit DEPS roll 47575:47591
TBR=jianli BUG=none TEST=none Review URL: http://codereview.chromium.org/173134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index d841613..5060f6e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2888,7 +2888,6 @@ BUG19766 WIN LINUX : LayoutTests/tables/mozilla_expected_failures/bugs/bug72393.
BUG19766 WIN LINUX : LayoutTests/tables/mozilla_expected_failures/bugs/bug89315.html = FAIL
BUG19766 WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/backgr_border-table-quirks.html = FAIL
BUG19766 WIN LINUX : LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom.html = FAIL
-BUG19766 WIN : LayoutTests/media/progress-event-at-least-one.html = TIMEOUT
BUG19766 WIN : LayoutTests/media/video-no-audio.html = TIMEOUT
BUG19766 : LayoutTests/storage/open-database-while-transaction-in-progress.html = TIMEOUT
BUG19766 LINUX : LayoutTests/fast/replaced/width100percent-menulist.html = FAIL
@@ -2912,3 +2911,11 @@ BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-h
BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains.html = TIMEOUT
BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses.html = TIMEOUT
BUG19835 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-subdomains.html = TIMEOUT
+
+// WebKit merge 47575:47591 new test, needs baselines. WebKit change http://trac.webkit.org/changeset/47590
+BUG_DIMICH LINUX WIN : LayoutTests/fast/repaint/inline-block-resize.html = FAIL
+
+// WebKit merge 47575:47591 updated test, perhaps needs rebaseline on Win.
+// WebKit change http://trac.webkit.org/changeset/47579
+// This test timed out before, not it appears to run but fail.
+BUG_DIMICH WIN : LayoutTests/media/progress-event-at-least-one.html = FAIL TIMEOUT