diff -r 30342f40acbf -r e1bea15f9a39 webengine/osswebengine/JavaScriptCore/kjs/collector.cpp --- a/webengine/osswebengine/JavaScriptCore/kjs/collector.cpp Thu Jul 15 19:53:20 2010 +0300 +++ b/webengine/osswebengine/JavaScriptCore/kjs/collector.cpp Thu Aug 19 10:58:56 2010 +0300 @@ -113,6 +113,7 @@ size_t Collector::mainThreadOnlyObjectCount = 0; bool Collector::memoryFull = false; +bool Collector::m_exitInProgress = false; #if PLATFORM(SYMBIAN) unsigned int Collector::CallStackGrowthThresh = 0; @@ -834,6 +835,11 @@ EXPORT bool Collector::collect() { + if(m_exitInProgress) + { + return false; + } + ASSERT(JSLock::lockCount() > 0); ASSERT(JSLock::currentThreadIsHoldingLock()); @@ -997,6 +1003,17 @@ return deleted; } +EXPORT +void Collector::startedExit(bool status) + { + m_exitInProgress = status; + } +EXPORT +bool Collector::isExitInProgress() + { + return m_exitInProgress; + } + size_t Collector::size() { return heap.numLiveObjects;