Rename GrShape to GrStyledShape
Change-Id: Ic457e634b4b95356f5615cff3fce1ca7d7677c26
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284036
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index d958e5f..ab01e99 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -50,8 +50,8 @@
public:
ShapeDataKey() {}
ShapeDataKey(const ShapeDataKey& that) { *this = that; }
- ShapeDataKey(const GrShape& shape, uint32_t dim) { this->set(shape, dim); }
- ShapeDataKey(const GrShape& shape, const SkMatrix& ctm) { this->set(shape, ctm); }
+ ShapeDataKey(const GrStyledShape& shape, uint32_t dim) { this->set(shape, dim); }
+ ShapeDataKey(const GrStyledShape& shape, const SkMatrix& ctm) { this->set(shape, ctm); }
ShapeDataKey& operator=(const ShapeDataKey& that) {
fKey.reset(that.fKey.count());
@@ -60,7 +60,7 @@
}
// for SDF paths
- void set(const GrShape& shape, uint32_t dim) {
+ void set(const GrStyledShape& shape, uint32_t dim) {
// Shapes' keys are for their pre-style geometry, but by now we shouldn't have any
// relevant styling information.
SkASSERT(shape.style().isSimpleFill());
@@ -72,7 +72,7 @@
}
// for bitmap paths
- void set(const GrShape& shape, const SkMatrix& ctm) {
+ void set(const GrStyledShape& shape, const SkMatrix& ctm) {
// Shapes' keys are for their pre-style geometry, but by now we shouldn't have any
// relevant styling information.
SkASSERT(shape.style().isSimpleFill());
@@ -108,7 +108,7 @@
const uint32_t* data() const { return fKey.get(); }
private:
- // The key is composed of the GrShape's key, and either the dimensions of the DF
+ // The key is composed of the GrStyledShape's key, and either the dimensions of the DF
// generated for the path (32x32 max, 64x64 max, 128x128 max) if an SDF image or
// the matrix for the path with only fractional translation.
SkAutoSTArray<24, uint32_t> fKey;
@@ -228,7 +228,7 @@
static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMatrix& viewMatrix,
GrDrawOpAtlas* atlas,
ShapeCache* shapeCache,
@@ -240,7 +240,7 @@
stencilSettings);
}
- SmallPathOp(Helper::MakeArgs helperArgs, const SkPMColor4f& color, const GrShape& shape,
+ SmallPathOp(Helper::MakeArgs helperArgs, const SkPMColor4f& color, const GrStyledShape& shape,
const SkMatrix& viewMatrix, GrDrawOpAtlas* atlas, ShapeCache* shapeCache,
ShapeDataList* shapeList, bool gammaCorrect,
const GrUserStencilSettings* stencilSettings)
@@ -539,7 +539,7 @@
}
bool addDFPathToAtlas(GrMeshDrawOp::Target* target, FlushInfo* flushInfo,
- GrDrawOpAtlas* atlas, ShapeData* shapeData, const GrShape& shape,
+ GrDrawOpAtlas* atlas, ShapeData* shapeData, const GrStyledShape& shape,
uint32_t dimension, SkScalar scale) const {
const SkRect& bounds = shape.bounds();
@@ -644,7 +644,7 @@
}
bool addBMPathToAtlas(GrMeshDrawOp::Target* target, FlushInfo* flushInfo,
- GrDrawOpAtlas* atlas, ShapeData* shapeData, const GrShape& shape,
+ GrDrawOpAtlas* atlas, ShapeData* shapeData, const GrStyledShape& shape,
const SkMatrix& ctm) const {
const SkRect& bounds = shape.bounds();
if (bounds.isEmpty()) {
@@ -840,9 +840,9 @@
bool fUsesDistanceField;
struct Entry {
- SkPMColor4f fColor;
- GrShape fShape;
- SkMatrix fViewMatrix;
+ SkPMColor4f fColor;
+ GrStyledShape fShape;
+ SkMatrix fViewMatrix;
};
SkSTArray<1, Entry> fShapes;
@@ -933,7 +933,7 @@
std::unique_ptr<GrDrawOp> GrSmallPathRenderer::createOp_TestingOnly(
GrRecordingContext* context,
GrPaint&& paint,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMatrix& viewMatrix,
GrDrawOpAtlas* atlas,
ShapeCache* shapeCache,
@@ -970,7 +970,7 @@
bool gammaCorrect = random->nextBool();
// This path renderer only allows fill styles.
- GrShape shape(GrTest::TestPath(random), GrStyle::SimpleFill());
+ GrStyledShape shape(GrTest::TestPath(random), GrStyle::SimpleFill());
return GrSmallPathRenderer::createOp_TestingOnly(
context,
std::move(paint), shape, viewMatrix,