summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 17:36:43 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 17:36:43 +0000
commiteb68e6d11984c17b88ff7cd2dc08378ade8ef111 (patch)
tree73719c4f80753c54541939c5113d1371646ff127
parentcb73f9e24fdf7da411e8861ca6a1c2184569439c (diff)
downloadchromium_src-eb68e6d11984c17b88ff7cd2dc08378ade8ef111.zip
chromium_src-eb68e6d11984c17b88ff7cd2dc08378ade8ef111.tar.gz
chromium_src-eb68e6d11984c17b88ff7cd2dc08378ade8ef111.tar.bz2
Update webkit. Mark some tests as expected to fail due to
out-of-date baselines. I'll cycle back and rebaseline once the bots generate new results. TBR=pkasting TEST=none BUG=none Review URL: http://codereview.chromium.org/160021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21401 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt18
2 files changed, 14 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index b61b929..34e1648 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "46229",
+ "webkit_revision": "46270",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 979a07b..3da7ac2 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2819,11 +2819,6 @@ BUG16779 BUG16742 : LayoutTests/media/video-error-abort.html = FAIL CRASH
// Failing approximately starting from 20629
BUG16754 : LayoutTests/fast/loader/empty-embed-src-attribute.html = CRASH
-// HTML5 DataGrid bindings have not been implemented for V8 yet.
-BUG16730 : LayoutTests/fast/dom/HTMLDataGridElement/DataGridColumns-basic.html = TIMEOUT
-BUG16730 : LayoutTests/fast/dom/HTMLDataGridElement/DataGridColumns-dom.html = TIMEOUT
-BUG16730 : LayoutTests/fast/dom/HTMLDataGridElement/DataGridColumns-dom-attributes.html = FAIL TIMEOUT
-
// Disabling since try bots use Chromium FFmpeg DLLs, which means we can no
// longer decode WebKit's test clips because they use H.264, AAC, etc.
BUG16779 : LayoutTests/media/media-startTime.html = FAIL
@@ -2994,3 +2989,16 @@ BUG17499 MAC : LayoutTests/platform/mac/fast/loader/non-html-load-event.html = C
BUG17509 LINUX : LayoutTests/fast/loader/local-CSS-from-local.html = FAIL
BUG17509 LINUX : LayoutTests/fast/loader/local-JavaScript-from-local.html = FAIL TIMEOUT
BUG17509 LINUX : LayoutTests/fast/loader/local-image-from-local.html = FAIL
+
+// These need new baselines for the merge r46229:46269.
+BUG_DARIN WIN LINUX : LayoutTests/fast/backgrounds/size/backgroundSize20.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/fast/backgrounds/size/backgroundSize21.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/fast/backgrounds/size/backgroundSize22.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/fast/css/remove-shorthand.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/fast/forms/select-popup-pagekeys.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/fast/inspector/style.html = FAIL
+BUG_DARIN WIN LINUX MAC : LayoutTests/http/tests/security/xssAuditor/script-tag-addslashes-null-char.html = FAIL
+BUG_DARIN WIN RELEASE : LayoutTests/media/video-document-types.html = FAIL
+BUG_DARIN WIN LINUX : LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL