commit 2401daf78395903f1940bbb1b5e2bc777efd2802
author Diwas Sharma <sdiwas@google.com> Fri Sep 01 00:45:24 2023 +0000
committer Hsin-Yi Chen <hsinyichen@google.com> Fri Sep 01 10:29:33 2023 +0800
tree 0678919512c3431dedb6083c2b3467c71e84588f
parent b194d7ba3c207505c5eeafa407e3c3e256461da2

Revert "Move proto definitions to external/perfetto"

This reverts commit bec51fdc3c8a42cbcb833d7d14800fbb0a14a7f3.

Reason for revert: 298512106

Change-Id: Icb9d6d5a23176a809c3b71bcaa3928b03dfb0622

services/surfaceflinger/Tracing/TransactionProtoParser.h

diff --git a/services/surfaceflinger/Tracing/TransactionProtoParser.h b/services/surfaceflinger/Tracing/TransactionProtoParser.h
index b3ab71c..457c3be 100644
--- a/services/surfaceflinger/Tracing/TransactionProtoParser.h
+++ b/services/surfaceflinger/Tracing/TransactionProtoParser.h
@@ -44,25 +44,25 @@
     TransactionProtoParser(std::unique_ptr<FlingerDataMapper> provider)
           : mMapper(std::move(provider)) {}
 
-    perfetto::protos::TransactionState toProto(const TransactionState&);
-    perfetto::protos::TransactionState toProto(
-            const std::map<uint32_t /* layerId */, TracingLayerState>&);
-    perfetto::protos::LayerCreationArgs toProto(const LayerCreationArgs& args);
-    perfetto::protos::LayerState toProto(const ResolvedComposerState&);
-    static perfetto::protos::DisplayInfo toProto(const frontend::DisplayInfo&, uint32_t layerStack);
+    proto::TransactionState toProto(const TransactionState&);
+    proto::TransactionState toProto(const std::map<uint32_t /* layerId */, TracingLayerState>&);
+    proto::LayerCreationArgs toProto(const LayerCreationArgs& args);
+    proto::LayerState toProto(const ResolvedComposerState&);
+    static proto::DisplayInfo toProto(const frontend::DisplayInfo&, uint32_t layerStack);
 
-    TransactionState fromProto(const perfetto::protos::TransactionState&);
-    void mergeFromProto(const perfetto::protos::LayerState&, TracingLayerState& outState);
-    void fromProto(const perfetto::protos::LayerCreationArgs&, LayerCreationArgs& outArgs);
+    TransactionState fromProto(const proto::TransactionState&);
+    void mergeFromProto(const proto::LayerState&, TracingLayerState& outState);
+    void fromProto(const proto::LayerCreationArgs&, LayerCreationArgs& outArgs);
     std::unique_ptr<FlingerDataMapper> mMapper;
-    static frontend::DisplayInfo fromProto(const perfetto::protos::DisplayInfo&);
-    static void fromProto(const google::protobuf::RepeatedPtrField<perfetto::protos::DisplayInfo>&,
+    static frontend::DisplayInfo fromProto(const proto::DisplayInfo&);
+    static void fromProto(const google::protobuf::RepeatedPtrField<proto::DisplayInfo>&,
                           frontend::DisplayInfos& outDisplayInfos);
 
 private:
-    perfetto::protos::DisplayState toProto(const DisplayState&);
-    void fromProto(const perfetto::protos::LayerState&, ResolvedComposerState& out);
-    DisplayState fromProto(const perfetto::protos::DisplayState&);
+    proto::DisplayState toProto(const DisplayState&);
+    void fromProto(const proto::LayerState&, ResolvedComposerState& out);
+    DisplayState fromProto(const proto::DisplayState&);
+
 };
 
 } // namespace android::surfaceflinger