From be46e24d57537f7ab6854fcd6f6ec07e2c50495c Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 16 Jan 2018 18:33:07 +0000 Subject: Revert "Move resourceProvider accessor to GrContextPriv" This reverts commit 1f9ed8501b0007846b3032f4bfc38aee98c175a1. Reason for revert: 1. breaking android roll 2. breaking Build-Debian9-Clang-arm-Release-Android_API26 Original change's description: > Move resourceProvider accessor to GrContextPriv > > Change-Id: I5cddd620a7ec4b006b7359864ede58e9d4dd684e > Reviewed-on: https://skia-review.googlesource.com/94340 > Reviewed-by: Brian Salomon > Reviewed-by: Greg Daniel > Commit-Queue: Robert Phillips TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I20b2d267c0925f20453b635663654967199a1197 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/94964 Reviewed-by: Hal Canary Commit-Queue: Hal Canary --- bench/GrResourceCacheBench.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'bench/GrResourceCacheBench.cpp') diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index c48aed5e0b..d78af0a9e5 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -9,11 +9,10 @@ #if SK_SUPPORT_GPU -#include "GrContext.h" -#include "GrContextPriv.h" -#include "GrGpu.h" #include "GrGpuResource.h" #include "GrGpuResourcePriv.h" +#include "GrContext.h" +#include "GrGpu.h" #include "GrResourceCache.h" #include "SkCanvas.h" @@ -77,7 +76,7 @@ protected: // Set the cache budget to be very large so no purging occurs. context->setResourceCacheLimits(CACHE_SIZE_COUNT, 1 << 30); - GrResourceCache* cache = context->contextPriv().getResourceCache(); + GrResourceCache* cache = context->getResourceCache(); // Make sure the cache is empty. cache->purgeAllUnlocked(); @@ -123,7 +122,7 @@ protected: // Set the cache budget to be very large so no purging occurs. fContext->setResourceCacheLimits(CACHE_SIZE_COUNT, 1 << 30); - GrResourceCache* cache = fContext->contextPriv().getResourceCache(); + GrResourceCache* cache = fContext->getResourceCache(); // Make sure the cache is empty. cache->purgeAllUnlocked(); @@ -138,7 +137,7 @@ protected: if (!fContext) { return; } - GrResourceCache* cache = fContext->contextPriv().getResourceCache(); + GrResourceCache* cache = fContext->getResourceCache(); SkASSERT(CACHE_SIZE_COUNT == cache->getResourceCount()); for (int i = 0; i < loops; ++i) { for (int k = 0; k < CACHE_SIZE_COUNT; ++k) { -- cgit v1.2.3