From 2914555e004676465c5255d8b42ee0d25887ac73 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Sat, 20 Jan 2018 17:09:02 +0000 Subject: Revert "Move more internal methods from GrContext to GrContextPriv (take 2)" This reverts commit c22e50bd317fe3658445c04e18a6e319d746c510. Reason for revert: Speculative fix for Android roll Original change's description: > Move more internal methods from GrContext to GrContextPriv (take 2) > > Change-Id: I47108910517d61edeb52f82793d384fdb5605d45 > Reviewed-on: https://skia-review.googlesource.com/97241 > Commit-Queue: Robert Phillips > Reviewed-by: Greg Daniel TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I3a77ac33c5f48529357cf9c683d5f4cacaa2379f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/97582 Reviewed-by: Leon Scroggins Commit-Queue: Leon Scroggins --- bench/SKPBench.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bench/SKPBench.cpp') diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp index 4fbb1bba29..013ec53cda 100644 --- a/bench/SKPBench.cpp +++ b/bench/SKPBench.cpp @@ -12,7 +12,6 @@ #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. @@ -190,7 +189,7 @@ void SKPBench::getGpuStats(SkCanvas* canvas, SkTArray* keys, SkTArray< context->flush(); context->freeGpuResources(); context->resetContext(); - context->contextPriv().getGpu()->resetShaderCacheForTesting(); + context->getGpu()->resetShaderCacheForTesting(); draw_pic_for_stats(canvas, context, fPic.get(), keys, values, "first_frame"); // draw second frame -- cgit v1.2.3