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/ops/GrAAFillRRectOp.cpp b/src/gpu/ops/GrAAFillRRectOp.cpp
index 2811fda..d472fae 100644
--- a/src/gpu/ops/GrAAFillRRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRRectOp.cpp
@@ -35,7 +35,7 @@
return nullptr;
}
- GrOpMemoryPool* pool = ctx->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = ctx->priv().opMemoryPool();
return pool->allocate<GrAAFillRRectOp>(*caps.shaderCaps(), viewMatrix, rrect, std::move(paint));
}
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 667e230..d4ffc7c 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -29,7 +29,7 @@
GrMaskFormat maskFormat,
int glyphCount,
bool needsTransform) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
std::unique_ptr<GrAtlasTextOp> op = pool->allocate<GrAtlasTextOp>(std::move(paint));
@@ -61,7 +61,7 @@
const SkSurfaceProps& props,
bool isAntiAliased,
bool useLCD) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
std::unique_ptr<GrAtlasTextOp> op = pool->allocate<GrAtlasTextOp>(std::move(paint));
diff --git a/src/gpu/ops/GrClearOp.cpp b/src/gpu/ops/GrClearOp.cpp
index 369a9d5..d0ee441 100644
--- a/src/gpu/ops/GrClearOp.cpp
+++ b/src/gpu/ops/GrClearOp.cpp
@@ -21,7 +21,7 @@
return nullptr;
}
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrClearOp>(clip, color, dstProxy);
}
@@ -32,7 +32,7 @@
bool fullScreen) {
SkASSERT(fullScreen || !rect.isEmpty());
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrClearOp>(rect, color, fullScreen);
}
diff --git a/src/gpu/ops/GrClearStencilClipOp.cpp b/src/gpu/ops/GrClearStencilClipOp.cpp
index 17db9f2..99cfd5f 100644
--- a/src/gpu/ops/GrClearStencilClipOp.cpp
+++ b/src/gpu/ops/GrClearStencilClipOp.cpp
@@ -14,7 +14,7 @@
const GrFixedClip& clip,
bool insideStencilMask,
GrRenderTargetProxy* proxy) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrClearStencilClipOp>(clip, insideStencilMask, proxy);
}
diff --git a/src/gpu/ops/GrCopySurfaceOp.cpp b/src/gpu/ops/GrCopySurfaceOp.cpp
index 9e3a521..8d8e9f1 100644
--- a/src/gpu/ops/GrCopySurfaceOp.cpp
+++ b/src/gpu/ops/GrCopySurfaceOp.cpp
@@ -81,7 +81,7 @@
return nullptr;
}
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrCopySurfaceOp>(dstProxy, srcProxy, clippedSrcRect, clippedDstPoint);
}
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index beed368..1cc378c 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -215,7 +215,7 @@
SkPaint::Cap cap,
AAMode aaMode, bool fullDash,
const GrUserStencilSettings* stencilSettings) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<DashOp>(std::move(paint), geometry, cap,
aaMode, fullDash, stencilSettings);
diff --git a/src/gpu/ops/GrDebugMarkerOp.cpp b/src/gpu/ops/GrDebugMarkerOp.cpp
index ebeba8c..a6d06dc 100644
--- a/src/gpu/ops/GrDebugMarkerOp.cpp
+++ b/src/gpu/ops/GrDebugMarkerOp.cpp
@@ -17,7 +17,7 @@
std::unique_ptr<GrOp> GrDebugMarkerOp::Make(GrContext* context,
GrRenderTargetProxy* proxy,
const SkString& str) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrDebugMarkerOp>(proxy, str);
}
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index 8d02106..e162b05 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -68,7 +68,7 @@
GrPaint&& paint,
GrAAType aaType,
GrPath* path) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrDrawPathOp>(viewMatrix, std::move(paint), aaType, path);
}
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 6a84c3f..bdcc20c 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -609,7 +609,7 @@
do {
type = GrPrimitiveType(random->nextULessThan(kNumGrPrimitiveTypes));
} while (GrPrimTypeRequiresGeometryShaderSupport(type) &&
- !context->contextPriv().caps()->shaderCaps()->geometryShaderSupport());
+ !context->priv().caps()->shaderCaps()->geometryShaderSupport());
uint32_t primitiveCount = random->nextRangeU(1, 100);
diff --git a/src/gpu/ops/GrDrawableOp.cpp b/src/gpu/ops/GrDrawableOp.cpp
index 1b0bbd2..834fedd 100644
--- a/src/gpu/ops/GrDrawableOp.cpp
+++ b/src/gpu/ops/GrDrawableOp.cpp
@@ -17,7 +17,7 @@
std::unique_ptr<GrDrawableOp> GrDrawableOp::Make(
GrContext* context, std::unique_ptr<SkDrawable::GpuDrawHandler> drawable,
const SkRect& bounds) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrDrawableOp>(std::move(drawable), bounds);
}
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 6b9a448..948b7db 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -398,8 +398,8 @@
GrSurfaceOrigin origin =
random->nextBool() ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
- auto proxy = context->contextPriv().proxyProvider()->createProxy(
+ context->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ auto proxy = context->priv().proxyProvider()->createProxy(
format, desc, origin, SkBackingFit::kExact, SkBudgeted::kYes);
do {
diff --git a/src/gpu/ops/GrSemaphoreOp.cpp b/src/gpu/ops/GrSemaphoreOp.cpp
index b0a96eb..7160f20 100644
--- a/src/gpu/ops/GrSemaphoreOp.cpp
+++ b/src/gpu/ops/GrSemaphoreOp.cpp
@@ -20,7 +20,7 @@
static std::unique_ptr<GrOp> Make(GrContext* context,
sk_sp<GrSemaphore> semaphore,
GrRenderTargetProxy* proxy) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrWaitSemaphoreOp>(std::move(semaphore), proxy);
}
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index fdbb82d..dd091a3 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -640,7 +640,7 @@
SkScalar scaledRadius = SkScalarAbs(radius*matrixFactor);
SkScalar scaledInsetWidth = SkScalarAbs(insetWidth*matrixFactor);
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<ShadowCircularRRectOp>(color, bounds,
scaledRadius,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index f9c6f41..8ed33af 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -196,7 +196,7 @@
std::unique_ptr<GrDrawOp> GrSimpleMeshDrawOpHelper::FactoryHelper(GrContext* context,
GrPaint&& paint,
OpArgs... opArgs) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
MakeArgs makeArgs;
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 3eb884b..5132319 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -873,9 +873,9 @@
SkASSERT(args.fShape->hasUnstyledKey());
if (!fAtlas) {
const GrBackendFormat format =
- args.fContext->contextPriv().caps()->getBackendFormatFromColorType(
+ args.fContext->priv().caps()->getBackendFormatFromColorType(
kAlpha_8_SkColorType);
- fAtlas = GrDrawOpAtlas::Make(args.fContext->contextPriv().proxyProvider(),
+ fAtlas = GrDrawOpAtlas::Make(args.fContext->priv().proxyProvider(),
format,
kAlpha_8_GrPixelConfig,
ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
@@ -960,12 +960,12 @@
using PathTestStruct = GrSmallPathRenderer::PathTestStruct;
static PathTestStruct gTestStruct;
- if (context->contextPriv().contextID() != gTestStruct.fContextID) {
- gTestStruct.fContextID = context->contextPriv().contextID();
+ if (context->priv().contextID() != gTestStruct.fContextID) {
+ gTestStruct.fContextID = context->priv().contextID();
gTestStruct.reset();
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
- gTestStruct.fAtlas = GrDrawOpAtlas::Make(context->contextPriv().proxyProvider(),
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ gTestStruct.fAtlas = GrDrawOpAtlas::Make(context->priv().proxyProvider(),
format, kAlpha_8_GrPixelConfig,
ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
PLOT_WIDTH, PLOT_HEIGHT,
diff --git a/src/gpu/ops/GrStencilPathOp.cpp b/src/gpu/ops/GrStencilPathOp.cpp
index 0366d8c..7d913ea 100644
--- a/src/gpu/ops/GrStencilPathOp.cpp
+++ b/src/gpu/ops/GrStencilPathOp.cpp
@@ -21,7 +21,7 @@
bool hasStencilClip,
const GrScissorState& scissor,
const GrPath* path) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrStencilPathOp>(viewMatrix, useHWAA, fillType,
hasStencilClip, scissor, path);
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index a31e695..4ebe9f6 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -107,7 +107,7 @@
SkCanvas::SrcRectConstraint constraint,
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureColorSpaceXform) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<TextureOp>(
std::move(proxy), filter, color, srcRect, dstRect, aaType, aaFlags, constraint,
@@ -119,7 +119,7 @@
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureColorSpaceXform) {
size_t size = sizeof(TextureOp) + sizeof(Proxy) * (cnt - 1);
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
void* mem = pool->allocate(size);
return std::unique_ptr<GrDrawOp>(new (mem) TextureOp(set, cnt, filter, aaType, viewMatrix,
std::move(textureColorSpaceXform)));
@@ -604,9 +604,9 @@
}
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy = proxyProvider->createProxy(format, desc, origin, mipMapped, fit,
SkBudgeted::kNo,
GrInternalSurfaceFlags::kNone);