commit 70fe17e12f3871351c3dbcf9f3a86a1918146f8e
author Brian Salomon <bsalomon@google.com> Mon Nov 30 14:33:58 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 30 20:13:25 2020 +0000
tree 3e40d16b8cc8ef218fa851b15bcfa9e4b0ae77af
parent 6affa2c2e3fa7588c740b29eb5cb132e70ad69ae

Remove GrRenderTargetContextPriv and GrSurfaceContextPriv

I think this is vestigial from some time in the past where RTC was
public.

Also just expose the methods that add ops rather than have so many
friends + testingOnly versions.

Change-Id: I60d9fdff23b2d67039a7b37815da7ff9e73d8999
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339158
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tests/GrCCPRTest.cpp

diff --git a/tests/GrCCPRTest.cpp b/tests/GrCCPRTest.cpp
index e01c309..06bbb9b 100644
--- a/tests/GrCCPRTest.cpp
+++ b/tests/GrCCPRTest.cpp
@@ -22,7 +22,6 @@
 #include "src/gpu/GrPathRenderer.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
-#include "src/gpu/GrRenderTargetContextPriv.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/ccpr/GrCCPathCache.h"
 #include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
@@ -45,10 +44,9 @@
     Effect apply(GrRecordingContext* context, GrRenderTargetContext* rtc, GrAAType,
                  bool hasUserStencilSettings, GrAppliedClip* out,
                  SkRect* bounds) const override {
-        out->addCoverageFP(fCCPR->makeClipProcessor(/*inputFP=*/nullptr,
-                                                    rtc->priv().testingOnly_getOpsTaskID(), fPath,
-                                                    SkIRect::MakeWH(rtc->width(), rtc->height()),
-                                                    *context->priv().caps()));
+        out->addCoverageFP(fCCPR->makeClipProcessor(
+                /*inputFP=*/nullptr, rtc->getOpsTask()->uniqueID(), fPath,
+                SkIRect::MakeWH(rtc->width(), rtc->height()), *context->priv().caps()));
         return Effect::kClipped;
     }