diff options
| author | 2017-12-06 23:18:26 +0000 | |
|---|---|---|
| committer | 2017-12-06 23:18:26 +0000 | |
| commit | d18ed49f9dba09b85782c83999a9103dec015bf2 (patch) | |
| tree | 379823ce960e903a2ba0313591c947ee2d595cf7 /libs/hwui/RenderNode.cpp | |
| parent | 8ab47567b2140da30257bc4e3b70495c8f17281e (diff) | |
| parent | 5364be50cd0431c3b323fd8a3725df5146d01e99 (diff) | |
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 55eeb7fa2073..61b3876cd095 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -241,7 +241,8 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { if (CC_LIKELY(layerType != LayerType::RenderLayer) || CC_UNLIKELY(!isRenderable()) || CC_UNLIKELY(properties().getWidth() == 0) - || CC_UNLIKELY(properties().getHeight() == 0)) { + || CC_UNLIKELY(properties().getHeight() == 0) + || CC_UNLIKELY(!properties().fitsOnLayer())) { if (CC_UNLIKELY(hasLayer())) { renderthread::CanvasContext::destroyLayer(this); } |