commit d19848fcab877e614ee3a4124fa3df9da45ea55a
author Vishnu Nair <vishnun@google.com> Wed Mar 15 18:24:28 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 15 18:24:28 2023 +0000
tree 395caff0733ee7e79c1649010c8f2e346d1727aa
parent 39872bc1b63e955e376f30d2d2012cb6c8becdc9

Revert "[LayerTraceGenerator] fix mirrors and rel-z data"

This reverts commit 39872bc1b63e955e376f30d2d2012cb6c8becdc9.

Reason for revert: b/273495141

Change-Id: I94712f4cbc9dbd6b0c59b28ea9759921d4123bb2

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.h

diff --git a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.h b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.h
index 7b1ff27..3997a0a 100644
--- a/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.h
+++ b/services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.h
@@ -68,7 +68,6 @@
     void update(const Args&);
     std::vector<std::unique_ptr<LayerSnapshot>>& getSnapshots();
     LayerSnapshot* getSnapshot(uint32_t layerId) const;
-    LayerSnapshot* getSnapshot(const LayerHierarchy::TraversalPath& id) const;
 
     typedef std::function<void(const LayerSnapshot& snapshot)> ConstVisitor;
 
@@ -87,6 +86,7 @@
 
 private:
     friend class LayerSnapshotTest;
+    LayerSnapshot* getSnapshot(const LayerHierarchy::TraversalPath& id) const;
     static LayerSnapshot getRootSnapshot();
 
     // return true if we were able to successfully update the snapshots via
@@ -120,8 +120,16 @@
     void updateChildState(LayerSnapshot& snapshot, const LayerSnapshot& childSnapshot,
                           const Args& args);
 
-    std::unordered_map<LayerHierarchy::TraversalPath, LayerSnapshot*,
-                       LayerHierarchy::TraversalPathHash>
+    struct TraversalPathHash {
+        std::size_t operator()(const LayerHierarchy::TraversalPath& key) const {
+            uint32_t hashCode = key.id * 31;
+            if (key.mirrorRootId != UNASSIGNED_LAYER_ID) {
+                hashCode += key.mirrorRootId * 31;
+            }
+            return std::hash<size_t>{}(hashCode);
+        }
+    };
+    std::unordered_map<LayerHierarchy::TraversalPath, LayerSnapshot*, TraversalPathHash>
             mIdToSnapshot;
     std::vector<std::unique_ptr<LayerSnapshot>> mSnapshots;
     LayerSnapshot mRootSnapshot;