Backed out changeset 92a49962cec3 (bug 1278198)
authorIris Hsiao <ihsiao@mozilla.com>
Fri, 22 Jul 2016 12:06:59 +0800
changeset 346159 7f0562848c05433431f3c703edd151f24498a99f
parent 346158 2fde7d567703239e015308cbd7be202394153482
child 346160 91c303acd4a35b47db19c2670013d87269fd953d
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1278198
milestone50.0a1
backs out92a49962cec316bfb96ad398830119c3648915e6
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 92a49962cec3 (bug 1278198)
dom/webidl/MediaKeySystemAccess.webidl
dom/webidl/MediaKeys.webidl
--- a/dom/webidl/MediaKeySystemAccess.webidl
+++ b/dom/webidl/MediaKeySystemAccess.webidl
@@ -5,35 +5,28 @@
  *
  * The origin of this IDL file is
  * https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html
  *
  * Copyright © 2014 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved.
  * W3C liability, trademark and document use rules apply.
  */
 
-enum MediaKeysRequirement {
-  "required",
-  "optional",
-  "not-allowed"
-};
-
 dictionary MediaKeySystemMediaCapability {
    DOMString contentType = "";
-   DOMString robustness = "";
+   // TODO: robustness
 };
 
 dictionary MediaKeySystemConfiguration {
   DOMString                               label = "";
-  sequence<DOMString>                     initDataTypes = [];
-  sequence<MediaKeySystemMediaCapability> audioCapabilities = [];
-  sequence<MediaKeySystemMediaCapability> videoCapabilities = [];
-  MediaKeysRequirement                    distinctiveIdentifier = "optional";
-  MediaKeysRequirement                    persistentState = "optional";
-  sequence<DOMString>                     sessionTypes;
+  sequence<DOMString>                     initDataTypes;
+  sequence<MediaKeySystemMediaCapability> audioCapabilities;
+  sequence<MediaKeySystemMediaCapability> videoCapabilities;
+
+   // TODO: distinctiveIdentifier, persistentState, sessionTypes  
 };
 
 [Pref="media.eme.apiVisible"]
 interface MediaKeySystemAccess {
   readonly    attribute DOMString keySystem;
   [NewObject]
   MediaKeySystemConfiguration getConfiguration();
   [NewObject]
--- a/dom/webidl/MediaKeys.webidl
+++ b/dom/webidl/MediaKeys.webidl
@@ -5,26 +5,20 @@
  *
  * The origin of this IDL file is
  * https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html
  *
  * Copyright © 2014 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved.
  * W3C liability, trademark and document use rules apply.
  */
 
-// Note: "persistent-usage-record" session type is unsupported yet, as
-// it's marked as "at risk" in the spec, and Chrome doesn't support it. 
-enum MediaKeySessionType {
-  "temporary",
-  "persistent-license",
-  // persistent-usage-record,
-};
+enum SessionType { "temporary", "persistent" };
 
 [Pref="media.eme.apiVisible"]
 interface MediaKeys {
   readonly attribute DOMString keySystem;
 
   [NewObject, Throws]
-  MediaKeySession createSession(optional MediaKeySessionType sessionType = "temporary");
+  MediaKeySession createSession(optional SessionType sessionType = "temporary");
 
   [NewObject]
   Promise<void> setServerCertificate((ArrayBufferView or ArrayBuffer) serverCertificate);
 };