diff options
| author | 2016-07-11 21:18:20 +0000 | |
|---|---|---|
| committer | 2016-07-11 21:18:22 +0000 | |
| commit | 272b82792590c75e57ec365672b7b3617c8c2edb (patch) | |
| tree | f76d2895578d8c3389086822f7682bd6c48d40c5 /libs/hwui/RenderNode.cpp | |
| parent | b646ec13e182e71744361e18d17e57b1571dcd66 (diff) | |
| parent | e3e481df762747c5f01bbd1503800fa29457fc1b (diff) | |
Merge "Avoid throwing when 0 size layer requested" into nyc-mr1-dev
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index f8797bf63442..6facf20b025c 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -301,7 +301,10 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { LayerType layerType = properties().effectiveLayerType(); // If we are not a layer OR we cannot be rendered (eg, view was detached) // we need to destroy any Layers we may have had previously - if (CC_LIKELY(layerType != LayerType::RenderLayer) || CC_UNLIKELY(!isRenderable())) { + if (CC_LIKELY(layerType != LayerType::RenderLayer) + || CC_UNLIKELY(!isRenderable()) + || CC_UNLIKELY(properties().getWidth() == 0) + || CC_UNLIKELY(properties().getHeight() == 0)) { if (CC_UNLIKELY(mLayer)) { destroyLayer(mLayer); mLayer = nullptr; |