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/GrStrokeRectOp.cpp

diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index db60858..0cbf9b6 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -444,7 +444,7 @@
     const SkMatrix& viewMatrix() const { return fViewMatrix; }
     bool miterStroke() const { return fMiterStroke; }
 
-    CombineResult onCombineIfPossible(GrOp* t, SkArenaAlloc*, const GrCaps&) override;
+    CombineResult onCombineIfPossible(GrOp* t, GrRecordingContext::Arenas*, const GrCaps&) override;
 
     void generateAAStrokeRectGeometry(GrVertexWriter& vertices,
                                       const SkPMColor4f& color,
@@ -625,7 +625,7 @@
     }
 }
 
-GrOp::CombineResult AAStrokeRectOp::onCombineIfPossible(GrOp* t, SkArenaAlloc*,
+GrOp::CombineResult AAStrokeRectOp::onCombineIfPossible(GrOp* t, GrRecordingContext::Arenas*,
                                                         const GrCaps& caps) {
     AAStrokeRectOp* that = t->cast<AAStrokeRectOp>();