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 --- tests/ClipStackTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/ClipStackTest.cpp') diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index c078422868..fe24bc14e6 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -1486,7 +1486,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ClipMaskCache, reporter, ctxInfo) { path.setFillType(SkPath::kEvenOdd_FillType); static const char* kTag = GrClipStackClip::kMaskTestTag; - GrResourceCache* cache = context->contextPriv().getResourceCache(); + GrResourceCache* cache = context->getResourceCache(); static constexpr int kN = 5; @@ -1496,7 +1496,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ClipMaskCache, reporter, ctxInfo) { stack.save(); stack.clipPath(path, m, SkClipOp::kIntersect, true); sk_sp mask = GrClipStackClip(&stack).testingOnly_createClipMask(context); - mask->instantiate(context->contextPriv().resourceProvider()); + mask->instantiate(context->resourceProvider()); GrTexture* tex = mask->priv().peekTexture(); REPORTER_ASSERT(reporter, 0 == strcmp(tex->getUniqueKey().tag(), kTag)); // Make sure mask isn't pinned in cache. -- cgit v1.2.3