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

diff --git a/src/gpu/GrClipStack.cpp b/src/gpu/GrClipStack.cpp
index a639511..9fbb6e7 100644
--- a/src/gpu/GrClipStack.cpp
+++ b/src/gpu/GrClipStack.cpp
@@ -16,7 +16,6 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRecordingContextPriv.h"
-#include "src/gpu/GrRenderTargetContextPriv.h"
 #include "src/gpu/GrSWMaskHelper.h"
 #include "src/gpu/GrStencilMaskHelper.h"
 #include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
@@ -1352,7 +1351,7 @@
     }
 
     // If window rectangles are supported, we can use them to exclude inner bounds of difference ops
-    int maxWindowRectangles = rtc->priv().maxWindowRectangles();
+    int maxWindowRectangles = rtc->maxWindowRectangles();
     GrWindowRectangles windowRects;
 
     // Elements not represented as an analytic FP or skipped will be collected here and later