Bug 1335555 - Begins removing MediaKeySession.keySystem r?cpearce draft
authorJay Harris <jharris@mozilla.com>
Wed, 01 Feb 2017 13:36:56 +1300
changeset 468903 8fe75ecf1777f02f366a6445a33030d71c7ff765
parent 468498 ee975d32deb9eaa5641f45428cd6a4b5b555a8f5
child 468904 304bf35d44e98373696b8b60cfbef68d68a6db15
child 469182 176295d50c4b79e450a6b8406bbcfdad5c8b5120
push id43567
push userbmo:jharris@mozilla.com
push dateWed, 01 Feb 2017 01:16:47 +0000
reviewerscpearce
bugs1335555
milestone54.0a1
Bug 1335555 - Begins removing MediaKeySession.keySystem r?cpearce MozReview-Commit-ID: fCrVx8Xd90
dom/media/eme/MediaKeySession.cpp
dom/media/eme/MediaKeySession.h
dom/webidl/MediaKeySession.webidl
--- a/dom/media/eme/MediaKeySession.cpp
+++ b/dom/media/eme/MediaKeySession.cpp
@@ -95,22 +95,16 @@ MediaKeySession::~MediaKeySession()
 
 MediaKeyError*
 MediaKeySession::GetError() const
 {
   return mMediaKeyError;
 }
 
 void
-MediaKeySession::GetKeySystem(nsString& aOutKeySystem) const
-{
-  aOutKeySystem.Assign(mKeySystem);
-}
-
-void
 MediaKeySession::GetSessionId(nsString& aSessionId) const
 {
   aSessionId = GetSessionId();
 }
 
 const nsString&
 MediaKeySession::GetSessionId() const
 {
--- a/dom/media/eme/MediaKeySession.h
+++ b/dom/media/eme/MediaKeySession.h
@@ -48,18 +48,16 @@ public:
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   // Mark this as resultNotAddRefed to return raw pointers
   MediaKeyError* GetError() const;
 
   MediaKeyStatusMap* KeyStatuses() const;
 
-  void GetKeySystem(nsString& aRetval) const;
-
   void GetSessionId(nsString& aRetval) const;
 
   const nsString& GetSessionId() const;
 
   // Number of ms since epoch at which expiration occurs, or NaN if unknown.
   // TODO: The type of this attribute is still under contention.
   // https://www.w3.org/Bugs/Public/show_bug.cgi?id=25902
   double Expiration() const;
--- a/dom/webidl/MediaKeySession.webidl
+++ b/dom/webidl/MediaKeySession.webidl
@@ -11,17 +11,16 @@
  */
 
 [Pref="media.eme.apiVisible"]
 interface MediaKeySession : EventTarget {
   // error state
   readonly attribute MediaKeyError? error;
 
   // session properties
-  readonly attribute DOMString keySystem;
   readonly attribute DOMString sessionId;
 
   readonly attribute unrestricted double expiration;
 
   readonly attribute Promise<void> closed;
 
   readonly attribute MediaKeyStatusMap keyStatuses;