summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 01:55:11 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 01:55:11 +0000
commit23bb58f0db7bc25dea4a9955da1530c90950c7c5 (patch)
treec1e4d4af2ee696533d6aaf71cb3403b7ed0c92d7
parentdd6a184f6ad67921250e3f801a456c5f2ede510b (diff)
downloadchromium_src-23bb58f0db7bc25dea4a9955da1530c90950c7c5.zip
chromium_src-23bb58f0db7bc25dea4a9955da1530c90950c7c5.tar.gz
chromium_src-23bb58f0db7bc25dea4a9955da1530c90950c7c5.tar.bz2
WebKit merge 46126:46141.
BUG=NONE TBR=paul TEST=NONE Review URL: http://codereview.chromium.org/159110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21146 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 a82f0c9..1126cfca 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "46126",
+ "webkit_revision": "46141",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 012fe53..728ad06 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2973,3 +2973,7 @@ BUG17170 : LayoutTests/fast/dom/prototype-inheritance.html = FAIL
// New tests from WebKit merge 46087:46125
BUG17255 LINUX WIN : LayoutTests/fast/box-shadow/spread.html = FAIL
BUG17287 WIN : LayoutTests/media/audio-constructor-autobuffer.html = FAIL
+
+// New test from WebKit merge 46126:46141
+BUG17321 : LayoutTests/fast/loader/non-html-load-event.html = FAIL
+