commit 0f03652ba8d2d405ecd5f3db4925a388088dcc41
author John Reck <jreck@google.com> Thu Aug 03 03:18:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 03:18:23 2017 +0000
tree 8fe2c6ca24b1711dad6a9ca290cd2699ff86fd7d
parent 639afe25f39da1514ea96add5abb807e96cf7de0
parent 4c25f3dd43fd5259ca0448b6d891444de8fa4a8f

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

Change-Id: I2e239c4c1e5d28952b95f1299daf8ac793cc7e0c

libs/hwui/RenderNode.cpp

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 55eeb7f..61b3876 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -241,7 +241,8 @@
     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);
         }