commit 46e366ae21891c332313c0d617af3f045cb1aa77
author Greg Daniel <egdaniel@google.com> Mon Dec 16 14:38:36 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 16 20:45:10 2019 +0000
tree 722bb8e8cf5976804ba9e40e40650858561eed07
parent 48257d74cd4d55cc74d74ee01eeb14c99f091344

Remove GrTextureContext.

This change mostly just removes GrTextureContext and switches users to
directly creating GrSurfaceContexts. Outside of updating types, the factory
functions for creating Gr*Contexts have not been updated in this but will
be done in a followup.

Change-Id: I55257568d4c096c5fb48c5e38bfa2c01b824e7b5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260289
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index d318c0d..aa8fb27 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -26,8 +26,8 @@
 #include "src/gpu/GrResourceAllocator.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrSoftwarePathRenderer.h"
+#include "src/gpu/GrSurfaceContext.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
-#include "src/gpu/GrTextureContext.h"
 #include "src/gpu/GrTexturePriv.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrTextureProxyPriv.h"
@@ -941,7 +941,7 @@
                                       managedOpsTask));
 }
 
-std::unique_ptr<GrTextureContext> GrDrawingManager::makeTextureContext(
+std::unique_ptr<GrSurfaceContext> GrDrawingManager::makeSurfaceContext(
         sk_sp<GrSurfaceProxy> sProxy,
         GrColorType colorType,
         SkAlphaType alphaType,
@@ -953,12 +953,10 @@
     // GrTextureRenderTargets should always be using a GrRenderTargetContext
     SkASSERT(!sProxy->asRenderTargetProxy());
 
-    sk_sp<GrTextureProxy> textureProxy(sk_ref_sp(sProxy->asTextureProxy()));
+    GrSurfaceOrigin origin = sProxy->origin();
+    GrSwizzle readSwizzle = sProxy->textureSwizzle();
 
-    GrSurfaceOrigin origin = textureProxy->origin();
-    GrSwizzle texSwizzle = textureProxy->textureSwizzle();
-
-    return std::unique_ptr<GrTextureContext>(new GrTextureContext(
-            fContext, std::move(textureProxy), colorType, alphaType, std::move(colorSpace), origin,
-            texSwizzle));
+    return std::unique_ptr<GrSurfaceContext>(new GrSurfaceContext(
+            fContext, std::move(sProxy), colorType, alphaType, std::move(colorSpace), origin,
+            readSwizzle));
 }