wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1169791 - Strongly type MergeZone; r=mccr8

Browse Source
This commit is contained in:
Terrence Cole 2015-06-01 14:11:06 -07:00
parent 1a1000b5a0
commit ce37e99525
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xpcom/base/nsCycleCollector.cpp
View File

@ -2116,12 +2116,12 @@ private:
++childPi->mInternalRefs;
}
JS::Zone* MergeZone(void* aGcthing)
JS::Zone* MergeZone(JS::GCCellPtr aGcthing)
{
if (!mMergeZones) {
return nullptr;
}
JS::Zone* zone = JS::GetTenuredGCThingZone(aGcthing);
JS::Zone* zone = JS::GetTenuredGCThingZone(aGcthing.asCell());
if (js::IsSystemZone(zone)) {
return nullptr;
}
@ -2275,7 +2275,7 @@ CCGraphBuilder::NoteXPCOMRoot(nsISupports* aRoot)
NS_IMETHODIMP_(void)
CCGraphBuilder::NoteJSRoot(JSObject* aRoot)
{
if (JS::Zone* zone = MergeZone(aRoot)) {
if (JS::Zone* zone = MergeZone(JS::GCCellPtr(aRoot))) {
NoteRoot(zone, mJSZoneParticipant);
} else {
NoteRoot(aRoot, mJSParticipant);
@ -2384,7 +2384,7 @@ CCGraphBuilder::NoteJSChild(JS::GCCellPtr aChild)
}
if (GCThingIsGrayCCThing(aChild) || MOZ_UNLIKELY(WantAllTraces())) {
if (JS::Zone* zone = MergeZone(aChild.asCell())) {
if (JS::Zone* zone = MergeZone(aChild)) {
NoteChild(zone, mJSZoneParticipant, edgeName);
} else {
NoteChild(aChild.asCell(), mJSParticipant, edgeName);
@ -2409,7 +2409,7 @@ CCGraphBuilder::AddWeakMapNode(JS::GCCellPtr aNode)
return nullptr;
}
if (JS::Zone* zone = MergeZone(aNode.asCell())) {
if (JS::Zone* zone = MergeZone(aNode)) {
return AddNode(zone, mJSZoneParticipant);
}
return AddNode(aNode.asCell(), mJSParticipant);