summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 18:41:37 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-08 18:41:37 +0000
commit0afa1c4259d103037bbce99a5b52057aaaef4f34 (patch)
treedc4850c87da8e203a6a9a62b71986032b58e745b
parentdde18a7b322825251044240b6af3ae6ace2309dd (diff)
downloadchromium_src-0afa1c4259d103037bbce99a5b52057aaaef4f34.zip
chromium_src-0afa1c4259d103037bbce99a5b52057aaaef4f34.tar.gz
chromium_src-0afa1c4259d103037bbce99a5b52057aaaef4f34.tar.bz2
Webkit Roll to r55670 (from r55654)
TBR=japhet TEST=bots Review URL: http://codereview.chromium.org/669283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40913 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 294fa35..060cd48 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55654",
+ "webkit_revision": "55670",
"ffmpeg_revision": "40718",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index cae7c1c..b251775 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2859,3 +2859,5 @@ BUG37463 MAC DEBUG : svg/custom/transform-ignore-after-invalid.svg = PASS CRASH
// WebKit roll 55512:55584
BUG37540 MAC SKIP : inspector/console-dir.html = CRASH TEXT PASS
+// WebKit roll 55654 -> 55670
+BUG_JIANLI : http/tests/local/send-sliced-dragged-file.html = FAIL