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

Unified Diff: base/trace_event/memory_dump_manager.cc

Issue 1245233004: Add chrome.memoryBenchmarking.requestMemoryDump() API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
Index: base/trace_event/memory_dump_manager.cc
diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc
index 04b6e3aa33fc15a868cd18c9696e05a1ad1fe15c..2d3d48d4216a738ac66daf25e18cc7dcc7498f41 100644
--- a/base/trace_event/memory_dump_manager.cc
+++ b/base/trace_event/memory_dump_manager.cc
@@ -272,7 +272,9 @@ void MemoryDumpManager::ContinueAsyncProcessDump(
skip_dump = true;
} else if (mdp == g_mmaps_dump_provider &&
pmd_async_state->req_args.dump_type !=
- MemoryDumpType::PERIODIC_INTERVAL_WITH_MMAPS) {
+ MemoryDumpType::PERIODIC_INTERVAL_WITH_MMAPS &&
+ pmd_async_state->req_args.dump_type !=
+ MemoryDumpType::EXPLICITLY_TRIGGERED) {
// Mmaps dumping is very heavyweight and cannot be performed at the same
// rate of other dumps. TODO(primiano): this is a hack and should be
// cleaned up as part of crbug.com/499731.
« no previous file with comments | « no previous file | content/renderer/memory_benchmarking_extension.h » ('j') | content/renderer/memory_benchmarking_extension.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698