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 
am: 4c25f3dd43

Change-Id: I2e239c4c1e5d28952b95f1299daf8ac793cc7e0c
This commit is contained in:
John Reck
2017-08-03 03:18:23 +00:00
committed by android-build-merger
parent 639afe25f3 4c25f3dd43
commit 0f03652ba8
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)
|| 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);
}