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/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 61508e4..e868604 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -19,7 +19,6 @@
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
-#include "src/gpu/GrRenderTargetContextPriv.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrBitmapTextGeoProc.h"
@@ -454,12 +453,11 @@
         return nullptr;
     }
 
-
-    auto rContext = rtc->priv().recordingContext();
+    auto rContext = rtc->recordingContext();
     GrSDFTOptions SDFOptions = rContext->priv().SDFTOptions();
 
     sk_sp<GrTextBlob> blob = GrTextBlob::Make(glyphRunList, drawMatrix);
-    SkGlyphRunListPainter* painter = rtc->priv().testingOnly_glyphRunPainter();
+    SkGlyphRunListPainter* painter = rtc->glyphRunPainter();
     painter->processGlyphRun(
             *glyphRunList.begin(),
             drawMatrix, glyphRunList.origin(),