commit 3172208ad0dc7c29f07d907fc050f1d69fc4980e
author Robert Phillips <robertphillips@google.com> Wed Oct 14 18:30:06 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 14 18:30:13 2020 +0000
tree 611221aed61abfdb294442cc702d7052e0c4c89d
parent 34ddcb84f3c277bdbed6e01f29d84cf2dd27719c

Revert "Remove GrContext"

This reverts commit 2edf18d818708509809f4be17a2f5abd6d93af2b.

Reason for revert: breaking wasm-debugger

Original change's description:
> Remove GrContext
>
> Woo!
>
> Change-Id: Ifa3ff7e79c7048c2f1d808cc9705593d72886f08
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/326436
> Auto-Submit: Adlai Holler <adlai@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

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

Change-Id: Ie05bda5dad7fb5d369ebe579d2e009fdb99c0729
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/326941
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

include/gpu/GrDirectContext.h

diff --git a/include/gpu/GrDirectContext.h b/include/gpu/GrDirectContext.h
index e05fb78..34350c5 100644
--- a/include/gpu/GrDirectContext.h
+++ b/include/gpu/GrDirectContext.h
@@ -8,7 +8,7 @@
 #ifndef GrDirectContext_DEFINED
 #define GrDirectContext_DEFINED
 
-#include "include/gpu/GrRecordingContext.h"
+#include "include/private/GrContext.h"
 
 #include "include/gpu/GrBackendSurface.h"
 
@@ -43,7 +43,7 @@
 class SkTaskGroup;
 class SkTraceMemoryDump;
 
-class SK_API GrDirectContext : public GrRecordingContext {
+class SK_API GrDirectContext : public GrContext {
 public:
 #ifdef SK_GL
     /**
@@ -698,9 +698,9 @@
     //
     // Steps to use this API:
     //
-    // 1) Create a GrDirectContext as normal, but set fPersistentCache on GrContextOptions to
-    //    something that will save the cached shader blobs. Set fShaderCacheStrategy to kSkSL. This
-    //    will ensure that the blobs are SkSL, and are suitable for pre-compilation.
+    // 1) Create a GrContext as normal, but set fPersistentCache on GrContextOptions to something
+    //    that will save the cached shader blobs. Set fShaderCacheStrategy to kSkSL. This will
+    //    ensure that the blobs are SkSL, and are suitable for pre-compilation.
     // 2) Run your application, and save all of the key/data pairs that are fed to the cache.
     //
     // 3) Switch over to shipping your application. Include the key/data pairs from above.
@@ -756,7 +756,7 @@
 
     friend class GrDirectContextPriv;
 
-    using INHERITED = GrRecordingContext;
+    using INHERITED = GrContext;
 };