Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev am: 4c25f3dd43

am: 0f03652ba8

Change-Id: I589106c8d80a66b152c2978e1d3db84badef9ed5
This commit is contained in:
John Reck
2017-08-03 03:30:39 +00:00
committed by android-build-merger

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);
}