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

Unified Diff: base/trace_event/memory_dump_manager.cc

Issue 1232313004: Add Tracing.requestMemoryDump method to DevTools API (tracing handler) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase after stubs landed 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
« no previous file with comments | « no previous file | content/browser/devtools/protocol/tracing_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ea2760b118fb4043238df92416b14c7326523f72..24f520a1d1f7b620052a98460700280215b136f3 100644
--- a/base/trace_event/memory_dump_manager.cc
+++ b/base/trace_event/memory_dump_manager.cc
@@ -276,7 +276,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/browser/devtools/protocol/tracing_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698