commit 49bc4acfadf9c5b1e520217278ccb38010d38c89
author John Reck <jreck@google.com> Thu Jan 29 12:53:38 2015 -0800
committer John Reck <jreck@google.com> Thu Jan 29 12:53:38 2015 -0800
tree 2731146935070300785f256599ed69a83a9afdab
parent 293b7b4fe510bf7df879e89bf748c0b8695f4310
parent fe5ac4fc31ee671721f98cf28cf1bd32ac119998

resolved conflicts for merge of fe5ac4fc to master

Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b

libs/hwui/renderstate/RenderState.h

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 @@
 
     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 @@
     Stencil* mStencil;
 
     AssetAtlas mAssetAtlas;
-    std::set<const Layer*> mActiveLayers;
+    std::set<Layer*> mActiveLayers;
     std::set<renderthread::CanvasContext*> mRegisteredContexts;
 
     GLsizei mViewportWidth;