diff options
author | Mathias Agopian <mathias@google.com> | 2012-11-27 16:07:04 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-27 16:07:04 -0800 |
commit | efd614b869e952792b009db4ab54f3bb4375d198 (patch) | |
tree | 50a7d7f3597c67374e4eff4dd8451f82d9816b5b /services/surfaceflinger/Layer.h | |
parent | 762a6d86de63ad319884ab6e666be6ad0d75996e (diff) | |
parent | 8430095879d2fa6878e68f8f12da4e704815ac09 (diff) | |
download | frameworks_native-efd614b869e952792b009db4ab54f3bb4375d198.zip frameworks_native-efd614b869e952792b009db4ab54f3bb4375d198.tar.gz frameworks_native-efd614b869e952792b009db4ab54f3bb4375d198.tar.bz2 |
Merge "make transform hint multi-display aware" into jb-mr1.1-dev
Diffstat (limited to 'services/surfaceflinger/Layer.h')
-rw-r--r-- | services/surfaceflinger/Layer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 6f75d8c..c5eb26b 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -91,8 +91,8 @@ public: inline const sp<GraphicBuffer>& getActiveBuffer() const { return mActiveBuffer; } // Updates the transform hint in our SurfaceTexture to match - // the current orientation of the default display device. - virtual void updateTransformHint() const; + // the current orientation of the display device. + virtual void updateTransformHint(const sp<const DisplayDevice>& hw) const; protected: virtual void onFirstRef(); |