diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/trace_event/trace_log.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/trace_event/trace_log.cc')
| -rw-r--r-- | chromium/base/trace_event/trace_log.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/base/trace_event/trace_log.cc b/chromium/base/trace_event/trace_log.cc index c0d85ea90f1..ac2bc911840 100644 --- a/chromium/base/trace_event/trace_log.cc +++ b/chromium/base/trace_event/trace_log.cc @@ -16,6 +16,7 @@ #include "base/command_line.h" #include "base/debug/leak_annotations.h" #include "base/location.h" +#include "base/logging.h" #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted_memory.h" @@ -172,7 +173,7 @@ void ForEachCategoryFilter(const unsigned char* category_group_enabled, } // The fallback arguments filtering function will filter away every argument. -bool DefaultIsTraceEventArgsWhitelisted( +bool DefaultIsTraceEventArgsAllowlisted( const char* category_group_name, const char* event_name, base::trace_event::ArgumentNameFilterPredicate* arg_name_filter) { @@ -993,7 +994,7 @@ void TraceLog::FinishFlush(int generation, bool discard_events) { // use the safe default filtering predicate. if (argument_filter_predicate_.is_null()) { argument_filter_predicate = - base::BindRepeating(&DefaultIsTraceEventArgsWhitelisted); + base::BindRepeating(&DefaultIsTraceEventArgsAllowlisted); } else { argument_filter_predicate = argument_filter_predicate_; } @@ -1488,7 +1489,7 @@ void TraceLog::UpdateTraceEventDurationExplicit( #if defined(OS_WIN) // Generate an ETW event that marks the end of a complete event. if (category_group_enabled_local & TraceCategory::ENABLED_FOR_ETW_EXPORT) - TraceEventETWExport::AddCompleteEndEvent(name); + TraceEventETWExport::AddCompleteEndEvent(category_group_enabled, name); #endif // OS_WIN if (category_group_enabled_local & TraceCategory::ENABLED_FOR_RECORDING) { |