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/ProxyTest.cpp

diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 8c351b3..b638069 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -105,9 +105,9 @@
 
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredProxyTest, reporter, ctxInfo) {
-    GrProxyProvider* proxyProvider = ctxInfo.grContext()->contextPriv().proxyProvider();
-    GrResourceProvider* resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider();
-    const GrCaps& caps = *ctxInfo.grContext()->contextPriv().caps();
+    GrProxyProvider* proxyProvider = ctxInfo.grContext()->priv().proxyProvider();
+    GrResourceProvider* resourceProvider = ctxInfo.grContext()->priv().resourceProvider();
+    const GrCaps& caps = *ctxInfo.grContext()->priv().caps();
 
     int attempt = 0; // useful for debugging
 
@@ -210,10 +210,10 @@
 }
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) {
-    GrProxyProvider* proxyProvider = ctxInfo.grContext()->contextPriv().proxyProvider();
-    GrResourceProvider* resourceProvider = ctxInfo.grContext()->contextPriv().resourceProvider();
-    GrGpu* gpu = ctxInfo.grContext()->contextPriv().getGpu();
-    const GrCaps& caps = *ctxInfo.grContext()->contextPriv().caps();
+    GrProxyProvider* proxyProvider = ctxInfo.grContext()->priv().proxyProvider();
+    GrResourceProvider* resourceProvider = ctxInfo.grContext()->priv().resourceProvider();
+    GrGpu* gpu = ctxInfo.grContext()->priv().getGpu();
+    const GrCaps& caps = *ctxInfo.grContext()->priv().caps();
 
     static const int kWidthHeight = 100;
 
@@ -347,7 +347,7 @@
 }
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ZeroSizedProxyTest, reporter, ctxInfo) {
-    GrProxyProvider* provider = ctxInfo.grContext()->contextPriv().proxyProvider();
+    GrProxyProvider* provider = ctxInfo.grContext()->priv().proxyProvider();
 
     for (auto flags : { kRenderTarget_GrSurfaceFlag, kNone_GrSurfaceFlags }) {
         for (auto fit : { SkBackingFit::kExact, SkBackingFit::kApprox }) {
@@ -365,7 +365,7 @@
                     desc.fSampleCnt = 1;
 
                     const GrBackendFormat format =
-                        ctxInfo.grContext()->contextPriv().caps()->getBackendFormatFromColorType(
+                        ctxInfo.grContext()->priv().caps()->getBackendFormatFromColorType(
                                 kRGBA_8888_SkColorType);
 
                     sk_sp<GrTextureProxy> proxy = provider->createProxy(