Index: third_party/WebKit/Source/platform/heap/ThreadState.cpp |
diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.cpp b/third_party/WebKit/Source/platform/heap/ThreadState.cpp |
index 7fd1f2da8c5114246a8af2e3eb8e58da66686f43..3b0190b9f3e26c5ff22e869c5f3a9a3433b553fc 100644 |
--- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp |
+++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp |
@@ -99,6 +99,7 @@ ThreadState::ThreadState() |
, m_gcForbiddenCount(0) |
, m_persistentAllocated(0) |
, m_persistentFreed(0) |
+ , m_pageNavigationCount(0) |
, m_vectorBackingHeapIndex(Vector1HeapIndex) |
, m_currentHeapAges(0) |
, m_isTerminating(false) |
@@ -703,6 +704,17 @@ void ThreadState::schedulePageNavigationGCIfNeeded(float estimatedRemovalRatio) |
ASSERT(!isSweepingInProgress()); |
ASSERT(!sweepForbidden()); |
+ m_pageNavigationCount++; |
+ if (m_pageNavigationCount >= 5) { |
+ // A frame retains a lot of memory in the V8 side. V8's GC cannot |
+ // collect the memory until Oilpan's GC collects the frame. So we |
+ // for a conservative GC if no Oilpan's GC has been observed in |
+ // the past 5 frame navigations. |
+ // |
+ Heap::collectGarbage(HeapPointersOnStack, GCWithoutSweep, Heap::ConservativeGC); |
+ return; |
+ } |
+ |
if (shouldSchedulePageNavigationGC(estimatedRemovalRatio)) |
schedulePageNavigationGC(); |
} |
@@ -986,6 +998,7 @@ void ThreadState::preGC() |
flushHeapDoesNotContainCacheIfNeeded(); |
clearHeapAges(); |
updatePersistentCounters(); |
+ m_pageNavigationCount = 0; |
} |
void ThreadState::postGC(GCType gcType) |