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

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

Issue 1438733002: Do not attempt an Oilpan memory pressure GC if nested. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 9ad69b6a76d7143d461e7cd40a8339f4c8375f84..5dade81422fb90875c853471da1f73fa91d9e779 100644
--- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp
+++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
@@ -709,6 +709,10 @@ void ThreadState::scheduleGCIfNeeded()
if (isGCForbidden())
return;
+ if (isSweepingInProgress())
+ return;
+ ASSERT(!sweepForbidden());
+
if (shouldForceMemoryPressureGC()) {
completeSweep();
if (shouldForceMemoryPressureGC()) {
@@ -720,10 +724,6 @@ void ThreadState::scheduleGCIfNeeded()
}
}
- if (isSweepingInProgress())
- return;
- ASSERT(!sweepForbidden());
-
if (shouldForceConservativeGC()) {
completeSweep();
if (shouldForceConservativeGC()) {
« 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