commit 9da87e0e984f0da1d8a2a6783ea8afcb2c4f6b38
author Robert Phillips <robertphillips@google.com> Mon Feb 04 13:26:26 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 04 22:13:14 2019 +0000
tree 74b0e5113c44fbabaaebbd0cffda443ab8bc6130
parent 50ea3c06b80f7322c64fd99926edcdd7ea398213

Rename GrContext::contextPriv to priv

Mechanical. This makes the priv() accessor the same for all the context types.

Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa
Reviewed-on: https://skia-review.googlesource.com/c/189164
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

tests/RectangleTextureTest.cpp

diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index 7ca72fc..e9f286f 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -25,7 +25,7 @@
                                    sk_sp<GrTextureProxy> rectProxy, uint32_t expectedPixelValues[]) {
     GrBackendFormat format = rectProxy->backendFormat().makeTexture2D();
     SkASSERT(format.isValid());
-    sk_sp<GrRenderTargetContext> rtContext(context->contextPriv().makeDeferredRenderTargetContext(
+    sk_sp<GrRenderTargetContext> rtContext(context->priv().makeDeferredRenderTargetContext(
                                                      format,
                                                      SkBackingFit::kExact, rectProxy->width(),
                                                      rectProxy->height(), rectProxy->config(),
@@ -93,7 +93,7 @@
 
 DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(RectangleTexture, reporter, ctxInfo) {
     GrContext* context = ctxInfo.grContext();
-    GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+    GrProxyProvider* proxyProvider = context->priv().proxyProvider();
     sk_gpu_test::GLTestContext* glContext = ctxInfo.glContext();
     static const int kWidth = 13;
     static const int kHeight = 13;
@@ -159,13 +159,13 @@
         test_copy_from_surface(reporter, context, rectProxy.get(), refPixels,
                                false, "RectangleTexture-copy-from");
 
-        sk_sp<GrSurfaceContext> rectContext = context->contextPriv().makeWrappedSurfaceContext(
+        sk_sp<GrSurfaceContext> rectContext = context->priv().makeWrappedSurfaceContext(
                                                                             std::move(rectProxy));
         SkASSERT(rectContext);
 
         test_read_pixels(reporter, rectContext.get(), refPixels, "RectangleTexture-read");
 
-        test_copy_to_surface(reporter, context->contextPriv().proxyProvider(),
+        test_copy_to_surface(reporter, context->priv().proxyProvider(),
                               rectContext.get(), "RectangleTexture-copy-to");
 
         test_write_pixels(reporter, rectContext.get(), true, "RectangleTexture-write");