summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 06:34:52 +0000
committertkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 06:34:52 +0000
commit24a09cf354e5b96af790f4771ce745949633f9a1 (patch)
tree74b7267621eaf0b3743af2f1843a49a62766d9e0
parentddc56f01f9cd23420a7215ffd39bef2ecd0e4d53 (diff)
downloadchromium_src-24a09cf354e5b96af790f4771ce745949633f9a1.zip
chromium_src-24a09cf354e5b96af790f4771ce745949633f9a1.tar.gz
chromium_src-24a09cf354e5b96af790f4771ce745949633f9a1.tar.bz2
WebKit roll 61629:61653
BUG=none TEST=none TBR=hclam Review URL: http://codereview.chromium.org/2868026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50577 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 f0752dd..f995663 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "61629",
+ "webkit_revision": "61653",
"ffmpeg_revision": "49485",
"skia_revision": "582",
"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 0ca4cc3..744f2b1 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -4,3 +4,5 @@
//
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
+
+BUG47259 WIN : http/tests/local/blob/send-data-blob.html = TEXT