diff options
| author | John Reck <jreck@google.com> | 2014-10-31 23:00:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 23:00:44 +0000 |
| commit | a51fba0bf037844bcb911e69e8af733e6d2cccf6 (patch) | |
| tree | 1b6027c164bfebbb15618ae82233833a4c807397 /libs/hwui/OpenGLRenderer.h | |
| parent | 18163616c80aa30f4b7389838d8658812615080c (diff) | |
| parent | a8d83d639a5687b2ab5689db4ea61e2a6cce66f4 (diff) | |
| download | frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.zip frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.tar.gz frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.tar.bz2 | |
am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
* commit 'a8d83d639a5687b2ab5689db4ea61e2a6cce66f4':
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 |