commit 10df243381b2638cad32d0933ef2b3f86b414232
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 14 18:02:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 14 18:02:55 2020 +0000
tree 8ebf48291dea43ebbe123144edb0afa93956d474
parent ff21c0b51d609c069ca8a8bb720411b5f8637410
parent d529ded1ad68442600faff85b2828b54eb93f6a9

Merge "TrackEvent: Add support for overriding interned data storage"

include/perfetto/tracing/event_context.h

diff --git a/include/perfetto/tracing/event_context.h b/include/perfetto/tracing/event_context.h
index fe9c4bb..4ae7f1e 100644
--- a/include/perfetto/tracing/event_context.h
+++ b/include/perfetto/tracing/event_context.h
@@ -41,8 +41,10 @@
 
   // For Chromium during the transition phase to the client library.
   // TODO(eseckler): Remove once Chromium has switched to client lib entirely.
-  explicit EventContext(protos::pbzero::TrackEvent* event)
-      : event_(event), incremental_state_(nullptr) {}
+  explicit EventContext(
+      protos::pbzero::TrackEvent* event,
+      internal::TrackEventIncrementalState* incremental_state = nullptr)
+      : event_(event), incremental_state_(incremental_state) {}
 
   ~EventContext();
 

include/perfetto/tracing/internal/track_event_internal.h

diff --git a/include/perfetto/tracing/internal/track_event_internal.h b/include/perfetto/tracing/internal/track_event_internal.h
index 8796b3a..454dd7a 100644
--- a/include/perfetto/tracing/internal/track_event_internal.h
+++ b/include/perfetto/tracing/internal/track_event_internal.h
@@ -44,7 +44,7 @@
 namespace internal {
 class TrackEventCategoryRegistry;
 
-class BaseTrackEventInternedDataIndex {
+class PERFETTO_EXPORT BaseTrackEventInternedDataIndex {
  public:
   virtual ~BaseTrackEventInternedDataIndex();