diff options
-rw-r--r-- | libs/hwui/RenderNode.cpp | 10 | ||||
-rw-r--r-- | libs/hwui/RenderNode.h | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 2489c92..c55ebd6 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -50,17 +50,13 @@ void RenderNode::outputLogBuffer(int fd) { } RenderNode::RenderNode() - : mDestroyed(false) - , mNeedsPropertiesSync(false) + : mNeedsPropertiesSync(false) , mNeedsDisplayListDataSync(false) , mDisplayListData(0) , mStagingDisplayListData(0) { } RenderNode::~RenderNode() { - LOG_ALWAYS_FATAL_IF(mDestroyed, "Double destroyed DisplayList %p", this); - - mDestroyed = true; delete mDisplayListData; delete mStagingDisplayListData; } @@ -525,10 +521,6 @@ void RenderNode::issueOperationsOfProjectedChildren(OpenGLRenderer& renderer, T& template <class T> void RenderNode::issueOperations(OpenGLRenderer& renderer, T& handler) { const int level = handler.level(); - if (CC_UNLIKELY(mDestroyed)) { // temporary debug logging - ALOGW("Error: %s is drawing after destruction", mName.string()); - CRASH(); - } if (mDisplayListData->isEmpty() || properties().getAlpha() <= 0) { DISPLAY_LIST_LOGD("%*sEmpty display list (%p, %s)", level * 2, "", this, mName.string()); return; diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h index 7853701..9e6ee3f 100644 --- a/libs/hwui/RenderNode.h +++ b/libs/hwui/RenderNode.h @@ -210,7 +210,6 @@ private: void prepareSubTree(TreeInfo& info, DisplayListData* subtree); String8 mName; - bool mDestroyed; // used for debugging crash, TODO: remove once invalid state crash fixed bool mNeedsPropertiesSync; RenderProperties mProperties; |