corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 0c030f97a04f (bug 1144366) for being on top of patches being backed out

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda
2015-03-28 10:39:56 -07:00
parent 529df7748d
commit 1a1c158706
759 changed files with 50565 additions and 50565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
js/ipc/JavaScriptParent.cpp
View File

@@ -22,12 +22,12 @@ using namespace mozilla::jsipc;
using namespace mozilla::dom;
static void
TraceParent(JSTracer* trc, void* data)
TraceParent(JSTracer *trc, void *data)
{
static_cast<JavaScriptParent*>(data)->trace(trc);
static_cast<JavaScriptParent *>(data)->trace(trc);
}
JavaScriptParent::JavaScriptParent(JSRuntime* rt)
JavaScriptParent::JavaScriptParent(JSRuntime *rt)
: JavaScriptShared(rt),
JavaScriptBase<PJavaScriptParent>(rt)
{
@@ -49,14 +49,14 @@ JavaScriptParent::init()
}
void
JavaScriptParent::trace(JSTracer* trc)
JavaScriptParent::trace(JSTracer *trc)
{
objects_.trace(trc);
unwaivedObjectIds_.trace(trc);
waivedObjectIds_.trace(trc);
}
JSObject*
JSObject *
JavaScriptParent::scopeForTargetObjects()
{
// CPWOWs from the child need to point into the parent's unprivileged junk
@@ -69,7 +69,7 @@ JavaScriptParent::scopeForTargetObjects()
mozilla::ipc::IProtocol*
JavaScriptParent::CloneProtocol(Channel* aChannel, ProtocolCloneContext* aCtx)
{
ContentParent* contentParent = aCtx->GetContentParent();
ContentParent *contentParent = aCtx->GetContentParent();
nsAutoPtr<PJavaScriptParent> actor(contentParent->AllocPJavaScriptParent());
if (!actor || !contentParent->RecvPJavaScriptConstructor(actor)) {
return nullptr;
@@ -77,10 +77,10 @@ JavaScriptParent::CloneProtocol(Channel* aChannel, ProtocolCloneContext* aCtx)
return actor.forget();
}
PJavaScriptParent*
mozilla::jsipc::NewJavaScriptParent(JSRuntime* rt)
PJavaScriptParent *
mozilla::jsipc::NewJavaScriptParent(JSRuntime *rt)
{
JavaScriptParent* parent = new JavaScriptParent(rt);
JavaScriptParent *parent = new JavaScriptParent(rt);
if (!parent->init()) {
delete parent;
return nullptr;
@@ -89,7 +89,7 @@ mozilla::jsipc::NewJavaScriptParent(JSRuntime* rt)
}
void
mozilla::jsipc::ReleaseJavaScriptParent(PJavaScriptParent* parent)
mozilla::jsipc::ReleaseJavaScriptParent(PJavaScriptParent *parent)
{
static_cast<JavaScriptParent*>(parent)->decref();
static_cast<JavaScriptParent *>(parent)->decref();
}