Auto merge of #20119 - servo-wpt-sync:wpt_update_24-02-2018, r=jdm

Sync WPT with upstream (24-02-2018)

Automated downstream sync of changes from upstream as of 24-02-2018.
[no-wpt-sync]

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20119)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-02-24 22:39:57 -05:00 committed by GitHub
commit 072badabac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions

View file

@ -570423,7 +570423,7 @@
"manual"
],
"mediacapture-streams/MediaStreamTrack-getCapabilities.https.html": [
"06662744434126b87eb1934504b53953419825cb",
"46cb0bc6251db37a40179d7938b0e1667c9fece4",
"testharness"
],
"mediacapture-streams/MediaStreamTrack-getSettings.https.html": [

View file

@ -0,0 +1,2 @@
[vh_not_refreshing_on_chrome.html]
expected: FAIL

View file

@ -1,8 +1,7 @@
<!doctype html>
<title>MediaStreamTrack GetCapabilities</title>
<p class="instructions">This test checks for the presence of
<code>echoCancellation</code> and <code>deviceId</code> fields
in <code>MediaStreamTrack.getCapabilities()</code> method.</p>
<p class="instructions">This test checks for the presence of audio and video properties in
<code>MediaStreamTrack.getCapabilities()</code> method.</p>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script>
@ -13,5 +12,18 @@ in <code>MediaStreamTrack.getCapabilities()</code> method.</p>
assert_true(undefined !== capabilities.deviceId, "MediaTrackCapabilities's deviceId should exist.");
assert_true(undefined !== capabilities.echoCancellation, "MediaTrackCapabilities's echoCancellation should exist.");
});
});
});
promise_test(() => {
return navigator.mediaDevices.getUserMedia({video: true})
.then(stream => {
var capabilities = stream.getVideoTracks()[0].getCapabilities();
assert_true(undefined !== capabilities.deviceId, "MediaTrackCapabilities's deviceId should exist.");
assert_true(undefined !== capabilities.width, "MediaTrackCapabilities's width should exist.");
assert_true(undefined !== capabilities.height, "MediaTrackCapabilities's height should exist.");
assert_true(undefined !== capabilities.aspectRatio, "MediaTrackCapabilities's aspectRatio should exist.");
assert_true(undefined !== capabilities.frameRate, "MediaTrackCapabilities's frameRate should exist.");
assert_true(undefined !== capabilities.facingMode, "MediaTrackCapabilities's facingMode should exist.");
});
});
</script>