Commit 768dcd08 authored by Arthur Iakab's avatar Arthur Iakab
Browse files

Backed out changeset 0b8ffd5fed51 (bug 1580447) for causing build bustages. 

CLOSED TREE
parent c602e0e0

dom/base/ChromeUtils.cpp

+0 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "mozilla/ResultExtensions.h"

#include "mozilla/TimeStamp.h"

#include "mozilla/dom/BrowsingContext.h"

#include "mozilla/dom/ContentChild.h"

#include "mozilla/dom/ContentParent.h"

#include "mozilla/dom/IdleDeadline.h"

#include "mozilla/dom/JSWindowActorService.h"
@@ -1188,11 +1187,6 @@ void ChromeUtils::GenerateMediaControlKeysTestEvent( 
  }

}



/* static */

nsIContentChild* ChromeUtils::GetContentChild(const GlobalObject&) {

  return ContentChild::GetSingleton();

}



/* static */

void ChromeUtils::GetCurrentActiveMediaMetadata(const GlobalObject& aGlobal,

                                                MediaMetadataInit& aMetadata) {

dom/base/ChromeUtils.h

+0 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include "mozilla/dom/BindingDeclarations.h"

#include "mozilla/dom/ChromeUtilsBinding.h"

#include "mozilla/ErrorResult.h"

#include "nsIContentChild.h"



namespace mozilla {
@@ -204,8 +203,6 @@ class ChromeUtils { 
  static void GenerateMediaControlKeysTestEvent(

      const GlobalObject& aGlobal, MediaControlKeysTestEvent aEvent);



  static nsIContentChild* GetContentChild(const GlobalObject&);



  // This function would only be used for testing.

  static void GetCurrentActiveMediaMetadata(const GlobalObject& aGlobal,

                                            MediaMetadataInit& aMetadata);

dom/bindings/Bindings.conf

+0 −2
Original line number Diff line number Diff line
@@ -1885,8 +1885,6 @@ addExternalIface('nsITreeSelection', nativeType='nsITreeSelection', 
                 notflattened=True)

addExternalIface('nsISupports', nativeType='nsISupports')

addExternalIface('nsIDocShell', nativeType='nsIDocShell', notflattened=True)

addExternalIface('nsIContentChild', nativeType='nsIContentChild', notflattened=True)

addExternalIface('nsIContentParent', nativeType='nsIContentParent', notflattened=True)

addExternalIface('nsIReferrerInfo', nativeType='nsIReferrerInfo', notflattened=True)

addExternalIface('nsIWebNavigation', nativeType='nsIWebNavigation', notflattened=True)

addExternalIface('nsIEditor', nativeType='nsIEditor', notflattened=True)

dom/chrome-webidl/ChromeUtils.webidl

+0 −6
Original line number Diff line number Diff line
@@ -446,12 +446,6 @@ partial namespace ChromeUtils { 
  [ChromeOnly]

  void generateMediaControlKeysTestEvent(MediaControlKeysTestEvent aEvent);



  /**

   * ContentChild of the current process.

   */

  [ChromeOnly]

  readonly attribute nsIContentChild? contentChild;



  // This is used to get the media metadata from the current main controller in

  // testing.

  [ChromeOnly]

dom/chrome-webidl/JSWindowActor.webidl

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



interface nsISupports;

interface nsIContentChild;

interface nsIContentParent;



interface mixin JSWindowActor {

  [Throws]