summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-11 01:57:36 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-11 01:57:36 +0000
commitfc2079586499395b20194bc160069b031835431e (patch)
tree3466f72ee1b5d11421da5ec105f86719c354562e
parent6bf1a81cdfcc48f20cf53c2601f4456f2d9d30ef (diff)
downloadchromium_src-fc2079586499395b20194bc160069b031835431e.zip
chromium_src-fc2079586499395b20194bc160069b031835431e.tar.gz
chromium_src-fc2079586499395b20194bc160069b031835431e.tar.bz2
Roll webkit to r45738
* some minor new test expectation failures for the reviewers to take a look at BUG=16410,16241 TESTS=none Review URL: http://codereview.chromium.org/155402 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20454 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index da346461..c70247b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "45685",
+ "webkit_revision": "45738",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index dba51f0..68051c5 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2823,3 +2823,7 @@ BUG16355 LINUX : LayoutTests/fast/forms/slider-delete-while-dragging-thumb.html
BUG16410 : LayoutTests/fast/workers/worker-cloneport.html = FAIL CRASH
BUG16410 : LayoutTests/fast/workers/worker-messageport-gc.html = FAIL CRASH
BUG16410 : LayoutTests/fast/workers/worker-messageport.html = FAIL CRASH
+
+// WebKit merge 45685:45738
+BUG16241 : LayoutTests/fast/dom/anchor-toString.html = FAIL
+BUG16410 : LayoutTests/http/tests/security/MessagePort/event-listener-context.html = FAIL