Move more internal methods from GrContext to GrContextPriv (take 3)

Change-Id: Ied630e61cf95780bf85032867e6ce663e1ef9c2f
Reviewed-on: https://skia-review.googlesource.com/98000
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp
index 6334611..a14674d 100644
--- a/gm/imagefromyuvtextures.cpp
+++ b/gm/imagefromyuvtextures.cpp
@@ -12,6 +12,7 @@
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
+#include "GrContextPriv.h"
 #include "GrGpu.h"
 #include "GrTest.h"
 #include "SkBitmap.h"
@@ -94,7 +95,7 @@
     }
 
     void createYUVTextures(GrContext* context, GrBackendTexture yuvTextures[3]) {
-        GrGpu* gpu = context->getGpu();
+        GrGpu* gpu = context->contextPriv().getGpu();
         if (!gpu) {
             return;
         }
@@ -112,7 +113,7 @@
 
     void deleteYUVTextures(GrContext* context, GrBackendTexture yuvTextures[3]) {
 
-        GrGpu* gpu = context->getGpu();
+        GrGpu* gpu = context->contextPriv().getGpu();
         if (!gpu) {
             return;
         }
diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index 2fb64be..1ce915b 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -13,6 +13,7 @@
 
 #include "GrBackendSurface.h"
 #include "GrContext.h"
+#include "GrContextPriv.h"
 #include "GrGpu.h"
 #include "GrTest.h"
 #include "gl/GrGLContext.h"
@@ -61,7 +62,7 @@
         if (!context) {
             return nullptr;
         }
-        GrGpu* gpu = context->getGpu();
+        GrGpu* gpu = context->contextPriv().getGpu();
         if (!gpu) {
             return nullptr;
         }