commit f35fd8d2f26ef7217368d1a09d231ee68ed0cb2f
author Robert Phillips <robertphillips@google.com> Mon Jan 22 10:48:15 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 22 16:53:17 2018 +0000
tree 8c97c1dee833ffed509f0ff106ac75f3f8bf6070
parent 3ba3fa72ae2fd4102cff22b947d124f72ce0f880

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>

bench/GrResourceCacheBench.cpp

diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp
index c48aed5..a530e62 100644
--- a/bench/GrResourceCacheBench.cpp
+++ b/bench/GrResourceCacheBench.cpp
@@ -83,7 +83,7 @@
         cache->purgeAllUnlocked();
         SkASSERT(0 == cache->getResourceCount() && 0 == cache->getResourceBytes());
 
-        GrGpu* gpu = context->getGpu();
+        GrGpu* gpu = context->contextPriv().getGpu();
 
         for (int i = 0; i < loops; ++i) {
             populate_cache(gpu, CACHE_SIZE_COUNT, fKeyData32Count);
@@ -129,7 +129,7 @@
         cache->purgeAllUnlocked();
         SkASSERT(0 == cache->getResourceCount() && 0 == cache->getResourceBytes());
 
-        GrGpu* gpu = fContext->getGpu();
+        GrGpu* gpu = fContext->contextPriv().getGpu();
 
         populate_cache(gpu, CACHE_SIZE_COUNT, fKeyData32Count);
     }

bench/SKPBench.cpp

diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp
index 013ec53..4fbb1bb 100644
--- a/bench/SKPBench.cpp
+++ b/bench/SKPBench.cpp
@@ -12,6 +12,7 @@
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrContextPriv.h"
 #endif
 
 // These CPU tile sizes are not good per se, but they are similar to what Chrome uses.
@@ -189,7 +190,7 @@
     context->flush();
     context->freeGpuResources();
     context->resetContext();
-    context->getGpu()->resetShaderCacheForTesting();
+    context->contextPriv().getGpu()->resetShaderCacheForTesting();
     draw_pic_for_stats(canvas, context, fPic.get(), keys, values, "first_frame");
 
     // draw second frame