commit d0840ecf583171e55025d2808dba017910b7a54f
author Michael Ludwig <michaelludwig@google.com> Thu Dec 12 09:48:38 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 13 14:13:43 2019 +0000
tree 91092cc92a03382747bb8170fa00b16d8e8085fc
parent 7fb7134e7d946d80741f779cfdb10cfd40a1f7a3

Provide record time allocator to onCombineIfPossible()

Change-Id: I3acf5d5fdb29bfbd3407a8065b7567dff43503a0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259427
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrRegionOp.cpp

diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index e12a865..80c4dfd 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -141,7 +141,7 @@
         flushState->executeDrawsAndUploadsForMeshDrawOp(this, chainBounds, pipeline);
     }
 
-    CombineResult onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
+    CombineResult onCombineIfPossible(GrOp* t, SkArenaAlloc*, const GrCaps& caps) override {
         RegionOp* that = t->cast<RegionOp>();
         if (!fHelper.isCompatible(that->fHelper, caps, this->bounds(), that->bounds())) {
             return CombineResult::kCannotCombine;