summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 21:06:13 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 21:06:13 +0000
commite1b1a5fa61da772666bf58632979776f0651c981 (patch)
treea01565cc0691070cb88ced524bcb98f23633dc79
parenta9b00acc0c03fff42673e3eb0d953768640a5fb1 (diff)
downloadchromium_src-e1b1a5fa61da772666bf58632979776f0651c981.zip
chromium_src-e1b1a5fa61da772666bf58632979776f0651c981.tar.gz
chromium_src-e1b1a5fa61da772666bf58632979776f0651c981.tar.bz2
WebKit merge 45134:45176
BUG=none TEST=none Review URL: http://codereview.chromium.org/148005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19286 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 80b437a..03cc89c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "45134",
+ "webkit_revision": "45176",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c68e062..7ca0ae0 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2794,6 +2794,10 @@ BUG15270 : LayoutTests/fast/dom/HTMLDataGridElement/DataGridColumns-basic.html =
BUG15296 : LayoutTests/dom/html/level2/html/HTMLTableElement10.html = CRASH
+// WebKit 45134:45176
+BUG15403 : LayoutTests/http/tests/security/clipboard/clipboard-file-access.html = FAIL
+
+
// Flaky for a while on DEBUG
BUG15267 WIN LINUX DEBUG : LayoutTests/transitions/cancel-transition.html = PASS FAIL
BUG15266 WIN DEBUG : LayoutTests/media/video-display-toggle.html = TIMEOUT PASS