diff options
| author | Derek Sollenberger <djsollen@google.com> | 2018-09-21 00:58:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-21 00:58:05 +0000 |
| commit | c49e5b78f6a6f041da3537cf748563de923bf3b4 (patch) | |
| tree | 3e58aaaa8455a04a56363ee9914e274b170e0458 /libs/hwui/RenderNode.cpp | |
| parent | 4f797ff273d1b5a3a93bec223599f6aaff520c1c (diff) | |
| parent | 28a4d9935c214374cbd487d3419abb80f57d6f80 (diff) | |
Merge changes Ie9436715,Ib3054822
* changes:
Refactor RenderState and remove unused functionality.
Fix crash when EGLSurface is no longer valid.
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 26e5cea2452a..06dbb2410a12 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -158,7 +158,7 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { CC_UNLIKELY(properties().getWidth() == 0) || CC_UNLIKELY(properties().getHeight() == 0) || CC_UNLIKELY(!properties().fitsOnLayer())) { if (CC_UNLIKELY(hasLayer())) { - renderthread::CanvasContext::destroyLayer(this); + this->setLayerSurface(nullptr); } return; } @@ -317,7 +317,7 @@ void RenderNode::deleteDisplayList(TreeObserver& observer, TreeInfo* info) { void RenderNode::destroyHardwareResources(TreeInfo* info) { if (hasLayer()) { - renderthread::CanvasContext::destroyLayer(this); + this->setLayerSurface(nullptr); } setStagingDisplayList(nullptr); @@ -327,7 +327,7 @@ void RenderNode::destroyHardwareResources(TreeInfo* info) { void RenderNode::destroyLayers() { if (hasLayer()) { - renderthread::CanvasContext::destroyLayer(this); + this->setLayerSurface(nullptr); } if (mDisplayList) { mDisplayList->updateChildren([](RenderNode* child) { child->destroyLayers(); }); |