Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1262)

Unified Diff: third_party/WebKit/Source/platform/heap/ThreadState.cpp

Issue 1688483002: Revert of Oilpan: Remove page navigation GCs from the prologues of V8's GCs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8e056030a3fe3ccaf429059ca98aef207c4a57a5..9de5549437e8814087cb2df86d36621584ab65f4 100644
--- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp
+++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
@@ -625,6 +625,17 @@
// the major GC requests object grouping.
if (gcType == BlinkGC::V8MajorGC)
completeSweep();
+
+ // The fact that the PageNavigation GC is scheduled means that there is
+ // a dead frame. In common cases, a sequence of Oilpan's GC => V8 GC =>
+ // Oilpan's GC is needed to collect the dead frame. So we force the
+ // PageNavigation GC before running the V8 GC.
+ if (gcState() == PageNavigationGCScheduled) {
+#if PRINT_HEAP_STATS
+ dataLogF("Scheduled PageNavigationGC\n");
+#endif
+ Heap::collectGarbage(BlinkGC::HeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::PageNavigationGC);
+ }
}
void ThreadState::schedulePageNavigationGCIfNeeded(float estimatedRemovalRatio)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698