Commit 305c3ca9 authored by Nika Layzell's avatar Nika Layzell
Browse files

Bug 1522579 - Part 3: Remove consumers of nsIContentChild, r=mccr8 

Like Part 2, however for `nsIContentChild`.

Depends on D20550

Differential Revision: https://phabricator.services.mozilla.com/D20551

--HG--
extra : moz-landing-system : lando
parent 1e93329f

dom/base/TabGroup.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include "mozilla/dom/TabGroup.h"



#include "mozilla/dom/nsIContentChild.h"

#include "mozilla/dom/ContentChild.h"

#include "mozilla/dom/TabChild.h"

#include "mozilla/dom/DocGroup.h"

#include "mozilla/dom/TimeoutManager.h"

dom/base/nsContentUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -7313,7 +7313,7 @@ nsresult nsContentUtils::IPCTransferableToTransferable( 


void nsContentUtils::TransferablesToIPCTransferables(

    nsIArray* aTransferables, nsTArray<IPCDataTransfer>& aIPC,

    bool aInSyncMessage, mozilla::dom::nsIContentChild* aChild,

    bool aInSyncMessage, mozilla::dom::ContentChild* aChild,

    mozilla::dom::ContentParent* aParent) {

  aIPC.Clear();

  if (aTransferables) {
@@ -7446,7 +7446,7 @@ bool nsContentUtils::IsFlavorImage(const nsACString& aFlavor) { 
         aFlavor.EqualsLiteral(kGIFImageMime);

}



static Shmem ConvertToShmem(mozilla::dom::nsIContentChild* aChild,

static Shmem ConvertToShmem(mozilla::dom::ContentChild* aChild,

                            mozilla::dom::ContentParent* aParent,

                            const nsACString& aInput) {

  MOZ_ASSERT((aChild && !aParent) || (!aChild && aParent));
@@ -7467,7 +7467,7 @@ static Shmem ConvertToShmem(mozilla::dom::nsIContentChild* aChild, 


void nsContentUtils::TransferableToIPCTransferable(

    nsITransferable* aTransferable, IPCDataTransfer* aIPCDataTransfer,

    bool aInSyncMessage, mozilla::dom::nsIContentChild* aChild,

    bool aInSyncMessage, mozilla::dom::ContentChild* aChild,

    mozilla::dom::ContentParent* aParent) {

  MOZ_ASSERT((aChild && !aParent) || (!aChild && aParent));

dom/base/nsContentUtils.h

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ struct LifecycleCallbackArgs; 
struct LifecycleAdoptedCallbackArgs;

class MessageBroadcaster;

class NodeInfo;

class nsIContentChild;

class ContentChild;

class ContentParent;

class TabChild;

class Selection;
@@ -2838,13 +2838,13 @@ class nsContentUtils { 


  static void TransferablesToIPCTransferables(

      nsIArray* aTransferables, nsTArray<mozilla::dom::IPCDataTransfer>& aIPC,

      bool aInSyncMessage, mozilla::dom::nsIContentChild* aChild,

      bool aInSyncMessage, mozilla::dom::ContentChild* aChild,

      mozilla::dom::ContentParent* aParent);



  static void TransferableToIPCTransferable(

      nsITransferable* aTransferable,

      mozilla::dom::IPCDataTransfer* aIPCDataTransfer, bool aInSyncMessage,

      mozilla::dom::nsIContentChild* aChild,

      mozilla::dom::ContentChild* aChild,

      mozilla::dom::ContentParent* aParent);



  /*

dom/base/nsFrameMessageManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ bool MessageManagerCallback::BuildClonedMessageDataForParent( 
}



bool MessageManagerCallback::BuildClonedMessageDataForChild(

    nsIContentChild* aChild, StructuredCloneData& aData,

    ContentChild* aChild, StructuredCloneData& aData,

    ClonedMessageData& aClonedData) {

  return aData.BuildClonedMessageDataForChild(aChild, aClonedData);

}

dom/base/nsFrameMessageManager.h

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class FileDescriptor; 
namespace dom {



class ContentParent;

class nsIContentChild;

class ContentChild;

class ChildProcessMessageManager;

class ChromeMessageBroadcaster;

class ClonedMessageData;
@@ -113,7 +113,7 @@ class MessageManagerCallback { 
  bool BuildClonedMessageDataForParent(ContentParent* aParent,

                                       StructuredCloneData& aData,

                                       ClonedMessageData& aClonedData);

  bool BuildClonedMessageDataForChild(nsIContentChild* aChild,

  bool BuildClonedMessageDataForChild(ContentChild* aChild,

                                      StructuredCloneData& aData,

                                      ClonedMessageData& aClonedData);

};