diff options
| author | Chris Craik <ccraik@google.com> | 2014-09-12 17:41:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 17:41:13 +0000 |
| commit | 1aec711b2e7c2e43fdc2069be229cfd3c9ddba16 (patch) | |
| tree | faa0b178079609ec4a3476fca2da5993357f4810 /libs | |
| parent | 288e7de22ef831235a5d7640cd228dfc467b4f19 (diff) | |
| parent | 21029ef131d6a98862ae6faf3305bee2872e9c5f (diff) | |
| download | frameworks_base-1aec711b2e7c2e43fdc2069be229cfd3c9ddba16.zip frameworks_base-1aec711b2e7c2e43fdc2069be229cfd3c9ddba16.tar.gz frameworks_base-1aec711b2e7c2e43fdc2069be229cfd3c9ddba16.tar.bz2 | |
Merge "Disable layer leak tracking" into lmp-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/RenderState.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/RenderState.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libs/hwui/RenderState.cpp b/libs/hwui/RenderState.cpp index 54af528..86bd7dd 100644 --- a/libs/hwui/RenderState.cpp +++ b/libs/hwui/RenderState.cpp @@ -38,6 +38,7 @@ void RenderState::onGLContextCreated() { } void RenderState::onGLContextDestroyed() { +/* AutoMutex _lock(mLayerLock); size_t size = mActiveLayers.size(); if (CC_UNLIKELY(size != 0)) { @@ -68,6 +69,7 @@ void RenderState::onGLContextDestroyed() { } LOG_ALWAYS_FATAL("%d layers have survived gl context destruction", size); } +*/ } void RenderState::setViewport(GLsizei width, GLsizei height) { diff --git a/libs/hwui/RenderState.h b/libs/hwui/RenderState.h index 74bafca..cbe7cfc 100644 --- a/libs/hwui/RenderState.h +++ b/libs/hwui/RenderState.h @@ -53,12 +53,16 @@ public: void debugOverdraw(bool enable, bool clear); void registerLayer(const Layer* layer) { + /* AutoMutex _lock(mLayerLock); mActiveLayers.insert(layer); + */ } void unregisterLayer(const Layer* layer) { + /* AutoMutex _lock(mLayerLock); mActiveLayers.erase(layer); + */ } void registerCanvasContext(renderthread::CanvasContext* context) { |