summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 11:36:47 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 11:36:47 +0000
commita5fee3ea763cef4609d9170c08a228cb4cee3fc6 (patch)
tree3e8378d52f0056549c8e9bd55512c144026095b8
parent6f63f0abf04683073db481e6f0abca8752aae88e (diff)
downloadchromium_src-a5fee3ea763cef4609d9170c08a228cb4cee3fc6.zip
chromium_src-a5fee3ea763cef4609d9170c08a228cb4cee3fc6.tar.gz
chromium_src-a5fee3ea763cef4609d9170c08a228cb4cee3fc6.tar.bz2
WebKit merge 65571:65599.
TBR=johnnyg BUG=none TEST=none Review URL: http://codereview.chromium.org/3152030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56514 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
2 files changed, 1 insertions, 11 deletions
diff --git a/DEPS b/DEPS
index a12659d..08ca02c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "65571",
+ "webkit_revision": "65599",
"ffmpeg_revision": "56386",
"skia_revision": "593",
"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 e1fdd06..0ca4cc3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -4,13 +4,3 @@
//
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
-
-// WebKit merge 65318:65411
-// r65381 is suspected. This test causes the next one to crash.
-BUGJAPHET SKIP : fast/events/popup-allowed-from-gesture-initiated-form-submit.html = PASS
-
-// Not sure when it started to fail.
-BUGYUTAK WIN LINUX DEBUG : http/tests/misc/image-blocked-src-change.html = PASS TEXT
-
-// Started to crash around Chromium r56408.
-BUGYUTAK LINUX RELEASE : fast/js/array-every.html = PASS CRASH