commit 0fbc6a3bcbc88d8d7c142787515cdcfb0d3cee84
author John Stiles <johnstiles@google.com> Fri Jun 04 14:40:57 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 04 19:37:14 2021 +0000
tree 67379b4bcb9e4268d191f2d44f409a3a619ca0ab
parent bbaf630c76529fe200372ff6dd7c02a66c900155

Fix up names from RenderTargetContext to SurfaceDrawContext.

RenderTargetContext was renamed several months ago; this CL just fixes
up a few related names which hadn't yet updated yet.

Change-Id: I59a6ea92fc5d309a9b45a83e3aca6e49cb8d662e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/415745
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index e4dc789..b7c6e43 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -223,7 +223,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // return true on success; false on failure
 bool GrSoftwarePathRenderer::onDrawPath(const DrawPathArgs& args) {
-    GR_AUDIT_TRAIL_AUTO_FRAME(args.fRenderTargetContext->auditTrail(),
+    GR_AUDIT_TRAIL_AUTO_FRAME(args.fSurfaceDrawContext->auditTrail(),
                               "GrSoftwarePathRenderer::onDrawPath");
     if (!fProxyProvider) {
         return false;
@@ -242,13 +242,13 @@
     bool useCache = fAllowCaching && !inverseFilled && args.fViewMatrix->preservesAxisAlignment() &&
                     args.fShape->hasUnstyledKey() && (GrAAType::kCoverage == args.fAAType);
 
-    if (!GetShapeAndClipBounds(args.fRenderTargetContext,
+    if (!GetShapeAndClipBounds(args.fSurfaceDrawContext,
                                args.fClip, *args.fShape,
                                *args.fViewMatrix, &unclippedDevShapeBounds,
                                &clippedDevShapeBounds,
                                &devClipBounds)) {
         if (inverseFilled) {
-            DrawAroundInvPath(args.fRenderTargetContext, std::move(args.fPaint),
+            DrawAroundInvPath(args.fSurfaceDrawContext, std::move(args.fPaint),
                               *args.fUserStencilSettings, args.fClip, *args.fViewMatrix,
                               devClipBounds, unclippedDevShapeBounds);
         }
@@ -263,7 +263,7 @@
         int64_t unclippedArea = sk_64_mul(unclippedWidth, unclippedHeight);
         int64_t clippedArea = sk_64_mul(clippedDevShapeBounds.width(),
                                         clippedDevShapeBounds.height());
-        int maxTextureSize = args.fRenderTargetContext->caps()->maxTextureSize();
+        int maxTextureSize = args.fSurfaceDrawContext->caps()->maxTextureSize();
         if (unclippedArea > 2 * clippedArea || unclippedWidth > maxTextureSize ||
             unclippedHeight > maxTextureSize) {
             useCache = false;
@@ -317,7 +317,7 @@
     if (useCache) {
         auto proxy = fProxyProvider->findOrCreateProxyByUniqueKey(maskKey);
         if (proxy) {
-            GrSwizzle swizzle = args.fRenderTargetContext->caps()->getReadSwizzle(
+            GrSwizzle swizzle = args.fSurfaceDrawContext->caps()->getReadSwizzle(
                     proxy->backendFormat(), GrColorType::kAlpha_8);
             view = {std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle};
             args.fContext->priv().stats()->incNumPathMasksCacheHits();
@@ -383,11 +383,11 @@
     }
     SkASSERT(view);
     if (inverseFilled) {
-        DrawAroundInvPath(args.fRenderTargetContext, GrPaint::Clone(args.fPaint),
+        DrawAroundInvPath(args.fSurfaceDrawContext, GrPaint::Clone(args.fPaint),
                           *args.fUserStencilSettings, args.fClip, *args.fViewMatrix, devClipBounds,
                           unclippedDevShapeBounds);
     }
-    DrawToTargetWithShapeMask(std::move(view), args.fRenderTargetContext, std::move(args.fPaint),
+    DrawToTargetWithShapeMask(std::move(view), args.fSurfaceDrawContext, std::move(args.fPaint),
                               *args.fUserStencilSettings, args.fClip, *args.fViewMatrix,
                               SkIPoint{boundsForMask->fLeft, boundsForMask->fTop}, *boundsForMask);