commit 28b0c5d4b3bbb6958876b2710cc90297ff981798
author Michael Ludwig <michaelludwig@google.com> Thu Dec 19 14:51:00 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 20 21:02:49 2019 +0000
tree 61579527b02718152a7a32da3d209c96707bb347
parent 34280e29cf54041d5c6a7f3b0669f0cfc2653f4e

Pass Arenas* to GrOpsTask and GrOps instead of multiple pointers to each pool type

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

src/gpu/ops/GrFillRRectOp.cpp

diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
index 443adf6..381c44a 100644
--- a/src/gpu/ops/GrFillRRectOp.cpp
+++ b/src/gpu/ops/GrFillRRectOp.cpp
@@ -157,7 +157,8 @@
     return analysis;
 }
 
-GrDrawOp::CombineResult GrFillRRectOp::onCombineIfPossible(GrOp* op, SkArenaAlloc*, const GrCaps&) {
+GrDrawOp::CombineResult GrFillRRectOp::onCombineIfPossible(GrOp* op, GrRecordingContext::Arenas*,
+                                                           const GrCaps&) {
     const auto& that = *op->cast<GrFillRRectOp>();
     if (fFlags != that.fFlags || fProcessors != that.fProcessors ||
         fInstanceData.count() > std::numeric_limits<int>::max() - that.fInstanceData.count()) {