commit eecd6597d013b2bb879bc51957ed1b5e6b61c35e
author Dominik Laskowski <domlaskowski@google.com> Tue May 29 10:25:41 2018 -0700
committer Dominik Laskowski <domlaskowski@google.com> Thu May 31 14:34:22 2018 -0700
tree 5951b1d466e39561ce064a5abf18e5638a19c48d
parent ba65e2d216021c37f8ba40dcab772e092e0e6740

SF: Use consistent names for display references

This CL renames IBinder tokens to "displayToken", and DisplayDevice
references to "display". It also cleans up style for affected lines.

Bug: 74619554
Test: Build
Change-Id: I04fc7264bf2a856caf30d662029b6f603f432938

services/surfaceflinger/Layer.h

diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 52d2de2..5e0de88 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -316,10 +316,10 @@
 public:
     virtual void setDefaultBufferSize(uint32_t /*w*/, uint32_t /*h*/) {}
 
-    void setGeometry(const sp<const DisplayDevice>& displayDevice, uint32_t z);
+    void setGeometry(const sp<const DisplayDevice>& display, uint32_t z);
     void forceClientComposition(int32_t hwcId);
     bool getForceClientComposition(int32_t hwcId);
-    virtual void setPerFrameData(const sp<const DisplayDevice>& displayDevice) = 0;
+    virtual void setPerFrameData(const sp<const DisplayDevice>& display) = 0;
 
     // callIntoHwc exists so we can update our local state and call
     // acceptDisplayChanges without unnecessarily updating the device's state