1*635a8641SAndroid Build Coastguard WorkerFrom f2d560ab2808c87cd60a2962037bf4dabd9781ef Mon Sep 17 00:00:00 2001 2*635a8641SAndroid Build Coastguard WorkerFrom: Hidehiko Abe <[email protected]> 3*635a8641SAndroid Build Coastguard WorkerDate: Fri, 14 Jun 2019 14:22:33 +0900 4*635a8641SAndroid Build Coastguard WorkerSubject: [PATCH] libchrome: Introduce stub ConvertableToTraceFormat. 5*635a8641SAndroid Build Coastguard Worker 6*635a8641SAndroid Build Coastguard WorkerBUG=chromium:909719 7*635a8641SAndroid Build Coastguard WorkerTEST=Built locally. 8*635a8641SAndroid Build Coastguard Worker 9*635a8641SAndroid Build Coastguard WorkerChange-Id: I5c849edc2c5e8370bff6a8b1b83a92e5ef5836c8 10*635a8641SAndroid Build Coastguard Worker--- 11*635a8641SAndroid Build Coastguard Worker base/trace_event/trace_event.h | 13 ++++++++++++- 12*635a8641SAndroid Build Coastguard Worker 1 file changed, 12 insertions(+), 1 deletion(-) 13*635a8641SAndroid Build Coastguard Worker 14*635a8641SAndroid Build Coastguard Workerdiff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h 15*635a8641SAndroid Build Coastguard Workerindex 1ce76d9..7385582 100644 16*635a8641SAndroid Build Coastguard Worker--- a/base/trace_event/trace_event.h 17*635a8641SAndroid Build Coastguard Worker+++ b/base/trace_event/trace_event.h 18*635a8641SAndroid Build Coastguard Worker@@ -10,6 +10,9 @@ 19*635a8641SAndroid Build Coastguard Worker #include "base/trace_event/common/trace_event_common.h" 20*635a8641SAndroid Build Coastguard Worker #include "base/trace_event/heap_profiler.h" 21*635a8641SAndroid Build Coastguard Worker 22*635a8641SAndroid Build Coastguard Worker+// Indirectly included. 23*635a8641SAndroid Build Coastguard Worker+#include "base/strings/string_util.h" 24*635a8641SAndroid Build Coastguard Worker+ 25*635a8641SAndroid Build Coastguard Worker // To avoid -Wunused-* errors, eat expression by macro. 26*635a8641SAndroid Build Coastguard Worker namespace libchrome_internal { 27*635a8641SAndroid Build Coastguard Worker template <typename... Args> void Ignore(Args&&... args) {} 28*635a8641SAndroid Build Coastguard Worker@@ -18,8 +21,9 @@ template <typename... Args> void Ignore(Args&&... args) {} 29*635a8641SAndroid Build Coastguard Worker (false ? libchrome_internal::Ignore(__VA_ARGS__) : (void) 0) 30*635a8641SAndroid Build Coastguard Worker 31*635a8641SAndroid Build Coastguard Worker // Body is effectively empty. 32*635a8641SAndroid Build Coastguard Worker+#define INTERNAL_TRACE_EVENT_ADD(...) INTERNAL_IGNORE(__VA_ARGS__) 33*635a8641SAndroid Build Coastguard Worker #define INTERNAL_TRACE_EVENT_ADD_SCOPED(...) INTERNAL_IGNORE(__VA_ARGS__) 34*635a8641SAndroid Build Coastguard Worker-#define INTERNAL_TRACE_TASK_EXECUTION(...) 35*635a8641SAndroid Build Coastguard Worker+#define INTERNAL_TRACE_TASK_EXECUTION(...) INTERNAL_IGNORE(__VA_ARGS__) 36*635a8641SAndroid Build Coastguard Worker #define INTERNAL_TRACE_EVENT_ADD_SCOPED_WITH_FLOW(...) \ 37*635a8641SAndroid Build Coastguard Worker INTERNAL_IGNORE(__VA_ARGS__) 38*635a8641SAndroid Build Coastguard Worker #define TRACE_ID_MANGLE(val) (val) 39*635a8641SAndroid Build Coastguard Worker@@ -38,6 +42,13 @@ class TraceLog { 40*635a8641SAndroid Build Coastguard Worker void SetCurrentThreadBlocksMessageLoop() {} 41*635a8641SAndroid Build Coastguard Worker }; 42*635a8641SAndroid Build Coastguard Worker 43*635a8641SAndroid Build Coastguard Worker+class BASE_EXPORT ConvertableToTraceFormat { 44*635a8641SAndroid Build Coastguard Worker+ public: 45*635a8641SAndroid Build Coastguard Worker+ ConvertableToTraceFormat() = default; 46*635a8641SAndroid Build Coastguard Worker+ virtual ~ConvertableToTraceFormat() = default; 47*635a8641SAndroid Build Coastguard Worker+ virtual void AppendAsTraceFormat(std::string* out) const {}; 48*635a8641SAndroid Build Coastguard Worker+}; 49*635a8641SAndroid Build Coastguard Worker+ 50*635a8641SAndroid Build Coastguard Worker } // namespace trace_event 51*635a8641SAndroid Build Coastguard Worker } // namespace base 52*635a8641SAndroid Build Coastguard Worker #else 53*635a8641SAndroid Build Coastguard Worker-- 54*635a8641SAndroid Build Coastguard Worker2.22.0.410.gd8fdbe21b5-goog 55*635a8641SAndroid Build Coastguard Worker 56