Bug 1016707 - Remove keysystem attribute from source element, as it's no longer in the spec. r=bz
authorChris Pearce <cpearce@mozilla.com>
Sat, 23 Aug 2014 16:53:04 +1200
changeset 201291 0ae7772c79778408cf10731476759487ff9c39aa
parent 201290 95a32b449dc56b8fc19937f20eb95e4af5cdce1c
child 201292 6478460e5dd0d51be2b7f7e65cead08b91f52ecb
push id27366
push userryanvm@gmail.com
push dateMon, 25 Aug 2014 15:49:45 +0000
treeherdermozilla-central@4ca2bd0722d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs1016707
milestone34.0a1
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
Bug 1016707 - Remove keysystem attribute from source element, as it's no longer in the spec. r=bz
content/html/content/src/HTMLMediaElement.cpp
content/html/content/src/HTMLSourceElement.h
dom/webidl/HTMLSourceElement.webidl
--- a/content/html/content/src/HTMLMediaElement.cpp
+++ b/content/html/content/src/HTMLMediaElement.cpp
@@ -939,19 +939,16 @@ void HTMLMediaElement::LoadFromSourceChi
     nsAutoString type;
     if (child->GetAttr(kNameSpaceID_None, nsGkAtoms::type, type) &&
         GetCanPlay(type) == CANPLAY_NO) {
       DispatchAsyncSourceError(child);
       const char16_t* params[] = { type.get(), src.get() };
       ReportLoadError("MediaLoadUnsupportedTypeAttribute", params, ArrayLength(params));
       continue;
     }
-    // TODO: "If candidate has a keySystem attribute whose value represents a
-    //       Key System that the user agent knows it cannot use with type,
-    //       then end the synchronous section[...]" (Bug 1016707)
     nsAutoString media;
     HTMLSourceElement *childSrc = HTMLSourceElement::FromContent(child);
     MOZ_ASSERT(childSrc, "Expect child to be HTMLSourceElement");
     if (childSrc && !childSrc->MatchesCurrentMedia()) {
       DispatchAsyncSourceError(child);
       const char16_t* params[] = { media.get(), src.get() };
       ReportLoadError("MediaLoadSourceMediaNotMatched", params, ArrayLength(params));
       continue;
--- a/content/html/content/src/HTMLSourceElement.h
+++ b/content/html/content/src/HTMLSourceElement.h
@@ -86,26 +86,16 @@ public:
   {
     GetHTMLAttr(nsGkAtoms::media, aMedia);
   }
   void SetMedia(const nsAString& aMedia, mozilla::ErrorResult& rv)
   {
     SetHTMLAttr(nsGkAtoms::media, aMedia, rv);
   }
 
-  void GetKeySystem(nsString& aKeySystem) const
-  {
-    GetHTMLAttr(nsGkAtoms::keysystem, aKeySystem);
-  }
-
-  void SetKeySystem(const nsAString& aKeySystem)
-  {
-    SetHTMLAttr(nsGkAtoms::keysystem, aKeySystem);
-  }
-
 protected:
   virtual ~HTMLSourceElement();
 
   virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
 
 protected:
   virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
--- a/dom/webidl/HTMLSourceElement.webidl
+++ b/dom/webidl/HTMLSourceElement.webidl
@@ -21,14 +21,8 @@ interface HTMLSourceElement : HTMLElemen
 partial interface HTMLSourceElement {
            [SetterThrows, Pref="dom.image.picture.enabled"]
            attribute DOMString srcset;
            [SetterThrows, Pref="dom.image.picture.enabled"]
            attribute DOMString sizes;
            [SetterThrows]
            attribute DOMString media;
 };
-
-// Encrypted Media Extensions
-partial interface HTMLSourceElement {
-  [Pref="media.eme.enabled"]
-  attribute DOMString keySystem;
-};