commit e25c30034a633d873a00d89cee4451545941a7ef
author Herb Derby <herb@google.com> Tue Oct 27 15:57:27 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 28 19:10:01 2020 +0000
tree 0e1e8042e1d9453b58ecbb324b92bbd1f85637dd
parent 541601602ee94b1fbf04d9b2fe0661951960f97c

use SkArenaAlloc for combineIfPossible

Now that GrOps no longer needs a GrMemoryPool to be
deleted, just pass down the the SkArenaAlloc instead
of both the GrMemoryPool and SkArenaAlloc.

The alloc is only used for two ops, but we pass it
to all the ops most of which don't use it.

Change-Id: I873efcdfe44b446f2ac5089ea8425dff257e318c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330118
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/ops/GrOp.cpp

diff --git a/src/gpu/ops/GrOp.cpp b/src/gpu/ops/GrOp.cpp
index e635d81..f115d4c 100644
--- a/src/gpu/ops/GrOp.cpp
+++ b/src/gpu/ops/GrOp.cpp
@@ -39,13 +39,12 @@
     SkDEBUGCODE(fBoundsFlags = kUninitialized_BoundsFlag);
 }
 
-GrOp::CombineResult GrOp::combineIfPossible(GrOp* that, GrRecordingContext::Arenas* arenas,
-                                            const GrCaps& caps) {
+GrOp::CombineResult GrOp::combineIfPossible(GrOp* that, SkArenaAlloc* alloc, const GrCaps& caps) {
     SkASSERT(this != that);
     if (this->classID() != that->classID()) {
         return CombineResult::kCannotCombine;
     }
-    auto result = this->onCombineIfPossible(that, arenas, caps);
+    auto result = this->onCombineIfPossible(that, alloc, caps);
     if (result == CombineResult::kMerged) {
         this->joinBounds(*that);
     }