Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-03 03:11:18 +00:00
committed by Android (Google) Code Review
parent dd5afab0d4 679e7f1dfc
commit 4c25f3dd43
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/RenderNode.cpp
View File

@@ -241,7 +241,8 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) {
if (CC_LIKELY(layerType != LayerType::RenderLayer) if (CC_LIKELY(layerType != LayerType::RenderLayer)
|| CC_UNLIKELY(!isRenderable()) || CC_UNLIKELY(!isRenderable())
|| CC_UNLIKELY(properties().getWidth() == 0) || CC_UNLIKELY(properties().getWidth() == 0)
|| CC_UNLIKELY(properties().getHeight() == 0)) { || CC_UNLIKELY(properties().getHeight() == 0)
|| CC_UNLIKELY(!properties().fitsOnLayer())) {
if (CC_UNLIKELY(hasLayer())) { if (CC_UNLIKELY(hasLayer())) {
renderthread::CanvasContext::destroyLayer(this); renderthread::CanvasContext::destroyLayer(this);
} }