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>

src/gpu/GrStencilMaskHelper.cpp

diff --git a/src/gpu/GrStencilMaskHelper.cpp b/src/gpu/GrStencilMaskHelper.cpp
index b4c237e..9e99e0fe 100644
--- a/src/gpu/GrStencilMaskHelper.cpp
+++ b/src/gpu/GrStencilMaskHelper.cpp
@@ -10,7 +10,6 @@
 #include "include/core/SkMatrix.h"
 #include "include/core/SkPath.h"
 #include "src/gpu/GrRecordingContextPriv.h"
-#include "src/gpu/GrRenderTargetContextPriv.h"
 #include "src/gpu/GrStencilSettings.h"
 #include "src/gpu/geometry/GrShape.h"
 #include "src/gpu/geometry/GrStyledShape.h"
@@ -278,7 +277,7 @@
                               const SkRect& rect, GrAA aa) {
     GrPaint paint;
     paint.setXPFactory(GrDisableColorXPFactory::Get());
-    rtc->priv().stencilRect(&clip, ss, std::move(paint), aa, matrix, rect);
+    rtc->stencilRect(&clip, ss, std::move(paint), aa, matrix, rect);
 }
 
 static void draw_path(GrRecordingContext* context, GrRenderTargetContext* rtc,
@@ -337,7 +336,7 @@
 
 bool GrStencilMaskHelper::init(const SkIRect& bounds, uint32_t genID,
                                const GrWindowRectangles& windowRects, int numFPs) {
-    if (!fRTC->priv().mustRenderClip(genID, bounds, numFPs)) {
+    if (!fRTC->mustRenderClip(genID, bounds, numFPs)) {
         return false;
     }
 
@@ -478,10 +477,10 @@
                           GrStencilSettings::SetClipBitSettings(insideStencil), SkMatrix::I(),
                           SkRect::Make(fClip.fixedClip().scissorRect()), GrAA::kNo);
     } else {
-        fRTC->priv().clearStencilClip(fClip.fixedClip().scissorRect(), insideStencil);
+        fRTC->clearStencilClip(fClip.fixedClip().scissorRect(), insideStencil);
     }
 }
 
 void GrStencilMaskHelper::finish() {
-    fRTC->priv().setLastClip(fClip.stencilStackID(), fClip.fixedClip().scissorRect(), fNumFPs);
+    fRTC->setLastClip(fClip.stencilStackID(), fClip.fixedClip().scissorRect(), fNumFPs);
 }