diff options
| author | John Reck <jreck@google.com> | 2014-10-31 23:25:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-31 23:25:44 +0000 |
| commit | e05575e9c36850d8cfe49396ac9a1372511b12bf (patch) | |
| tree | cd106a73af96598499f82ac5dc5fc40dabb3df4a /libs/hwui/OpenGLRenderer.h | |
| parent | 58f2a1e8a47de6c3ce4f588b07fc052f4687492d (diff) | |
| parent | a51fba0bf037844bcb911e69e8af733e6d2cccf6 (diff) | |
| download | frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.zip frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.tar.gz frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.tar.bz2 | |
am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
automerge: a51fba0
* commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6':
Layer changes
Diffstat (limited to 'libs/hwui/OpenGLRenderer.h')
| -rwxr-xr-x | libs/hwui/OpenGLRenderer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index c2c0b0e..e1c3d10 100755 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -140,7 +140,6 @@ public: void pushLayerUpdate(Layer* layer); void cancelLayerUpdate(Layer* layer); - void clearLayerUpdates(); void flushLayerUpdates(); void markLayersAsBuildLayers(); @@ -982,7 +981,7 @@ private: // List of rectangles to clear after saveLayer() is invoked Vector<Rect*> mLayers; // List of layers to update at the beginning of a frame - Vector<Layer*> mLayerUpdates; + Vector< sp<Layer> > mLayerUpdates; // The following fields are used to setup drawing // Used to describe the shaders to generate |