Backout bc20093cfc9d (bug 816656) for build failures during prepare-package

This commit is contained in:
Ed Morley
2012-12-03 18:47:04 +00:00
parent 055739afaf
commit 02f997b842

View File

@@ -139,9 +139,7 @@ StartupCache::~StartupCache()
// but an early shutdown means either mTimer didn't run // but an early shutdown means either mTimer didn't run
// or the write thread is still running. // or the write thread is still running.
WaitOnWriteThread(); WaitOnWriteThread();
// If we shutdown quickly timer wont have fired. Instead of writing WriteToDisk();
// it on the main thread and block the shutdown we simply wont update
// the startup cache.
gStartupCache = nullptr; gStartupCache = nullptr;
(void)::NS_UnregisterMemoryReporter(mMappingMemoryReporter); (void)::NS_UnregisterMemoryReporter(mMappingMemoryReporter);
(void)::NS_UnregisterMemoryReporter(mDataMemoryReporter); (void)::NS_UnregisterMemoryReporter(mDataMemoryReporter);