From 07320e46c0064dc1fe876f4621e94cb9ad529f85 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Fri, 19 Jan 2018 18:18:20 +0000 Subject: 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 > Reviewed-by: Greg Daniel 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 Commit-Queue: Hal Canary --- tests/ImageTest.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/ImageTest.cpp') diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 83ff47c256..078bd7c1bd 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -723,9 +723,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, c std::unique_ptr pixels(new uint32_t[kWidth * kHeight]); GrContext* ctx = ctxInfo.grContext(); - GrGpu* gpu = ctx->contextPriv().getGpu(); - GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture( + GrBackendTexture backendTex = ctxInfo.grContext()->getGpu()->createTestingOnlyBackendTexture( pixels.get(), kWidth, kHeight, kRGBA_8888_GrPixelConfig, true, GrMipMapped::kNo); TextureReleaseChecker releaseChecker; @@ -757,7 +756,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, c refImg.reset(nullptr); // force a release of the image REPORTER_ASSERT(reporter, 1 == releaseChecker.fReleaseCount); - gpu->deleteTestingOnlyBackendTexture(&backendTex); + ctxInfo.grContext()->getGpu()->deleteTestingOnlyBackendTexture(&backendTex); } static void test_cross_context_image(skiatest::Reporter* reporter, const GrContextOptions& options, -- cgit v1.2.3