commit 2940538ecd5184e805c59c499a88290a7f85390a
author Adlai Holler <adlai@google.com> Mon Jul 20 16:02:05 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 21 11:36:05 2020 +0000
tree 595a46cb2d863944b4fd13069c413e183085755f
parent e875f72dc66f5dbb940f707b96c83b4768b56a8d

Reland "Remove more GrContext imports & usage"

This reverts commit 75c5168b41c312f5df009cf004f04c1aada1d859.

Reason for revert: Reverted image-cacherator test, for now

Original change's description:
> 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>

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


Change-Id: I940b9f74f7caaa8b4201c241f2a6242b7a24d2a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304062
Reviewed-by: Robert Phillips <robertphillips@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 82e6921..618ea6c 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/GrContext.h"
+#include "include/gpu/GrDirectContext.h"
 #include "src/core/SkAutoPixmapStorage.h"
 
 namespace {
 class ManagedBackendTexture : public SkNVRefCnt<ManagedBackendTexture> {
 public:
     ~ManagedBackendTexture() {
-        if (fContext && fTexture.isValid()) {
-            fContext->submit(true);
-            fContext->deleteBackendTexture(fTexture);
+        if (fDContext && fTexture.isValid()) {
+            fDContext->submit(true);
+            fDContext->deleteBackendTexture(fTexture);
         }
     }
 
     static void Release(void* context) { static_cast<ManagedBackendTexture*>(context)->unref(); }
 
     template <typename... Args>
-    static sk_sp<ManagedBackendTexture> Make(GrContext* context, Args&&... args) {
+    static sk_sp<ManagedBackendTexture> Make(GrDirectContext* dContext, Args&&... args) {
         sk_sp<ManagedBackendTexture> mbet(new ManagedBackendTexture);
-        mbet->fContext = context;
-        mbet->fTexture = context->createBackendTexture(std::forward<Args>(args)..., Release,
-                                                       mbet->refAndPassAsContext());
+        mbet->fDContext = dContext;
+        mbet->fTexture = dContext->createBackendTexture(std::forward<Args>(args)..., Release,
+                                                        mbet->refAndPassAsContext());
         return mbet;
     }
 
@@ -43,13 +43,13 @@
 
 private:
     ManagedBackendTexture() = default;
-    GrContext* fContext = nullptr;
+    GrDirectContext* fDContext = nullptr;
     GrBackendTexture fTexture;
 };
 }  // namespace
 
 namespace sk_gpu_test {
-sk_sp<SkImage> MakeBackendTextureImage(GrContext* context,
+sk_sp<SkImage> MakeBackendTextureImage(GrDirectContext* dContext,
                                        const SkPixmap& pixmap,
                                        GrRenderable renderable,
                                        GrSurfaceOrigin origin) {
@@ -64,8 +64,8 @@
         }
         src = &temp;
     }
-    auto mbet = ManagedBackendTexture::Make(context, src, 1, renderable, GrProtected::kNo);
-    return SkImage::MakeFromTexture(context,
+    auto mbet = ManagedBackendTexture::Make(dContext, src, 1, renderable, GrProtected::kNo);
+    return SkImage::MakeFromTexture(dContext,
                                     mbet->texture(),
                                     origin,
                                     src->colorType(),