commit 75c5168b41c312f5df009cf004f04c1aada1d859
author Adlai Holler <adlai@google.com> Mon Jul 20 16:17:55 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 20 16:18:04 2020 +0000
tree 640a89e9727be9e9e3c557ca2e31cfcc4e0e9b64
parent 16fbc2477205aa06efb03e9bdaa0e4a5e94ee865

Revert "Remove more GrContext imports & usage"

This reverts commit dd1395526df7fa346fe9d21ef8c9b41b2c0ef748.

Reason for revert: Broke chrome roll

Original change's description:
> Remove more GrContext imports & usage
> 
> Sanity is coming soon!
> 
> Change-Id: I109ebeef9efd7dbf4d76a13e1c05df36d59affbc
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303661
> Commit-Queue: Adlai Holler <adlai@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>

TBR=robertphillips@google.com,adlai@google.com

Change-Id: I20d770058d4b54193b6cd2fdc9ca5a1e09f84309
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304056
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Adlai Holler <adlai@google.com>

tools/gpu/BackendTextureImageFactory.cpp

diff --git a/tools/gpu/BackendTextureImageFactory.cpp b/tools/gpu/BackendTextureImageFactory.cpp
index 618ea6c..82e6921 100644
--- a/tools/gpu/BackendTextureImageFactory.cpp
+++ b/tools/gpu/BackendTextureImageFactory.cpp
@@ -10,27 +10,27 @@
 #include "include/core/SkImage.h"
 #include "include/core/SkPixmap.h"
 #include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/GrContext.h"
 #include "src/core/SkAutoPixmapStorage.h"
 
 namespace {
 class ManagedBackendTexture : public SkNVRefCnt<ManagedBackendTexture> {
 public:
     ~ManagedBackendTexture() {
-        if (fDContext && fTexture.isValid()) {
-            fDContext->submit(true);
-            fDContext->deleteBackendTexture(fTexture);
+        if (fContext && fTexture.isValid()) {
+            fContext->submit(true);
+            fContext->deleteBackendTexture(fTexture);
         }
     }
 
     static void Release(void* context) { static_cast<ManagedBackendTexture*>(context)->unref(); }
 
     template <typename... Args>
-    static sk_sp<ManagedBackendTexture> Make(GrDirectContext* dContext, Args&&... args) {
+    static sk_sp<ManagedBackendTexture> Make(GrContext* context, Args&&... args) {
         sk_sp<ManagedBackendTexture> mbet(new ManagedBackendTexture);
-        mbet->fDContext = dContext;
-        mbet->fTexture = dContext->createBackendTexture(std::forward<Args>(args)..., Release,
-                                                        mbet->refAndPassAsContext());
+        mbet->fContext = context;
+        mbet->fTexture = context->createBackendTexture(std::forward<Args>(args)..., Release,
+                                                       mbet->refAndPassAsContext());
         return mbet;
     }
 
@@ -43,13 +43,13 @@
 
 private:
     ManagedBackendTexture() = default;
-    GrDirectContext* fDContext = nullptr;
+    GrContext* fContext = nullptr;
     GrBackendTexture fTexture;
 };
 }  // namespace
 
 namespace sk_gpu_test {
-sk_sp<SkImage> MakeBackendTextureImage(GrDirectContext* dContext,
+sk_sp<SkImage> MakeBackendTextureImage(GrContext* context,
                                        const SkPixmap& pixmap,
                                        GrRenderable renderable,
                                        GrSurfaceOrigin origin) {
@@ -64,8 +64,8 @@
         }
         src = &temp;
     }
-    auto mbet = ManagedBackendTexture::Make(dContext, src, 1, renderable, GrProtected::kNo);
-    return SkImage::MakeFromTexture(dContext,
+    auto mbet = ManagedBackendTexture::Make(context, src, 1, renderable, GrProtected::kNo);
+    return SkImage::MakeFromTexture(context,
                                     mbet->texture(),
                                     origin,
                                     src->colorType(),