commit 53cf44cfaf16a5dd67181cb7cbd3ff6d728c918c
author Adlai Holler <adlai@google.com> Tue Oct 13 17:40:21 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 14 14:32:49 2020 +0000
tree 44c45db416c9edf06991e7c5ecd4ce6f78efeef2
parent 9a6efa6be2cace5430cc29dfb1cd37a6ae2d53ee

Migrate GrContextPriv & ivars to GrDirectContext

After this, GrContextPriv gets renamed and GrContext gets removed.

Change-Id: I49b034e4669876becb50b93c5fe3af887481e1ba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/326158
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Adlai Holler <adlai@google.com>

src/gpu/GrContextPriv.h

diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index cbea452..5e6e2f7 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -22,7 +22,8 @@
 class SkDeferredDisplayList;
 class SkTaskGroup;
 
-/** Class that adds methods to GrContext that are only intended for use internal to Skia.
+/** TODO: Rename to GrDirectContextPriv.
+    Class that adds methods to GrDirectContext that are only intended for use internal to Skia.
     This class is purely a privileged window into GrContext. It should never have additional
     data members or virtual methods. */
 class GrContextPriv {
@@ -168,7 +169,7 @@
 #endif
 
 private:
-    explicit GrContextPriv(GrContext* context) : fContext(context) {}
+    explicit GrContextPriv(GrDirectContext* context) : fContext(context) {}
     GrContextPriv(const GrContextPriv&) = delete;
     GrContextPriv& operator=(const GrContextPriv&) = delete;
 
@@ -176,15 +177,15 @@
     const GrContextPriv* operator&() const;
     GrContextPriv* operator&();
 
-    GrContext* fContext;
+    GrDirectContext* fContext;
 
-    friend class GrContext; // to construct/copy this type.
+    friend class GrDirectContext; // to construct/copy this type.
 };
 
-inline GrContextPriv GrContext::priv() { return GrContextPriv(this); }
+inline GrContextPriv GrDirectContext::priv() { return GrContextPriv(this); }
 
-inline const GrContextPriv GrContext::priv() const {  // NOLINT(readability-const-return-type)
-    return GrContextPriv(const_cast<GrContext*>(this));
+inline const GrContextPriv GrDirectContext::priv() const {  // NOLINT(readability-const-return-type)
+    return GrContextPriv(const_cast<GrDirectContext*>(this));
 }
 
 #endif