summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 00:03:46 +0000
committerojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 00:03:46 +0000
commitd08c1ce190399274f7943f3e30464bf2021ae773 (patch)
tree3dab4f3183f363789674515a5ebe3fee1c1b3625
parent1c0805688f2d0250630484b39566bc8761d6700d (diff)
downloadchromium_src-d08c1ce190399274f7943f3e30464bf2021ae773.zip
chromium_src-d08c1ce190399274f7943f3e30464bf2021ae773.tar.gz
chromium_src-d08c1ce190399274f7943f3e30464bf2021ae773.tar.bz2
WebKit roll 57243:57305
Review URL: http://codereview.chromium.org/1619007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44026 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
2 files changed, 1 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index f5b0339..4fcbcc6 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "57243",
+ "webkit_revision": "57305",
"ffmpeg_revision": "43776",
"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 d444054..79d06e8 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -25,5 +25,3 @@ BUG39855 SLOW DEBUG : editing/selection/extend-selection.html = PASS
BUG40619 MAC : media/video-played-collapse.html = PASS FAIL
BUG40619 : media/video-seek-past-end-playing.html = PASS FAIL TIMEOUT
BUG40619 : media/video-seeking.html = PASS FAIL TIMEOUT
-
-BUG_OJAN MAC SKIP : fast/media/media-feature-wgt-view-mode.html = FAIL