commit 07320e46c0064dc1fe876f4621e94cb9ad529f85
author Hal Canary <halcanary@google.com> Fri Jan 19 18:18:20 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 19 18:18:24 2018 +0000
tree 45d4d7d185beaa1d58e4b67c7c9eb60d9892d86f
parent b69a2f66448603c26b0265201cec7161cf6d6f75

Revert "Move more internal methods from GrContext to GrContextPriv"

This reverts commit f440cecbfdf1910104f36aedd0e963da2ae8b6a8.

Reason for revert: breaking android builds. 

Original change's description:
> Move more internal methods from GrContext to GrContextPriv
> 
> TBR=bsalomon@google.com
> Change-Id: Ia8cf0e0d30451c69bc7a08215aafa6abe6e0ddbe
> Reviewed-on: https://skia-review.googlesource.com/97080
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>

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

Change-Id: If263f8161f0fbe3fc6ee8f34bb09e237705c3694
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/97200
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

tests/PrimitiveProcessorTest.cpp

diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 406d5e2..b8b9e6f 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -111,9 +111,6 @@
 
 DEF_GPUTEST_FOR_ALL_CONTEXTS(VertexAttributeCount, reporter, ctxInfo) {
     GrContext* context = ctxInfo.grContext();
-#if GR_GPU_STATS
-    GrGpu* gpu = context->contextPriv().getGpu();
-#endif
 
     sk_sp<GrRenderTargetContext> renderTargetContext(context->makeDeferredRenderTargetContext(
                                                                      SkBackingFit::kApprox,
@@ -131,23 +128,23 @@
     context->flush();
     context->resetGpuStats();
 #if GR_GPU_STATS
-    REPORTER_ASSERT(reporter, gpu->stats()->numDraws() == 0);
-    REPORTER_ASSERT(reporter, gpu->stats()->numFailedDraws() == 0);
+    REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 0);
+    REPORTER_ASSERT(reporter, context->getGpu()->stats()->numFailedDraws() == 0);
 #endif
     GrPaint grPaint;
     // This one should succeed.
     renderTargetContext->priv().testingOnly_addDrawOp(Op::Make(attribCnt));
     context->flush();
 #if GR_GPU_STATS
-    REPORTER_ASSERT(reporter, gpu->stats()->numDraws() == 1);
-    REPORTER_ASSERT(reporter, gpu->stats()->numFailedDraws() == 0);
+    REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 1);
+    REPORTER_ASSERT(reporter, context->getGpu()->stats()->numFailedDraws() == 0);
 #endif
     context->resetGpuStats();
     renderTargetContext->priv().testingOnly_addDrawOp(Op::Make(attribCnt + 1));
     context->flush();
 #if GR_GPU_STATS
-    REPORTER_ASSERT(reporter, gpu->stats()->numDraws() == 0);
-    REPORTER_ASSERT(reporter, gpu->stats()->numFailedDraws() == 1);
+    REPORTER_ASSERT(reporter, context->getGpu()->stats()->numDraws() == 0);
+    REPORTER_ASSERT(reporter, context->getGpu()->stats()->numFailedDraws() == 1);
 #endif
 }
 #endif