Bug 882817 - Fix QI implementation of HTMLTrackElement. r=bz
authorRick Eyre <rick.eyre@hotmail.com>
Thu, 13 Jun 2013 17:15:14 -0400
changeset 146566 229c4d26630e92a98780c5e5396a1879116b4ce6
parent 146565 3890895968afc5cfe57e08824fcb884fb29fff91
child 146567 d2e1286ec3ed08c4046f2141b9be935fadd4b736
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs882817
milestone24.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 882817 - Fix QI implementation of HTMLTrackElement. r=bz In certain situations we were failing debug builds due to an assertion that HTMLTrackElement was not a nsIDOMNode or nsIDOMWindow when calling NS_CheckContentLoadPolicy in HTMLTrackElement::LoadResource() This patch fixes the QI of the HTMLTrackElement so that it can be queried to an nsIDOMNode correctly.
content/html/content/src/HTMLTrackElement.cpp
--- a/content/html/content/src/HTMLTrackElement.cpp
+++ b/content/html/content/src/HTMLTrackElement.cpp
@@ -89,17 +89,18 @@ NS_IMPL_ADDREF_INHERITED(HTMLTrackElemen
 NS_IMPL_RELEASE_INHERITED(HTMLTrackElement, Element)
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED_4(HTMLTrackElement, nsGenericHTMLElement,
                                      mTrack, mChannel, mMediaParent,
                                      mLoadListener)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTrackElement)
   NS_INTERFACE_MAP_ENTRY(nsIDOMHTMLElement)
-NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement)
+  NS_HTML_CONTENT_INTERFACES(nsGenericHTMLElement)
+NS_ELEMENT_INTERFACE_MAP_END
 
 void
 HTMLTrackElement::OnChannelRedirect(nsIChannel* aChannel,
                                     nsIChannel* aNewChannel,
                                     uint32_t aFlags)
 {
   NS_ASSERTION(aChannel == mChannel, "Channels should match!");
   mChannel = aNewChannel;