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 934568 - Don't make ScanRoots CC OOM assertion fatal due to Win7 debug M2 failures. s=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2013-11-06 16:58:13 -08:00
parent 7dd28ca155
commit f2b04a12d6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xpcom/base/nsCycleCollector.cpp
View File

@ -2132,8 +2132,7 @@ nsCycleCollector::MarkRoots(GCGraphBuilder &aBuilder)
} }
if (aBuilder.RanOutOfMemory()) { if (aBuilder.RanOutOfMemory()) {
MOZ_ASSERT(false, MOZ_ASSERT(false, "Ran out of memory while building cycle collector graph");
"Ran out of memory while building cycle collector graph");
CC_TELEMETRY(_OOM, true); CC_TELEMETRY(_OOM, true);
} }
} }
@ -2267,7 +2266,7 @@ nsCycleCollector::ScanRoots(nsICycleCollectorListener *aListener)
GraphWalker<scanVisitor>(scanVisitor(mWhiteNodeCount, failed)).WalkFromRoots(mGraph); GraphWalker<scanVisitor>(scanVisitor(mWhiteNodeCount, failed)).WalkFromRoots(mGraph);
if (failed) { if (failed) {
MOZ_ASSERT(false, "Ran out of memory in ScanRoots"); NS_ASSERTION(false, "Ran out of memory in ScanRoots");
CC_TELEMETRY(_OOM, true); CC_TELEMETRY(_OOM, true);
} }