summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 18:48:42 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 18:48:42 +0000
commit3b0c65988ddc0415c17e66e4f2ca78f0487c8dd6 (patch)
tree7f9d1232d3af09c20fb1c2168ddb5f37959932ee
parente0b6f625305d268107f904d92e28d38241223be1 (diff)
downloadchromium_src-3b0c65988ddc0415c17e66e4f2ca78f0487c8dd6.zip
chromium_src-3b0c65988ddc0415c17e66e4f2ca78f0487c8dd6.tar.gz
chromium_src-3b0c65988ddc0415c17e66e4f2ca78f0487c8dd6.tar.bz2
Roll webkit revision 48061
TBR=japhet TEST=none BUG=none Review URL: http://codereview.chromium.org/201025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25482 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
2 files changed, 10 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index d3b7d41..1f23304 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "48034",
+ "webkit_revision": "48061",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7cdb215..12925e1 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2298,7 +2298,7 @@ BUG20265 LINUX : LayoutTests/fast/css/pseudo-required-optional-005.html = CRASH
BUG20265 LINUX : LayoutTests/fast/forms/ValidityState-valueMissing-005.html = CRASH
BUG20265 LINUX : LayoutTests/fast/forms/range-default-value.html = CRASH
BUG20265 LINUX : LayoutTests/fast/forms/range-reset.html = CRASH
-BUG20265 LINUX : LayoutTests/platform/mac/accessibility/slider-supports-actions.html = CRASH
+BUG20265 LINUX : LayoutTests/platform/mac/accessibility/slider-supports-actions.html = CRASH FAIL
// WebKit 47777:47790 - getOwnPropertyDescriptor
BUG20345 : LayoutTests/fast/js/getOwnPropertyDescriptor.html = FAIL
@@ -2353,3 +2353,11 @@ BUG20995 SKIP : LayoutTests/storage/statement-error-callback.html = FAIL
BUG21033 : LayoutTests/fast/events/message-port-multi.html = TIMEOUT
BUG21033 : LayoutTests/fast/dom/Window/window-postmessage-args.html = FAIL
BUG21033 WIN LINUX : LayoutTests/fast/events/init-events.html = FAIL
+
+// WebKit 48034:48061
+BUG_VICTORW : LayoutTests/userscripts/script-run-at-end.html = FAIL
+BUG_VICTORW : LayoutTests/fast/events/pageshow-pagehide-on-back-cached-with-frames.html = TIMEOUT
+BUG_VICTORW : LayoutTests/fast/dom/DOMImplementation/detached-doctype.html = CRASH
+BUG_VICTORW LINUX : LayoutTests/fast/forms/select-double-onchange.html = FAIL
+BUG_VICTORW LINUX : LayoutTests/fast/forms/select-script-onchange.html = FAIL
+BUG_VICTORW MAC LINUX : LayoutTests/http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-sub-frame-2-level.html = CRASH