commit 16a345b0a095e4255dc14c76f121f1b31a2cba5a
author Dominik Laskowski <domlaskowski@google.com> Thu Apr 27 17:07:33 2023 -0400
committer Dominik Laskowski <domlaskowski@google.com> Mon May 08 12:03:43 2023 -0400
tree cbb3eed58d88e3749ea37f3e735094260f69e5c1
parent 3a5adb5d8bcc0b050d73931ea90a59402080173e

SF: Redefine VsyncId using FTL mixins

...and make it ftl::Incrementable, as libscheduler_test is about to use
that operation (and so should TokenManager::generateTokenForPredictions
once VsyncId is used consistently over int64_t).

Bug: 241285475
Test: Build
Change-Id: I420058ae69e246af62ed7dd8f1478613f86a79de

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 8eaa1c7..c01c4d2 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -705,10 +705,9 @@
     void updateLayerGeometry();
     void updateLayerMetadataSnapshot();
     std::vector<std::pair<Layer*, LayerFE*>> moveSnapshotsToCompositionArgs(
-            compositionengine::CompositionRefreshArgs& refreshArgs, bool cursorOnly,
-            int64_t vsyncId);
+            compositionengine::CompositionRefreshArgs& refreshArgs, bool cursorOnly);
     void moveSnapshotsFromCompositionArgs(compositionengine::CompositionRefreshArgs& refreshArgs,
-                                          std::vector<std::pair<Layer*, LayerFE*>>& layers);
+                                          const std::vector<std::pair<Layer*, LayerFE*>>& layers);
     bool updateLayerSnapshotsLegacy(VsyncId vsyncId, frontend::Update& update,
                                     bool transactionsFlushed, bool& out)
             REQUIRES(kMainThreadContext);
@@ -1080,7 +1079,7 @@
     void dumpOffscreenLayersProto(LayersProto& layersProto,
                                   uint32_t traceFlags = LayerTracing::TRACE_ALL) const;
     google::protobuf::RepeatedPtrField<DisplayProto> dumpDisplayProto() const;
-    void addToLayerTracing(bool visibleRegionDirty, int64_t time, int64_t vsyncId)
+    void addToLayerTracing(bool visibleRegionDirty, TimePoint, VsyncId)
             REQUIRES(kMainThreadContext);
 
     // Dumps state from HW Composer