summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-17 20:56:00 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-17 20:57:01 +0000
commitc3a2f54b34e025834912b25a5dff06275c0eb222 (patch)
tree5eb7faec312d9f4e9108c546e86049b5f7522d8c
parente06ff5885d09dbd955877b731c9cbc531b0adf5f (diff)
downloadchromium_src-c3a2f54b34e025834912b25a5dff06275c0eb222.zip
chromium_src-c3a2f54b34e025834912b25a5dff06275c0eb222.tar.gz
chromium_src-c3a2f54b34e025834912b25a5dff06275c0eb222.tar.bz2
w3c deps roll for layout tests: update DEPS
This is patch 2 of 4 (and contains the actual roll). TBR=phoglund@chromium.org, jsbell@chromium.org, cmumford@chromium.org BUG=404303, 404305 Review URL: https://codereview.chromium.org/480673002 Cr-Commit-Position: refs/heads/master@{#290193} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290193 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS4
-rw-r--r--webkit/tools/layout_tests/test_expectations_w3c.txt17
2 files changed, 19 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 3c2b015..25dde14 100644
--- a/DEPS
+++ b/DEPS
@@ -119,11 +119,11 @@ deps = {
"src/third_party/WebKit/LayoutTests/w3c/web-platform-tests":
Var("chromium_git") +
- "/external/w3c/web-platform-tests.git@6c7bd34e408ff69687a95d75b7e562fa84148997",
+ "/external/w3c/web-platform-tests.git@fd608375f09b02b54ccba4e99be8365769be43c5",
"src/third_party/WebKit/LayoutTests/w3c/csswg-test":
Var("chromium_git") +
- "/external/w3c/csswg-test.git@f9b9daa33eac525923e941333d389fcb42f9b19f",
+ "/external/w3c/csswg-test.git@0b12ea22689ee2179f3e9bff389db22f4efd6ed5",
"src/third_party/icu":
"/trunk/deps/third_party/icu52@287122",
diff --git a/webkit/tools/layout_tests/test_expectations_w3c.txt b/webkit/tools/layout_tests/test_expectations_w3c.txt
index 9b03ce1..8976a41 100644
--- a/webkit/tools/layout_tests/test_expectations_w3c.txt
+++ b/webkit/tools/layout_tests/test_expectations_w3c.txt
@@ -11,3 +11,20 @@
# Expectations to upstream into blink after the next W3C roll has rolled into Blink.
#
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/introduction/disabled-audio-silence.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/introduction/disabled-video-black.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/mediastream/mediastream-id-manual.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-end.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-init.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/video-and-audio-tracks/audiostreamtrack.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/video-and-audio-tracks/videostreamtrack.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/mediastreams-as-media-elements/video-assignment-manual.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/mediastream/audio.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/mediastream/mediastream-finished-add.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/mediastream/mediastream-idl.html [ Skip ]
+crbug.com/387740 w3c/web-platform-tests/mediacapture-streams/stream-api/mediastream/mediastream-removetrack.html [ Skip ]
+
+crbug.com/404303 w3c/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/empty-option-param.html [ Failure ]
+crbug.com/404303 w3c/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-optional-constraint.html [ Failure ]
+crbug.com/404303 w3c/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-trivial-constraint.html [ Failure ]
+crbug.com/404303 w3c/web-platform-tests/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/unknownkey-option-param.html [ Failure ]