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>

tools/gpu/ProxyUtils.cpp

diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp
index c3fca84..d9f00e6 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -25,34 +25,34 @@
     sk_sp<GrTextureProxy> proxy;
     if (kBottomLeft_GrSurfaceOrigin == origin) {
         // We (soon will) only support using kBottomLeft with wrapped textures.
-        auto backendTex = context->contextPriv().getGpu()->createTestingOnlyBackendTexture(
+        auto backendTex = context->priv().getGpu()->createTestingOnlyBackendTexture(
                 nullptr, width, height, colorType, isRT, GrMipMapped::kNo);
         if (!backendTex.isValid()) {
             return nullptr;
         }
         // Adopt ownership so our caller doesn't have to worry about deleting the backend texture.
         if (isRT) {
-            proxy = context->contextPriv().proxyProvider()->wrapRenderableBackendTexture(
+            proxy = context->priv().proxyProvider()->wrapRenderableBackendTexture(
                     backendTex, origin, 1, kAdopt_GrWrapOwnership, GrWrapCacheable::kNo);
         } else {
-            proxy = context->contextPriv().proxyProvider()->wrapBackendTexture(
+            proxy = context->priv().proxyProvider()->wrapBackendTexture(
                     backendTex, origin, kAdopt_GrWrapOwnership, GrWrapCacheable::kNo, kRW_GrIOType);
         }
 
         if (!proxy) {
-            context->contextPriv().getGpu()->deleteTestingOnlyBackendTexture(backendTex);
+            context->priv().getGpu()->deleteTestingOnlyBackendTexture(backendTex);
             return nullptr;
         }
 
     } else {
         GrPixelConfig config = GrColorTypeToPixelConfig(colorType, srgbEncoded);
-        if (!context->contextPriv().caps()->isConfigTexturable(config)) {
+        if (!context->priv().caps()->isConfigTexturable(config)) {
             return nullptr;
         }
 
         const GrBackendFormat format =
-                context->contextPriv().caps()->getBackendFormatFromGrColorType(colorType,
-                                                                               srgbEncoded);
+                context->priv().caps()->getBackendFormatFromGrColorType(colorType,
+                                                                        srgbEncoded);
         if (!format.isValid()) {
             return nullptr;
         }
@@ -62,18 +62,18 @@
         desc.fWidth = width;
         desc.fHeight = height;
         desc.fFlags = isRT ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags;
-        proxy = context->contextPriv().proxyProvider()->createProxy(
+        proxy = context->priv().proxyProvider()->createProxy(
                 format, desc, origin, SkBackingFit::kExact, SkBudgeted::kYes);
         if (!proxy) {
             return nullptr;
         }
     }
-    auto sContext = context->contextPriv().makeWrappedSurfaceContext(proxy, nullptr);
+    auto sContext = context->priv().makeWrappedSurfaceContext(proxy, nullptr);
     if (!sContext) {
         return nullptr;
     }
-    if (!context->contextPriv().writeSurfacePixels(sContext.get(), 0, 0, width, height, colorType,
-                                                   nullptr, data, rowBytes)) {
+    if (!context->priv().writeSurfacePixels(sContext.get(), 0, 0, width, height, colorType,
+                                            nullptr, data, rowBytes)) {
         return nullptr;
     }
     return proxy;