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>
diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp
index 9ae2eb4..f11d2a3 100644
--- a/src/gpu/GrTextureProducer.cpp
+++ b/src/gpu/GrTextureProducer.cpp
@@ -52,7 +52,7 @@
}
sk_sp<GrRenderTargetContext> copyRTC =
- context->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ context->priv().makeDeferredRenderTargetContextWithFallback(
format, SkBackingFit::kExact, dstRect.width(), dstRect.height(),
config, nullptr, 1, mipMapped, inputProxy->origin());
if (!copyRTC) {
@@ -235,14 +235,14 @@
int mipCount = SkMipMap::ComputeLevelCount(this->width(), this->height());
bool willBeMipped = GrSamplerState::Filter::kMipMap == sampler.filter() && mipCount &&
- fContext->contextPriv().caps()->mipMapSupport();
+ fContext->priv().caps()->mipMapSupport();
auto result = this->onRefTextureProxyForParams(sampler, willBeMipped, scaleAdjust);
// Check to make sure that if we say the texture willBeMipped that the returned texture has mip
// maps, unless the config is not copyable.
SkASSERT(!result || !willBeMipped || result->mipMapped() == GrMipMapped::kYes ||
- !fContext->contextPriv().caps()->isConfigCopyable(result->config()));
+ !fContext->priv().caps()->isConfigCopyable(result->config()));
// Check that the "no scaling expected" case always returns a proxy of the same size as the
// producer.
@@ -259,14 +259,14 @@
int mipCount = SkMipMap::ComputeLevelCount(this->width(), this->height());
bool willBeMipped = GrSamplerState::Filter::kMipMap == sampler.filter() && mipCount &&
- fContext->contextPriv().caps()->mipMapSupport();
+ fContext->priv().caps()->mipMapSupport();
auto result = this->onRefTextureProxyForParams(sampler, willBeMipped, nullptr);
// Check to make sure that if we say the texture willBeMipped that the returned texture has mip
// maps, unless the config is not copyable.
SkASSERT(!result || !willBeMipped || result->mipMapped() == GrMipMapped::kYes ||
- !fContext->contextPriv().caps()->isConfigCopyable(result->config()));
+ !fContext->priv().caps()->isConfigCopyable(result->config()));
// Check that no scaling occured and we returned a proxy of the same size as the producer.
SkASSERT(!result || (result->width() == this->width() && result->height() == this->height()));