commit 4649a6bf08ee6fe2e843e533416d2fdcb7b2c6c0
author Josh Gargus <jjosh@google.com> Tue Dec 11 19:54:47 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Dec 12 19:35:45 2018 +0000
tree f0493b0d2ddaeeac52af572700e22a53d69cd5b8
parent ce9a7efd10cccf7684596ba25896a571e56d5e3f

[escher] Unbreak Escher waterfall demo.

Relax an overzealous DCHECK in the rounded-rect tessellator which
was exploding when provided with more memory than required.

It's unclear what started to trigger this, because no Escher code
has changed since the last time the Waterfall demo ran successfully.

TEST=N/A (existing Scenic code was already not triggering this
condition)

Change-Id: I05ea520b59ac973680ac0ff04d64b9a5abad36be

public/lib/escher/shape/rounded_rect.cc

diff --git a/public/lib/escher/shape/rounded_rect.cc b/public/lib/escher/shape/rounded_rect.cc
index 453cd22..4eced27 100644
--- a/public/lib/escher/shape/rounded_rect.cc
+++ b/public/lib/escher/shape/rounded_rect.cc
@@ -71,7 +71,7 @@
                                 uint32_t max_bytes) {
   TRACE_DURATION("gfx", "escher::GenerateRoundedRectIndices");
 
-  FXL_DCHECK(max_bytes == kIndexCount * sizeof(uint32_t));
+  FXL_DCHECK(max_bytes >= kIndexCount * sizeof(uint32_t));
   uint32_t* indices = static_cast<uint32_t*>(indices_out);
 
   // Central square triangles.
@@ -265,7 +265,7 @@
   FXL_DCHECK(mesh_spec.total_attribute_count() == 2);
   FXL_DCHECK(mesh_spec.attributes[0] ==
              (MeshAttribute::kPosition2D | MeshAttribute::kUV));
-  FXL_DCHECK(max_bytes == kVertexCount * mesh_spec.stride(0));
+  FXL_DCHECK(max_bytes >= kVertexCount * mesh_spec.stride(0));
   FXL_DCHECK(sizeof(PosUvVertex) == mesh_spec.stride(0));
   FXL_DCHECK(0U == mesh_spec.attribute_offset(0, MeshAttribute::kPosition2D));
   FXL_DCHECK(sizeof(vec2) == mesh_spec.attribute_offset(0, MeshAttribute::kUV));