diff options
author | John Reck <jreck@google.com> | 2015-01-29 12:53:38 -0800 |
---|---|---|
committer | John Reck <jreck@google.com> | 2015-01-29 12:53:38 -0800 |
commit | 49bc4acfadf9c5b1e520217278ccb38010d38c89 (patch) | |
tree | 2731146935070300785f256599ed69a83a9afdab /libs/hwui/renderstate/RenderState.h | |
parent | 293b7b4fe510bf7df879e89bf748c0b8695f4310 (diff) | |
parent | fe5ac4fc31ee671721f98cf28cf1bd32ac119998 (diff) | |
download | frameworks_base-49bc4acfadf9c5b1e520217278ccb38010d38c89.zip frameworks_base-49bc4acfadf9c5b1e520217278ccb38010d38c89.tar.gz frameworks_base-49bc4acfadf9c5b1e520217278ccb38010d38c89.tar.bz2 |
resolved conflicts for merge of fe5ac4fc to master
Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b
Diffstat (limited to 'libs/hwui/renderstate/RenderState.h')
-rw-r--r-- | libs/hwui/renderstate/RenderState.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/renderstate/RenderState.h b/libs/hwui/renderstate/RenderState.h index 501d76f..d1ee64a 100644 --- a/libs/hwui/renderstate/RenderState.h +++ b/libs/hwui/renderstate/RenderState.h @@ -62,10 +62,10 @@ public: void debugOverdraw(bool enable, bool clear); - void registerLayer(const Layer* layer) { + void registerLayer(Layer* layer) { mActiveLayers.insert(layer); } - void unregisterLayer(const Layer* layer) { + void unregisterLayer(Layer* layer) { mActiveLayers.erase(layer); } @@ -107,7 +107,7 @@ private: Stencil* mStencil; AssetAtlas mAssetAtlas; - std::set<const Layer*> mActiveLayers; + std::set<Layer*> mActiveLayers; std::set<renderthread::CanvasContext*> mRegisteredContexts; GLsizei mViewportWidth; |