| 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 4a91393bccf7902be634016cc1041ff86f795647..845db2e6274c10902264e4f950106912f4bec484 100644
|
| --- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp
|
| +++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
|
| @@ -635,7 +635,7 @@ bool ThreadState::shouldSchedulePageNavigationGC(float estimatedRemovalRatio)
|
| bool ThreadState::shouldForceConservativeGC()
|
| {
|
| // TODO(haraken): 400% is too large. Lower the heap growing factor.
|
| - return judgeGCThreshold(32 * 1024 * 1024, 5.0);
|
| + return judgeGCThreshold(32 * 1024 * 1024, 1.5);
|
| }
|
|
|
| // If we're consuming too much memory, trigger a conservative GC
|
| @@ -671,7 +671,7 @@ void ThreadState::scheduleV8FollowupGCIfNeeded(V8GCType gcType)
|
| #if PRINT_HEAP_STATS
|
| dataLogF("Scheduled MemoryPressureGC\n");
|
| #endif
|
| - Heap::collectGarbage(HeapPointersOnStack, GCWithoutSweep, Heap::MemoryPressureGC);
|
| + Heap::collectGarbage(HeapPointersOnStack, GCWithSweep, Heap::MemoryPressureGC);
|
| return;
|
| }
|
| if (shouldScheduleV8FollowupGC()) {
|
| @@ -736,7 +736,7 @@ void ThreadState::schedulePageNavigationGCIfNeeded(float estimatedRemovalRatio)
|
| #if PRINT_HEAP_STATS
|
| dataLogF("Scheduled MemoryPressureGC\n");
|
| #endif
|
| - Heap::collectGarbage(HeapPointersOnStack, GCWithoutSweep, Heap::MemoryPressureGC);
|
| + Heap::collectGarbage(HeapPointersOnStack, GCWithSweep, Heap::MemoryPressureGC);
|
| return;
|
| }
|
| if (shouldSchedulePageNavigationGC(estimatedRemovalRatio)) {
|
| @@ -775,7 +775,7 @@ void ThreadState::scheduleGCIfNeeded()
|
| #if PRINT_HEAP_STATS
|
| dataLogF("Scheduled MemoryPressureGC\n");
|
| #endif
|
| - Heap::collectGarbage(HeapPointersOnStack, GCWithoutSweep, Heap::MemoryPressureGC);
|
| + Heap::collectGarbage(HeapPointersOnStack, GCWithSweep, Heap::MemoryPressureGC);
|
| return;
|
| }
|
| }
|
| @@ -790,7 +790,7 @@ void ThreadState::scheduleGCIfNeeded()
|
| #if PRINT_HEAP_STATS
|
| dataLogF("Scheduled ConservativeGC\n");
|
| #endif
|
| - Heap::collectGarbage(HeapPointersOnStack, GCWithoutSweep, Heap::ConservativeGC);
|
| + Heap::collectGarbage(HeapPointersOnStack, GCWithSweep, Heap::ConservativeGC);
|
| return;
|
| }
|
| }
|
| @@ -820,7 +820,7 @@ void ThreadState::performIdleGC(double deadlineSeconds)
|
| return;
|
| }
|
|
|
| - Heap::collectGarbage(NoHeapPointersOnStack, GCWithoutSweep, Heap::IdleGC);
|
| + Heap::collectGarbage(NoHeapPointersOnStack, GCWithSweep, Heap::IdleGC);
|
| }
|
|
|
| void ThreadState::performIdleLazySweep(double deadlineSeconds)
|
| @@ -1001,7 +1001,7 @@ void ThreadState::runScheduledGC(StackState stackState)
|
| Heap::collectAllGarbage();
|
| break;
|
| case PreciseGCScheduled:
|
| - Heap::collectGarbage(NoHeapPointersOnStack, GCWithoutSweep, Heap::PreciseGC);
|
| + Heap::collectGarbage(NoHeapPointersOnStack, GCWithSweep, Heap::PreciseGC);
|
| break;
|
| case PageNavigationGCScheduled:
|
| Heap::collectGarbage(NoHeapPointersOnStack, GCWithSweep, Heap::PageNavigationGC);
|
|
|