Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1263235, part 2 - Make PContent::AsyncMessage and PContentBridge::AsyncMessage's data argument last. r=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2016-04-09 06:50:59 -07:00
parent 33947a1b40
commit 8fc2a0583c
15 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsFrameMessageManager.cpp
View File

@ -2029,8 +2029,8 @@ public:
if (aCpows && !cc->GetCPOWManager()->Wrap(aCx, aCpows, &cpows)) {
return NS_ERROR_UNEXPECTED;
}
if (!cc->SendAsyncMessage(PromiseFlatString(aMessage), data, cpows,
IPC::Principal(aPrincipal))) {
if (!cc->SendAsyncMessage(PromiseFlatString(aMessage), cpows,
IPC::Principal(aPrincipal), data)) {
return NS_ERROR_UNEXPECTED;
}

6
dom/ipc/ContentBridgeChild.cpp
View File

@ -60,11 +60,11 @@ ContentBridgeChild::DeferredDestroy()
bool
ContentBridgeChild::RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<jsipc::CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal)
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData)
{
return nsIContentChild::RecvAsyncMessage(aMsg, aData, Move(aCpows), aPrincipal);
return nsIContentChild::RecvAsyncMessage(aMsg, Move(aCpows), aPrincipal, aData);
}
PBlobChild*

4
dom/ipc/ContentBridgeChild.h
View File

@ -28,9 +28,9 @@ public:
void DeferredDestroy();
virtual bool RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<jsipc::CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal) override;
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData) override;
virtual PBlobChild*
SendPBlobConstructor(PBlobChild* actor,

8
dom/ipc/ContentBridgeParent.cpp
View File

@ -84,12 +84,12 @@ ContentBridgeParent::RecvSyncMessage(const nsString& aMsg,
bool
ContentBridgeParent::RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<jsipc::CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal)
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData)
{
return nsIContentParent::RecvAsyncMessage(aMsg, aData, Move(aCpows),
aPrincipal);
return nsIContentParent::RecvAsyncMessage(aMsg, Move(aCpows),
aPrincipal, aData);
}
PBlobParent*

4
dom/ipc/ContentBridgeParent.h
View File

@ -88,9 +88,9 @@ protected:
nsTArray<StructuredCloneData>* aRetvals) override;
virtual bool RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<jsipc::CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal) override;
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData) override;
virtual jsipc::PJavaScriptParent* AllocPJavaScriptParent() override;

4
dom/ipc/ContentChild.cpp
View File

@ -2441,9 +2441,9 @@ ContentChild::RecvLoadProcessScript(const nsString& aURL)
bool
ContentChild::RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal)
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData)
{
RefPtr<nsFrameMessageManager> cpm =
nsFrameMessageManager::GetChildProcessManager();

4
dom/ipc/ContentChild.h
View File

@ -429,9 +429,9 @@ public:
virtual bool RecvLoadProcessScript(const nsString& aURL) override;
virtual bool RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal) override;
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData) override;
virtual bool RecvGeolocationUpdate(const GeoPosition& somewhere) override;

10
dom/ipc/ContentParent.cpp
View File

@ -4429,12 +4429,12 @@ ContentParent::RecvRpcMessage(const nsString& aMsg,
bool
ContentParent::RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal)
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData)
{
return nsIContentParent::RecvAsyncMessage(aMsg, aData, Move(aCpows),
aPrincipal);
return nsIContentParent::RecvAsyncMessage(aMsg, Move(aCpows), aPrincipal,
aData);
}
bool
@ -4678,7 +4678,7 @@ ContentParent::DoSendAsyncMessage(JSContext* aCx,
// Nuwa won't receive frame messages after it is frozen.
return NS_OK;
}
if (!SendAsyncMessage(nsString(aMessage), data, cpows, Principal(aPrincipal))) {
if (!SendAsyncMessage(nsString(aMessage), cpows, Principal(aPrincipal), data)) {
return NS_ERROR_UNEXPECTED;
}
return NS_OK;

4
dom/ipc/ContentParent.h
View File

@ -946,9 +946,9 @@ private:
nsTArray<StructuredCloneData>* aRetvals) override;
virtual bool RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal) override;
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData) override;
virtual bool RecvFilePathUpdateNotify(const nsString& aType,
const nsString& aStorageName,

4
dom/ipc/PContent.ipdl
View File

@ -1216,8 +1216,8 @@ parent:
async NotifyBenchmarkResult(nsString aCodecName, uint32_t aDecodeFPS);
both:
async AsyncMessage(nsString aMessage, ClonedMessageData aData,
CpowEntry[] aCpows, Principal aPrincipal);
async AsyncMessage(nsString aMessage, CpowEntry[] aCpows,
Principal aPrincipal, ClonedMessageData aData);
};
}

4
dom/ipc/PContentBridge.ipdl
View File

@ -51,8 +51,8 @@ both:
async PBlob(BlobConstructorParams params);
async AsyncMessage(nsString aMessage, ClonedMessageData aData,
CpowEntry[] aCpows, Principal aPrincipal);
async AsyncMessage(nsString aMessage, CpowEntry[] aCpows,
Principal aPrincipal, ClonedMessageData aData);
};
}

4
dom/ipc/nsIContentChild.cpp
View File

@ -111,9 +111,9 @@ nsIContentChild::GetOrCreateActorForBlobImpl(BlobImpl* aImpl)
bool
nsIContentChild::RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal)
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData)
{
RefPtr<nsFrameMessageManager> cpm = nsFrameMessageManager::GetChildProcessManager();
if (cpm) {

4
dom/ipc/nsIContentChild.h
View File

@ -80,9 +80,9 @@ protected:
virtual bool DeallocPBlobChild(PBlobChild* aActor);
virtual bool RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<jsipc::CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal);
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData);
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentChild, NS_ICONTENTCHILD_IID)

4
dom/ipc/nsIContentParent.cpp
View File

@ -269,9 +269,9 @@ nsIContentParent::RecvRpcMessage(const nsString& aMsg,
bool
nsIContentParent::RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal)
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData)
{
// FIXME Permission check in Content process
nsIPrincipal* principal = aPrincipal;

4
dom/ipc/nsIContentParent.h
View File

@ -110,9 +110,9 @@ protected: // IPDL methods
const IPC::Principal& aPrincipal,
nsTArray<ipc::StructuredCloneData>* aRetvals);
virtual bool RecvAsyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,
InfallibleTArray<jsipc::CpowEntry>&& aCpows,
const IPC::Principal& aPrincipal);
const IPC::Principal& aPrincipal,
const ClonedMessageData& aData);
protected: // members
RefPtr<nsFrameMessageManager> mMessageManager;