commit 8f7d95382e086d17a6f4aa1cab46021a6d3c9f09
author Brian Salomon <bsalomon@google.com> Wed Dec 23 09:16:59 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 23 16:13:07 2020 +0000
tree 152b4c2119005d58021cb52764e101dd4da58f2c
parent ac9f0c9e2702e5139dc788b33eff35f67fa46b75

Remove public getter for GrSurfaceDrawContext on SkSCanvas.

Made it private and accessible internally via SkCanvasPriv.

Update SkGpuDevice methods/variables after rename of GrDrawSurfaceContext.

Cq-Include-Trybots: luci.skia.skia.primary:Canary-G3,Canary-Flutter,Canary-Android
Change-Id: I3da64cee1de03c201243ee6c7ccd4b4c44cad8c9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346498
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

samplecode/SampleTessellatedWedge.cpp

diff --git a/samplecode/SampleTessellatedWedge.cpp b/samplecode/SampleTessellatedWedge.cpp
index b669efb..c97a3fa 100644
--- a/samplecode/SampleTessellatedWedge.cpp
+++ b/samplecode/SampleTessellatedWedge.cpp
@@ -14,6 +14,7 @@
 #if SK_SUPPORT_GPU
 
 #include "include/gpu/GrRecordingContext.h"
+#include "src/core/SkCanvasPriv.h"
 #include "src/gpu/GrClip.h"
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrRecordingContextPriv.h"
@@ -63,14 +64,14 @@
     canvas->clear(SK_ColorBLACK);
 
     auto ctx = canvas->recordingContext();
-    GrSurfaceDrawContext* rtc = canvas->internal_private_accessTopLayerRenderTargetContext();
+    GrSurfaceDrawContext* sdc = SkCanvasPriv::TopDeviceSurfaceDrawContext(canvas);
 
     SkString error;
-    if (!rtc || !ctx) {
+    if (!sdc || !ctx) {
         error = "GPU Only.";
     } else if (!ctx->priv().caps()->drawInstancedSupport()) {
         error = "Instanced rendering not supported.";
-    } else if (1 == rtc->numSamples() && !ctx->priv().caps()->mixedSamplesSupport()) {
+    } else if (sdc->numSamples() == 1 && !ctx->priv().caps()->mixedSamplesSupport()) {
         error = "MSAA/mixed samples only.";
     }
     if (!error.isEmpty()) {
@@ -85,15 +86,15 @@
     paint.setColor4f({1,0,1,1});
 
     GrAAType aa;
-    if (rtc->numSamples() > 1) {
+    if (sdc->numSamples() > 1) {
         aa = GrAAType::kMSAA;
-    } else if (rtc->asRenderTargetProxy()->canUseMixedSamples(*ctx->priv().caps())) {
+    } else if (sdc->asRenderTargetProxy()->canUseMixedSamples(*ctx->priv().caps())) {
         aa = GrAAType::kCoverage;
     } else {
         aa = GrAAType::kNone;
     }
 
-    rtc->addDrawOp(GrOp::Make<GrPathTessellateOp>(ctx, canvas->getTotalMatrix(), fPath,
+    sdc->addDrawOp(GrOp::Make<GrPathTessellateOp>(ctx, canvas->getTotalMatrix(), fPath,
                                                   std::move(paint), aa, fOpFlags));
 
     // Draw the path points.