Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1212248 - Align the creation of cpow in ContentBridgeParent to ContentParent. r=khuey

Browse Source
This commit is contained in:
Kershaw Chang 2015-10-09 09:25:00 +02:00
parent b212501277
commit 679bbc2939
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/ipc/ContentBridgeParent.cpp
View File

@ -183,7 +183,7 @@ ContentBridgeParent::GetCPOWManager()
if (ManagedPJavaScriptParent().Length()) {
return CPOWManagerFor(ManagedPJavaScriptParent()[0]);
}
return CPOWManagerFor(SendPJavaScriptConstructor());
return nullptr;
}
NS_IMETHODIMP

4
dom/ipc/PContentBridge.ipdl
View File

@ -41,6 +41,8 @@ parent:
sync SyncMessage(nsString aMessage, ClonedMessageData aData,
CpowEntry[] aCpows, Principal aPrincipal)
returns (StructuredCloneData[] retval);
async PJavaScript();
both:
// Both the parent and the child can construct the PBrowser.
// See the comment in PContent::PBrowser().
@ -49,8 +51,6 @@ both:
async PBlob(BlobConstructorParams params);
async PJavaScript();
AsyncMessage(nsString aMessage, ClonedMessageData aData,
CpowEntry[] aCpows, Principal aPrincipal);
};