summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
2 files changed, 5 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 250101e..ed72c14 100644
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ vars = {
"sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "139660",
+ "webkit_revision": "139696",
"chromium_git": "https://chromium.googlesource.com",
"chromiumos_git": "https://chromium.googlesource.com/chromiumos",
"swig_revision": "69281",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index aac689b..38ef845 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -32,7 +32,8 @@
#
# EVERYTHING BELOW THIS LINE WILL BE DELETED AT EVERY WEBKIT DEPS ROLL
-webkit.org/b/103140 inspector/console/command-line-api-inspect.html [ Skip ]
-webkit.org/b/103140 inspector/runtime/runtime-localStorage-getProperties.html [ Skip ]
+# These were rebaselined in r139708, skipping until we roll past that
+BUG(dominicc) scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html [ Skip ]
+BUG(dominicc) scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html [ Skip ]
-crbug.com/164689 http/tests/media/video-buffered-range-contains-currentTime.html [ ImageOnlyFailure ]
+webkit.org/b/106869 [ Lion Debug ] fast/mediastream/RTCPeerConnection-events.html [ Crash ]