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

Backed out 3 changesets (bug 1123461, bug 1123090) for windows build bustage

Browse Source 
Backed out changeset 2c442905d0af (bug 1123461)
Backed out changeset d7aa4c72ebab (bug 1123461)
Backed out changeset 8bb689ec8086 (bug 1123090)
This commit is contained in:
Wes Kocher
2015-01-22 21:04:33 -08:00
parent a211857e72
commit 8b770b4ad0
37 changed files with 123 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/ipc/JavaScriptShared.cpp
View File

@@ -672,8 +672,7 @@ JavaScriptShared::fromObjectOrNullVariant(JSContext *cx, ObjectOrNullVariant obj
return fromObjectVariant(cx, objVar.get_ObjectVariant());
}
CrossProcessCpowHolder::CrossProcessCpowHolder(dom::CPOWManagerGetter *managerGetter,
const InfallibleTArray<CpowEntry> &cpows)
CpowIdHolder::CpowIdHolder(dom::CPOWManagerGetter *managerGetter, const InfallibleTArray<CpowEntry> &cpows)
: js_(nullptr),
cpows_(cpows)
{
@@ -683,7 +682,7 @@ CrossProcessCpowHolder::CrossProcessCpowHolder(dom::CPOWManagerGetter *managerGe
}
bool
CrossProcessCpowHolder::ToObject(JSContext *cx, JS::MutableHandleObject objp)
CpowIdHolder::ToObject(JSContext *cx, JS::MutableHandleObject objp)
{
if (!cpows_.Length())
return true;
@@ -758,15 +757,3 @@ JavaScriptShared::Wrap(JSContext *cx, HandleObject aObj, InfallibleTArray<CpowEn
return true;
}
CPOWManager*
mozilla::jsipc::CPOWManagerFor(PJavaScriptParent* aParent)
{
return static_cast<JavaScriptParent *>(aParent);
}
CPOWManager*
mozilla::jsipc::CPOWManagerFor(PJavaScriptChild* aChild)
{
return static_cast<JavaScriptChild *>(aChild);
}