Reland "Rename GrShape to GrStyledShape"
This reverts commit 73b86c1ade1c002cfa4da66c33c25514737e2416.
Reason for revert: wasn't the problem, relanding
Original change's description:
> Revert "Rename GrShape to GrStyledShape"
>
> This reverts commit f3f08af010eebdb9c1501bdf1b3d8e715298b05f.
>
> Reason for revert: maybe this is breaking the ios perf bot; it is the first CL that caused the bot to fail, but I can't really say why this would break them.
>
> Original change's description:
> > 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>
>
> TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Change-Id: I2e5adbfc820811fbbde9cb57af28f86a7ba40bd9
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284231
> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com
Change-Id: Ifdd52f8bacb5d66a7bf58efd328675c4c443ac8a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284376
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp
index 8d0bab9..876e17c 100644
--- a/src/atlastext/SkAtlasTextTarget.cpp
+++ b/src/atlastext/SkAtlasTextTarget.cpp
@@ -98,7 +98,7 @@
void addDrawOp(const GrClip&, std::unique_ptr<GrAtlasTextOp> op) override;
void drawShape(const GrClip&, const SkPaint&, const SkMatrix& viewMatrix,
- const GrShape&) override {
+ const GrStyledShape&) override {
SkDebugf("Path glyph??");
}
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 58cc93d..8bc2083 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -32,7 +32,7 @@
#include "src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h"
#include "src/gpu/effects/generated/GrRRectBlurEffect.h"
#include "src/gpu/effects/generated/GrRectBlurEffect.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLProgramDataManager.h"
@@ -49,7 +49,7 @@
SkIPoint* margin) const override;
#if SK_SUPPORT_GPU
- bool canFilterMaskGPU(const GrShape& shape,
+ bool canFilterMaskGPU(const GrStyledShape& shape,
const SkIRect& devSpaceShapeBounds,
const SkIRect& clipBounds,
const SkMatrix& ctm,
@@ -59,7 +59,7 @@
GrPaint&&,
const GrClip&,
const SkMatrix& viewMatrix,
- const GrShape& shape) const override;
+ const GrStyledShape& shape) const override;
GrSurfaceProxyView filterMaskGPU(GrRecordingContext*,
GrSurfaceProxyView srcView,
GrColorType srcColorType,
@@ -723,7 +723,7 @@
GrPaint&& paint,
const GrClip& clip,
const SkMatrix& viewMatrix,
- const GrShape& shape) const {
+ const GrStyledShape& shape) const {
SkASSERT(renderTargetContext);
if (fBlurStyle != kNormal_SkBlurStyle) {
@@ -826,7 +826,7 @@
return true;
}
-bool SkBlurMaskFilterImpl::canFilterMaskGPU(const GrShape& shape,
+bool SkBlurMaskFilterImpl::canFilterMaskGPU(const GrStyledShape& shape,
const SkIRect& devSpaceShapeBounds,
const SkIRect& clipBounds,
const SkMatrix& ctm,
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index d7288e5..aa17088 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -324,7 +324,7 @@
}
bool SkMaskFilterBase::onHasFragmentProcessor() const { return false; }
-bool SkMaskFilterBase::canFilterMaskGPU(const GrShape& shape,
+bool SkMaskFilterBase::canFilterMaskGPU(const GrStyledShape& shape,
const SkIRect& devSpaceShapeBounds,
const SkIRect& clipBounds,
const SkMatrix& ctm,
@@ -337,7 +337,7 @@
GrPaint&&,
const GrClip&,
const SkMatrix& viewMatrix,
- const GrShape&) const {
+ const GrStyledShape&) const {
return false;
}
diff --git a/src/core/SkMaskFilterBase.h b/src/core/SkMaskFilterBase.h
index f934e1f..1d8ecb1 100644
--- a/src/core/SkMaskFilterBase.h
+++ b/src/core/SkMaskFilterBase.h
@@ -28,7 +28,7 @@
class GrRenderTarget;
class GrRenderTargetContext;
class GrResourceProvider;
-class GrShape;
+class GrStyledShape;
class GrSurfaceProxyView;
class GrTexture;
class GrTextureProxy;
@@ -103,7 +103,7 @@
* filterMaskGPU(devShape, ...)
* this would hide the RRect special case and the mask generation
*/
- virtual bool canFilterMaskGPU(const GrShape&,
+ virtual bool canFilterMaskGPU(const GrStyledShape&,
const SkIRect& devSpaceShapeBounds,
const SkIRect& clipBounds,
const SkMatrix& ctm,
@@ -118,7 +118,7 @@
GrPaint&& paint,
const GrClip&,
const SkMatrix& viewMatrix,
- const GrShape& shape) const;
+ const GrStyledShape& shape) const;
/**
* This function is used to implement filters that require an explicit src mask. It should only
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 72c5d55..476d075 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -19,7 +19,7 @@
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/effects/GrTextureEffect.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "include/core/SkPaint.h"
#include "src/core/SkDraw.h"
@@ -71,7 +71,7 @@
GrRenderTargetContext* renderTargetContext,
const GrClip& clipData,
const SkMatrix& viewMatrix,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMaskFilter* filter,
const SkIRect& clipBounds,
GrPaint&& paint,
@@ -174,7 +174,7 @@
static std::unique_ptr<GrRenderTargetContext> create_mask_GPU(GrRecordingContext* context,
const SkIRect& maskRect,
const SkMatrix& origViewMatrix,
- const GrShape& shape,
+ const GrStyledShape& shape,
int sampleCnt) {
// Use GrResourceProvider::MakeApprox to implement our own approximate size matching, but demand
// a "SkBackingFit::kExact" size match on the actual render target. We do this because the
@@ -210,7 +210,7 @@
return rtContext;
}
-static bool get_unclipped_shape_dev_bounds(const GrShape& shape, const SkMatrix& matrix,
+static bool get_unclipped_shape_dev_bounds(const GrStyledShape& shape, const SkMatrix& matrix,
SkIRect* devBounds) {
SkRect shapeBounds = shape.styledBounds();
if (shapeBounds.isEmpty()) {
@@ -239,7 +239,7 @@
// is no intersection.
static bool get_shape_and_clip_bounds(GrRenderTargetContext* renderTargetContext,
const GrClip& clip,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMatrix& matrix,
SkIRect* unclippedDevShapeBounds,
SkIRect* devClipBounds) {
@@ -262,11 +262,11 @@
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkMaskFilterBase* maskFilter,
- const GrShape& origShape) {
+ const GrStyledShape& origShape) {
SkASSERT(maskFilter);
- const GrShape* shape = &origShape;
- SkTLazy<GrShape> tmpShape;
+ const GrStyledShape* shape = &origShape;
+ SkTLazy<GrStyledShape> tmpShape;
if (origShape.style().applies()) {
SkScalar styleScale = GrStyle::MatrixToScaleFactor(viewMatrix);
@@ -440,7 +440,7 @@
void GrBlurUtils::drawShapeWithMaskFilter(GrRecordingContext* context,
GrRenderTargetContext* renderTargetContext,
const GrClip& clip,
- const GrShape& shape,
+ const GrStyledShape& shape,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkMaskFilter* mf) {
@@ -453,7 +453,7 @@
const GrClip& clip,
const SkPaint& paint,
const SkMatrix& viewMatrix,
- const GrShape& shape) {
+ const GrStyledShape& shape) {
if (context->priv().abandoned()) {
return;
}
diff --git a/src/gpu/GrBlurUtils.h b/src/gpu/GrBlurUtils.h
index d2f2570..51c54be 100644
--- a/src/gpu/GrBlurUtils.h
+++ b/src/gpu/GrBlurUtils.h
@@ -16,7 +16,7 @@
class GrRecordingContext;
class GrRenderTarget;
class GrRenderTargetContext;
-class GrShape;
+class GrStyledShape;
class GrStyle;
struct SkIRect;
class SkMaskFilter;
@@ -38,7 +38,7 @@
const GrClip&,
const SkPaint&,
const SkMatrix& viewMatrix,
- const GrShape&);
+ const GrStyledShape&);
/**
* Draw a shape handling the mask filter. The mask filter is not optional.
@@ -47,7 +47,7 @@
void drawShapeWithMaskFilter(GrRecordingContext*,
GrRenderTargetContext*,
const GrClip&,
- const GrShape&,
+ const GrStyledShape&,
GrPaint&&,
const SkMatrix& viewMatrix,
const SkMaskFilter*);
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 63409c2..3c10df9 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -28,7 +28,7 @@
#include "src/gpu/effects/GrRRectEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/effects/generated/GrDeviceSpaceEffect.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
typedef SkClipStack::Element Element;
typedef GrReducedClip::InitialState InitialState;
@@ -131,7 +131,7 @@
needsStencil ? GrPathRendererChain::DrawType::kStencilAndColor
: GrPathRendererChain::DrawType::kColor;
- GrShape shape(path, GrStyle::SimpleFill());
+ GrStyledShape shape(path, GrStyle::SimpleFill());
GrPathRenderer::CanDrawPathArgs canDrawArgs;
canDrawArgs.fCaps = context->priv().caps();
canDrawArgs.fProxy = renderTargetContext->asRenderTargetProxy();
@@ -450,7 +450,7 @@
SkPath clipPath;
element->asDeviceSpacePath(&clipPath);
clipPath.toggleInverseFillType();
- GrShape shape(clipPath, GrStyle::SimpleFill());
+ GrStyledShape shape(clipPath, GrStyle::SimpleFill());
helper.drawShape(shape, translate, SkRegion::kReplace_Op, aa, 0x00);
continue;
}
@@ -462,7 +462,7 @@
} else {
SkPath path;
element->asDeviceSpacePath(&path);
- GrShape shape(path, GrStyle::SimpleFill());
+ GrStyledShape shape(path, GrStyle::SimpleFill());
helper.drawShape(shape, translate, (SkRegion::Op)op, aa, 0xFF);
}
}
diff --git a/src/gpu/GrPath.cpp b/src/gpu/GrPath.cpp
index 625f8c4..b214187 100644
--- a/src/gpu/GrPath.cpp
+++ b/src/gpu/GrPath.cpp
@@ -6,7 +6,7 @@
*/
#include "src/gpu/GrPath.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
static inline void write_style_key(uint32_t* key, const GrStyle& style) {
// Pass 1 for the scale since the GPU will apply the style not GrStyle::applyToPath().
@@ -14,7 +14,7 @@
}
-void GrPath::ComputeKey(const GrShape& shape, GrUniqueKey* key, bool* outIsVolatile) {
+void GrPath::ComputeKey(const GrStyledShape& shape, GrUniqueKey* key, bool* outIsVolatile) {
int geoCnt = shape.unstyledKeySize();
int styleCnt = GrStyle::KeySize(shape.style(), GrStyle::Apply::kPathEffectAndStrokeRec);
// This should only fail for an arbitrary path effect, and we should not have gotten
diff --git a/src/gpu/GrPath.h b/src/gpu/GrPath.h
index 9fc84fd..1792870 100644
--- a/src/gpu/GrPath.h
+++ b/src/gpu/GrPath.h
@@ -14,7 +14,7 @@
#include "src/gpu/GrPathRendering.h"
#include "src/gpu/GrStyle.h"
-class GrShape;
+class GrStyledShape;
class GrPath : public GrGpuResource {
public:
@@ -32,7 +32,7 @@
{
}
- static void ComputeKey(const GrShape&, GrUniqueKey* key, bool* outIsVolatile);
+ static void ComputeKey(const GrStyledShape&, GrUniqueKey* key, bool* outIsVolatile);
const SkRect& getBounds() const { return fBounds; }
diff --git a/src/gpu/GrPathRenderer.cpp b/src/gpu/GrPathRenderer.cpp
index ecc9e09..b049a8b 100644
--- a/src/gpu/GrPathRenderer.cpp
+++ b/src/gpu/GrPathRenderer.cpp
@@ -12,7 +12,7 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrUserStencilSettings.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#ifdef SK_DEBUG
void GrPathRenderer::StencilPathArgs::validate() const {
@@ -32,7 +32,7 @@
GrPathRenderer::GrPathRenderer() {}
-GrPathRenderer::StencilSupport GrPathRenderer::getStencilSupport(const GrShape& shape) const {
+GrPathRenderer::StencilSupport GrPathRenderer::getStencilSupport(const GrStyledShape& shape) const {
SkDEBUGCODE(SkPath path;)
SkDEBUGCODE(shape.asPath(&path);)
SkASSERT(shape.style().isSimpleFill());
diff --git a/src/gpu/GrPathRenderer.h b/src/gpu/GrPathRenderer.h
index e29a42c..04bbcab 100644
--- a/src/gpu/GrPathRenderer.h
+++ b/src/gpu/GrPathRenderer.h
@@ -20,7 +20,7 @@
class GrRecordingContext;
class GrRenderTargetContext;
class GrRenderTargetProxy;
-class GrShape;
+class GrStyledShape;
class GrStyle;
struct GrUserStencilSettings;
struct SkIRect;
@@ -67,7 +67,7 @@
* @param shape the shape that will be drawn. Must be simple fill styled and non-inverse
* filled.
*/
- StencilSupport getStencilSupport(const GrShape& shape) const;
+ StencilSupport getStencilSupport(const GrStyledShape& shape) const;
enum class CanDrawPath {
kNo,
@@ -82,7 +82,7 @@
const GrRenderTargetProxy* fProxy;
const SkIRect* fClipConservativeBounds;
const SkMatrix* fViewMatrix;
- const GrShape* fShape;
+ const GrStyledShape* fShape;
GrAAType fAAType;
bool fTargetIsWrappedVkSecondaryCB;
@@ -118,7 +118,7 @@
const GrClip* fClip;
const SkIRect* fClipConservativeBounds;
const SkMatrix* fViewMatrix;
- const GrShape* fShape;
+ const GrStyledShape* fShape;
GrAAType fAAType;
bool fGammaCorrect;
#ifdef SK_DEBUG
@@ -150,7 +150,7 @@
const GrHardClip* fClip;
const SkIRect* fClipConservativeBounds;
const SkMatrix* fViewMatrix;
- const GrShape* fShape;
+ const GrStyledShape* fShape;
GrAA fDoStencilMSAA;
SkDEBUGCODE(void validate() const);
@@ -183,7 +183,7 @@
/**
* Subclass overrides if it has any limitations of stenciling support.
*/
- virtual StencilSupport onGetStencilSupport(const GrShape&) const {
+ virtual StencilSupport onGetStencilSupport(const GrStyledShape&) const {
return kNoRestriction_StencilSupport;
}
diff --git a/src/gpu/GrPathRendering_none.cpp b/src/gpu/GrPathRendering_none.cpp
index 0e12a36..048e8a3 100644
--- a/src/gpu/GrPathRendering_none.cpp
+++ b/src/gpu/GrPathRendering_none.cpp
@@ -53,4 +53,4 @@
const GrScissorState&,
sk_sp<const GrPath>) { return nullptr; }
-void GrPath::ComputeKey(const GrShape&, GrUniqueKey*, bool*) {}
+void GrPath::ComputeKey(const GrStyledShape&, GrUniqueKey*, bool*) {}
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 008e2ba..696dbc2 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -24,7 +24,7 @@
#include "src/gpu/effects/GrConvexPolyEffect.h"
#include "src/gpu/effects/GrRRectEffect.h"
#include "src/gpu/effects/generated/GrAARectEffect.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
/**
* There are plenty of optimizations that could be added here. Maybe flips could be folded into
@@ -861,7 +861,7 @@
clipPath.toggleInverseFillType();
}
- GrShape shape(clipPath, GrStyle::SimpleFill());
+ GrStyledShape shape(clipPath, GrStyle::SimpleFill());
GrPathRenderer::CanDrawPathArgs canDrawArgs;
canDrawArgs.fCaps = context->priv().caps();
canDrawArgs.fProxy = renderTargetContext->asRenderTargetProxy();
@@ -906,7 +906,7 @@
GrAA(doStencilMSAA), element->getDeviceSpaceRect());
} else {
if (!clipPath.isEmpty()) {
- GrShape shape(clipPath, GrStyle::SimpleFill());
+ GrStyledShape shape(clipPath, GrStyle::SimpleFill());
if (canRenderDirectToStencil) {
GrPaint paint;
paint.setXPFactory(GrDisableColorXPFactory::Get());
@@ -945,7 +945,7 @@
stencil_device_rect(renderTargetContext, stencilClip, *pass,
GrAA(doStencilMSAA), element->getDeviceSpaceRect());
} else {
- GrShape shape(clipPath, GrStyle::SimpleFill());
+ GrStyledShape shape(clipPath, GrStyle::SimpleFill());
GrPaint paint;
paint.setXPFactory(GrDisableColorXPFactory::Get());
GrPathRenderer::DrawPathArgs args{context,
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 79563e6..f291979 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -52,7 +52,7 @@
#include "src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h"
#include "src/gpu/geometry/GrQuad.h"
#include "src/gpu/geometry/GrQuadUtils.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrAtlasTextOp.h"
#include "src/gpu/ops/GrClearOp.h"
#include "src/gpu/ops/GrClearStencilClipOp.h"
@@ -86,7 +86,7 @@
}
void drawShape(const GrClip& clip, const SkPaint& paint,
- const SkMatrix& viewMatrix, const GrShape& shape) override {
+ const SkMatrix& viewMatrix, const GrStyledShape& shape) override {
GrBlurUtils::drawShapeWithMaskFilter(fRenderTargetContext->fContext, fRenderTargetContext,
clip, paint, viewMatrix, shape);
}
@@ -877,7 +877,7 @@
if ((!rect.width() || !rect.height()) &&
SkStrokeRec::kHairline_Style != stroke.getStyle()) {
SkScalar r = stroke.getWidth() / 2;
- // TODO: Move these stroke->fill fallbacks to GrShape?
+ // TODO: Move these stroke->fill fallbacks to GrStyledShape?
switch (stroke.getJoin()) {
case SkPaint::kMiter_Join:
this->drawRect(
@@ -919,7 +919,8 @@
}
}
assert_alive(paint);
- this->drawShapeUsingPathRenderer(clip, std::move(paint), aa, viewMatrix, GrShape(rect, *style));
+ this->drawShapeUsingPathRenderer(clip, std::move(paint), aa, viewMatrix,
+ GrStyledShape(rect, *style));
}
void GrRenderTargetContext::drawQuadSet(const GrClip& clip, GrPaint&& paint, GrAA aa,
@@ -1188,7 +1189,7 @@
assert_alive(paint);
this->drawShapeUsingPathRenderer(*clip, std::move(paint), aa, viewMatrix,
- GrShape(rrect, style));
+ GrStyledShape(rrect, style));
}
///////////////////////////////////////////////////////////////////////////////
@@ -1510,7 +1511,7 @@
path.addRRect(inner);
path.addRRect(outer);
path.setFillType(SkPathFillType::kEvenOdd);
- this->drawShapeUsingPathRenderer(clip, std::move(paint), aa, viewMatrix, GrShape(path));
+ this->drawShapeUsingPathRenderer(clip, std::move(paint), aa, viewMatrix, GrStyledShape(path));
}
///////////////////////////////////////////////////////////////////////////////
@@ -1609,7 +1610,7 @@
assert_alive(paint);
this->drawShapeUsingPathRenderer(
clip, std::move(paint), aa, viewMatrix,
- GrShape(SkRRect::MakeOval(oval), SkPathDirection::kCW, 2, false, style));
+ GrStyledShape(SkRRect::MakeOval(oval), SkPathDirection::kCW, 2, false, style));
}
void GrRenderTargetContext::drawArc(const GrClip& clip,
@@ -1648,7 +1649,7 @@
}
this->drawShapeUsingPathRenderer(
clip, std::move(paint), aa, viewMatrix,
- GrShape::MakeArc(oval, startAngle, sweepAngle, useCenter, style));
+ GrStyledShape::MakeArc(oval, startAngle, sweepAngle, useCenter, style));
}
void GrRenderTargetContext::drawImageLattice(const GrClip& clip,
@@ -2227,7 +2228,7 @@
SkDEBUGCODE(this->validate();)
GR_CREATE_TRACE_MARKER_CONTEXT("GrRenderTargetContext", "drawPath", fContext);
- GrShape shape(path, style);
+ GrStyledShape shape(path, style);
this->drawShape(clip, std::move(paint), aa, viewMatrix, shape);
}
@@ -2236,7 +2237,7 @@
GrPaint&& paint,
GrAA aa,
const SkMatrix& viewMatrix,
- const GrShape& shape) {
+ const GrStyledShape& shape) {
ASSERT_SINGLE_OWNER
RETURN_IF_ABANDONED
SkDEBUGCODE(this->validate();)
@@ -2323,7 +2324,7 @@
clip.getConservativeBounds(fRenderTargetContext->width(), fRenderTargetContext->height(),
&clipConservativeBounds, nullptr);
- GrShape shape(path, GrStyle::SimpleFill());
+ GrStyledShape shape(path, GrStyle::SimpleFill());
GrPathRenderer::CanDrawPathArgs canDrawArgs;
canDrawArgs.fCaps = fRenderTargetContext->caps();
canDrawArgs.fProxy = fRenderTargetContext->asRenderTargetProxy();
@@ -2375,7 +2376,7 @@
GrPaint&& paint,
GrAA aa,
const SkMatrix& viewMatrix,
- const GrShape& originalShape) {
+ const GrStyledShape& originalShape) {
ASSERT_SINGLE_OWNER
RETURN_IF_ABANDONED
GR_CREATE_TRACE_MARKER_CONTEXT("GrRenderTargetContext", "internalDrawPath", fContext);
@@ -2387,7 +2388,7 @@
SkIRect clipConservativeBounds;
clip.getConservativeBounds(this->width(), this->height(), &clipConservativeBounds, nullptr);
- GrShape tempShape;
+ GrStyledShape tempShape;
GrAAType aaType = this->chooseAAType(aa);
GrPathRenderer::CanDrawPathArgs canDrawArgs;
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index b3b3379..44fed20 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -32,7 +32,7 @@
class GrOp;
class GrRenderTarget;
class GrRenderTargetContextPriv;
-class GrShape;
+class GrStyledShape;
class GrStyle;
class GrTextureProxy;
struct GrUserStencilSettings;
@@ -407,7 +407,7 @@
GrPaint&&,
GrAA,
const SkMatrix& viewMatrix,
- const GrShape&);
+ const GrStyledShape&);
/**
@@ -671,7 +671,7 @@
const SkRect* domain = nullptr);
void drawShapeUsingPathRenderer(const GrClip&, GrPaint&&, GrAA, const SkMatrix&,
- const GrShape&);
+ const GrStyledShape&);
void addOp(std::unique_ptr<GrOp>);
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index 02dc626..840396b 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -14,7 +14,7 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrSurfaceContext.h"
#include "src/gpu/GrTextureProxy.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
/*
* Convert a boolean operation into a transfer mode code
@@ -53,7 +53,7 @@
/**
* Draw a single path element of the clip stack into the accumulation bitmap
*/
-void GrSWMaskHelper::drawShape(const GrShape& shape, const SkMatrix& matrix, SkRegion::Op op,
+void GrSWMaskHelper::drawShape(const GrStyledShape& shape, const SkMatrix& matrix, SkRegion::Op op,
GrAA aa, uint8_t alpha) {
SkPaint paint;
paint.setPathEffect(shape.style().refPathEffect());
diff --git a/src/gpu/GrSWMaskHelper.h b/src/gpu/GrSWMaskHelper.h
index 8664f96..1891198 100644
--- a/src/gpu/GrSWMaskHelper.h
+++ b/src/gpu/GrSWMaskHelper.h
@@ -16,7 +16,7 @@
#include "src/core/SkDraw.h"
#include "src/core/SkRasterClip.h"
-class GrShape;
+class GrStyledShape;
class GrRecordingContext;
class GrTextureProxy;
@@ -49,7 +49,8 @@
void drawRect(const SkRect& rect, const SkMatrix& matrix, SkRegion::Op op, GrAA, uint8_t alpha);
// Draw a single path into the accumuation bitmap using the specified op
- void drawShape(const GrShape&, const SkMatrix& matrix, SkRegion::Op op, GrAA, uint8_t alpha);
+ void drawShape(const GrStyledShape&, const SkMatrix& matrix, SkRegion::Op op, GrAA,
+ uint8_t alpha);
GrSurfaceProxyView toTextureView(GrRecordingContext*, SkBackingFit fit);
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 98c30bb..ed7227d 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -23,14 +23,14 @@
#include "src/gpu/GrSWMaskHelper.h"
#include "src/gpu/GrSurfaceContextPriv.h"
#include "src/gpu/SkGr.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrDrawOp.h"
////////////////////////////////////////////////////////////////////////////////
GrPathRenderer::CanDrawPath
GrSoftwarePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
// Pass on any style that applies. The caller will apply the style if a suitable renderer is
- // not found and try again with the new GrShape.
+ // not found and try again with the new GrStyledShape.
if (!args.fShape->style().applies() && SkToBool(fProxyProvider) &&
(args.fAAType == GrAAType::kCoverage || args.fAAType == GrAAType::kNone)) {
// This is the fallback renderer for when a path is too complicated for the GPU ones.
@@ -40,7 +40,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-static bool get_unclipped_shape_dev_bounds(const GrShape& shape, const SkMatrix& matrix,
+static bool get_unclipped_shape_dev_bounds(const GrStyledShape& shape, const SkMatrix& matrix,
SkIRect* devBounds) {
SkRect shapeBounds = shape.styledBounds();
if (shapeBounds.isEmpty()) {
@@ -69,7 +69,7 @@
// is no intersection.
bool GrSoftwarePathRenderer::GetShapeAndClipBounds(GrRenderTargetContext* renderTargetContext,
const GrClip& clip,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMatrix& matrix,
SkIRect* unclippedDevShapeBounds,
SkIRect* clippedDevShapeBounds,
@@ -198,8 +198,8 @@
*/
class SoftwarePathData {
public:
- SoftwarePathData(const SkIRect& maskBounds, const SkMatrix& viewMatrix, const GrShape& shape,
- GrAA aa)
+ SoftwarePathData(const SkIRect& maskBounds, const SkMatrix& viewMatrix,
+ const GrStyledShape& shape, GrAA aa)
: fMaskBounds(maskBounds)
, fViewMatrix(viewMatrix)
, fShape(shape)
@@ -207,13 +207,13 @@
const SkIRect& getMaskBounds() const { return fMaskBounds; }
const SkMatrix* getViewMatrix() const { return &fViewMatrix; }
- const GrShape& getShape() const { return fShape; }
+ const GrStyledShape& getShape() const { return fShape; }
GrAA getAA() const { return fAA; }
private:
SkIRect fMaskBounds;
SkMatrix fViewMatrix;
- GrShape fShape;
+ GrStyledShape fShape;
GrAA fAA;
};
diff --git a/src/gpu/GrSoftwarePathRenderer.h b/src/gpu/GrSoftwarePathRenderer.h
index 9337d22..d24d48a 100644
--- a/src/gpu/GrSoftwarePathRenderer.h
+++ b/src/gpu/GrSoftwarePathRenderer.h
@@ -28,7 +28,7 @@
static bool GetShapeAndClipBounds(GrRenderTargetContext*,
const GrClip& clip,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMatrix& matrix,
SkIRect* unclippedDevShapeBounds,
SkIRect* clippedDevShapeBounds,
@@ -62,7 +62,7 @@
const SkIPoint& textureOriginInDeviceSpace,
const SkIRect& deviceSpaceRectToDraw);
- StencilSupport onGetStencilSupport(const GrShape&) const override {
+ StencilSupport onGetStencilSupport(const GrStyledShape&) const override {
return GrPathRenderer::kNoSupport_StencilSupport;
}
diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h
index 1dce72d..f369f64 100644
--- a/src/gpu/GrStyle.h
+++ b/src/gpu/GrStyle.h
@@ -14,11 +14,11 @@
#include "include/private/SkTemplates.h"
/**
- * Represents the various ways that a GrShape can be styled. It has fill/stroking information
+ * Represents the various ways that a GrStyledShape can be styled. It has fill/stroking information
* as well as an optional path effect. If the path effect represents dashing, the dashing
* information is extracted from the path effect and stored explicitly.
*
- * This will replace GrStrokeInfo as GrShape is deployed.
+ * This will replace GrStrokeInfo as GrStyledShape is deployed.
*/
class GrStyle {
public:
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 36a01c8..8f2be69 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -41,7 +41,7 @@
#include "src/gpu/GrTextureAdjuster.h"
#include "src/gpu/GrTracing.h"
#include "src/gpu/SkGr.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/text/GrTextTarget.h"
#include "src/image/SkImage_Base.h"
#include "src/image/SkReadPixelsRec.h"
@@ -360,7 +360,7 @@
// A couple reasons we might need to call drawPath.
if (paint.getMaskFilter() || paint.getPathEffect()) {
- GrShape shape(rect, style);
+ GrStyledShape shape(rect, style);
GrBlurUtils::drawShapeWithMaskFilter(fContext.get(), fRenderTargetContext.get(),
this->clip(), paint, this->localToDevice(), shape);
@@ -421,7 +421,7 @@
if (mf || style.pathEffect()) {
// A path effect will presumably transform this rrect into something else.
- GrShape shape(rrect, style);
+ GrStyledShape shape(rrect, style);
GrBlurUtils::drawShapeWithMaskFilter(fContext.get(), fRenderTargetContext.get(),
this->clip(), paint, this->localToDevice(), shape);
@@ -474,8 +474,8 @@
path.setFillType(SkPathFillType::kEvenOdd);
// TODO: We are losing the possible mutability of the path here but this should probably be
- // fixed by upgrading GrShape to handle DRRects.
- GrShape shape(path, paint);
+ // fixed by upgrading GrStyledShape to handle DRRects.
+ GrStyledShape shape(path, paint);
GrBlurUtils::drawShapeWithMaskFilter(fContext.get(), fRenderTargetContext.get(), this->clip(),
paint, this->localToDevice(), shape);
@@ -627,7 +627,7 @@
}
// TODO: losing possible mutability of 'origSrcPath' here
- GrShape shape(origSrcPath, paint);
+ GrStyledShape shape(origSrcPath, paint);
GrBlurUtils::drawShapeWithMaskFilter(fContext.get(), fRenderTargetContext.get(), this->clip(),
paint, this->localToDevice(), shape);
@@ -1153,4 +1153,3 @@
GrStyle::SimpleFill(), &kDrawToStencil);
return true;
}
-
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index 0b880e3..3bad63d 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -23,7 +23,7 @@
#include "src/gpu/effects/GrBicubicEffect.h"
#include "src/gpu/effects/GrTextureDomain.h"
#include "src/gpu/effects/GrTextureEffect.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/image/SkImage_Base.h"
namespace {
@@ -485,17 +485,17 @@
canUseTextureCoordsAsLocalCoords ? &src : nullptr);
}
} else {
- // Must draw the mask filter as a GrShape. For now, this loses the per-edge AA information
- // since it always draws with AA, but that is should not be noticeable since the mask filter
- // is probably a blur.
- GrShape shape;
+ // Must draw the mask filter as a GrStyledShape. For now, this loses the per-edge AA
+ // information since it always draws with AA, but that should not be noticeable since the
+ // mask filter is probably a blur.
+ GrStyledShape shape;
if (dstClip) {
// Represent it as an SkPath formed from the dstClip
SkPath path;
path.addPoly(dstClip, 4, true);
- shape = GrShape(path);
+ shape = GrStyledShape(path);
} else {
- shape = GrShape(dst);
+ shape = GrStyledShape(dst);
}
GrBlurUtils::drawShapeWithMaskFilter(
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.cpp b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
index b8a73e8..3b27f15 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.cpp
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
@@ -27,7 +27,7 @@
std::unique_ptr<GrCCDrawPathsOp> GrCCDrawPathsOp::Make(
GrRecordingContext* context, const SkIRect& clipIBounds, const SkMatrix& m,
- const GrShape& shape, GrPaint&& paint) {
+ const GrStyledShape& shape, GrPaint&& paint) {
SkRect conservativeDevBounds;
m.mapRect(&conservativeDevBounds, shape.bounds());
@@ -49,10 +49,10 @@
croppedDevPath.transform(m, &croppedDevPath);
SkIRect cropBox = clipIBounds;
- GrShape croppedDevShape;
+ GrStyledShape croppedDevShape;
if (stroke.isFillStyle()) {
GrCoverageCountingPathRenderer::CropPath(croppedDevPath, cropBox, &croppedDevPath);
- croppedDevShape = GrShape(croppedDevPath);
+ croppedDevShape = GrStyledShape(croppedDevPath);
conservativeDevBounds = croppedDevShape.bounds();
} else {
int r = SkScalarCeilToInt(conservativeInflationRadius);
@@ -60,7 +60,7 @@
GrCoverageCountingPathRenderer::CropPath(croppedDevPath, cropBox, &croppedDevPath);
SkStrokeRec devStroke = stroke;
devStroke.setStrokeStyle(strokeDevWidth);
- croppedDevShape = GrShape(croppedDevPath, GrStyle(devStroke, nullptr));
+ croppedDevShape = GrStyledShape(croppedDevPath, GrStyle(devStroke, nullptr));
conservativeDevBounds = croppedDevPath.getBounds();
conservativeDevBounds.outset(conservativeInflationRadius, conservativeInflationRadius);
}
@@ -76,7 +76,7 @@
std::unique_ptr<GrCCDrawPathsOp> GrCCDrawPathsOp::InternalMake(
GrRecordingContext* context, const SkIRect& clipIBounds, const SkMatrix& m,
- const GrShape& shape, float strokeDevWidth, const SkRect& conservativeDevBounds,
+ const GrStyledShape& shape, float strokeDevWidth, const SkRect& conservativeDevBounds,
GrPaint&& paint) {
// The path itself should have been cropped if larger than kPathCropThreshold. If it had a
// stroke, that would have further inflated its draw bounds.
@@ -97,8 +97,8 @@
maskDevIBounds, conservativeDevBounds, std::move(paint));
}
-GrCCDrawPathsOp::GrCCDrawPathsOp(const SkMatrix& m, const GrShape& shape, float strokeDevWidth,
- const SkIRect& shapeConservativeIBounds,
+GrCCDrawPathsOp::GrCCDrawPathsOp(const SkMatrix& m, const GrStyledShape& shape,
+ float strokeDevWidth, const SkIRect& shapeConservativeIBounds,
const SkIRect& maskDevIBounds, const SkRect& conservativeDevBounds,
GrPaint&& paint)
: GrDrawOp(ClassID())
@@ -127,7 +127,7 @@
}
}
-GrCCDrawPathsOp::SingleDraw::SingleDraw(const SkMatrix& m, const GrShape& shape,
+GrCCDrawPathsOp::SingleDraw::SingleDraw(const SkMatrix& m, const GrStyledShape& shape,
float strokeDevWidth,
const SkIRect& shapeConservativeIBounds,
const SkIRect& maskDevIBounds, const SkPMColor4f& color)
@@ -182,7 +182,7 @@
// How transparent does a 1px stroke have to be in order to appear as thin as the real one?
float coverage = fStrokeDevWidth;
- fShape = GrShape(path, GrStyle(hairlineStroke, nullptr));
+ fShape = GrStyledShape(path, GrStyle(hairlineStroke, nullptr));
fStrokeDevWidth = 1;
// fShapeConservativeIBounds already accounted for this possibility of inflating the stroke.
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.h b/src/gpu/ccpr/GrCCDrawPathsOp.h
index bc22738..92c37ed 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.h
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.h
@@ -11,7 +11,7 @@
#include "src/core/SkTInternalLList.h"
#include "src/gpu/ccpr/GrCCPathCache.h"
#include "src/gpu/ccpr/GrCCSTLList.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrDrawOp.h"
class GrCCAtlas;
@@ -30,7 +30,7 @@
SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrCCDrawPathsOp);
static std::unique_ptr<GrCCDrawPathsOp> Make(GrRecordingContext*, const SkIRect& clipIBounds,
- const SkMatrix&, const GrShape&, GrPaint&&);
+ const SkMatrix&, const GrStyledShape&, GrPaint&&);
~GrCCDrawPathsOp() override;
const char* name() const override { return "GrCCDrawPathsOp"; }
@@ -80,12 +80,12 @@
static std::unique_ptr<GrCCDrawPathsOp> InternalMake(GrRecordingContext*,
const SkIRect& clipIBounds,
- const SkMatrix&, const GrShape&,
+ const SkMatrix&, const GrStyledShape&,
float strokeDevWidth,
const SkRect& conservativeDevBounds,
GrPaint&&);
- GrCCDrawPathsOp(const SkMatrix&, const GrShape&, float strokeDevWidth,
+ GrCCDrawPathsOp(const SkMatrix&, const GrStyledShape&, float strokeDevWidth,
const SkIRect& shapeConservativeIBounds, const SkIRect& maskDevIBounds,
const SkRect& conservativeDevBounds, GrPaint&&);
@@ -96,7 +96,7 @@
class SingleDraw {
public:
- SingleDraw(const SkMatrix&, const GrShape&, float strokeDevWidth,
+ SingleDraw(const SkMatrix&, const GrStyledShape&, float strokeDevWidth,
const SkIRect& shapeConservativeIBounds, const SkIRect& maskDevIBounds,
const SkPMColor4f&);
@@ -113,7 +113,7 @@
bool shouldCachePathMask(int maxRenderTargetSize) const;
SkMatrix fMatrix;
- GrShape fShape;
+ GrStyledShape fShape;
float fStrokeDevWidth;
const SkIRect fShapeConservativeIBounds;
SkIRect fMaskDevIBounds;
diff --git a/src/gpu/ccpr/GrCCPathCache.cpp b/src/gpu/ccpr/GrCCPathCache.cpp
index 4f29c90..b1037bb 100644
--- a/src/gpu/ccpr/GrCCPathCache.cpp
+++ b/src/gpu/ccpr/GrCCPathCache.cpp
@@ -126,13 +126,13 @@
static constexpr int kStrokeCapJoinIdx = 2;
static constexpr int kShapeUnstyledKeyIdx = 3;
- WriteKeyHelper(const GrShape& shape) : fShapeUnstyledKeyCount(shape.unstyledKeySize()) {}
+ WriteKeyHelper(const GrStyledShape& shape) : fShapeUnstyledKeyCount(shape.unstyledKeySize()) {}
// Returns the total number of uint32_t's to allocate for the key.
int allocCountU32() const { return kShapeUnstyledKeyIdx + fShapeUnstyledKeyCount; }
// Writes the key data to out[].
- void write(const GrShape& shape, uint32_t* out) {
+ void write(const GrStyledShape& shape, uint32_t* out) {
// Stroke key.
// We don't use GrStyle::WriteKey() because it does not account for hairlines.
// http://skbug.com/8273
@@ -161,7 +161,7 @@
}
GrCCPathCache::OnFlushEntryRef GrCCPathCache::find(
- GrOnFlushResourceProvider* onFlushRP, const GrShape& shape,
+ GrOnFlushResourceProvider* onFlushRP, const GrStyledShape& shape,
const SkIRect& clippedDrawBounds, const SkMatrix& viewMatrix, SkIVector* maskShift) {
if (!shape.hasUnstyledKey()) {
return OnFlushEntryRef();
diff --git a/src/gpu/ccpr/GrCCPathCache.h b/src/gpu/ccpr/GrCCPathCache.h
index 05d31ea..2009aaf 100644
--- a/src/gpu/ccpr/GrCCPathCache.h
+++ b/src/gpu/ccpr/GrCCPathCache.h
@@ -14,15 +14,15 @@
#include "src/core/SkTInternalLList.h"
#include "src/gpu/ccpr/GrCCAtlas.h"
#include "src/gpu/ccpr/GrCCPathProcessor.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
class GrCCPathCacheEntry;
-class GrShape;
+class GrStyledShape;
/**
- * This class implements an LRU cache that maps from GrShape to GrCCPathCacheEntry objects. Shapes
- * are only given one entry in the cache, so any time they are accessed with a different matrix, the
- * old entry gets evicted.
+ * This class implements an LRU cache that maps from GrStyledShape to GrCCPathCacheEntry objects.
+ * Shapes are only given one entry in the cache, so any time they are accessed with a different
+ * matrix, the old entry gets evicted.
*/
class GrCCPathCache {
public:
@@ -67,8 +67,8 @@
const uint32_t fPathCacheUniqueID;
int fDataSizeInBytes;
SkDEBUGCODE(const int fDataReserveCountU32);
- // The GrShape's unstyled key is stored as a variable-length footer to this class. GetKey
- // provides access to it.
+ // The GrStyledShape's unstyled key is stored as a variable-length footer to this class.
+ // GetKey provides access to it.
};
// Stores the components of a transformation that affect a path mask (i.e. everything but
@@ -109,7 +109,7 @@
//
// NOTE: Shapes are only given one entry, so any time they are accessed with a new
// transformation, the old entry gets evicted.
- OnFlushEntryRef find(GrOnFlushResourceProvider*, const GrShape&,
+ OnFlushEntryRef find(GrOnFlushResourceProvider*, const GrStyledShape&,
const SkIRect& clippedDrawBounds, const SkMatrix& viewMatrix,
SkIVector* maskShift);
@@ -137,7 +137,7 @@
}
HashNode() = default;
- HashNode(GrCCPathCache*, sk_sp<Key>, const MaskTransform&, const GrShape&);
+ HashNode(GrCCPathCache*, sk_sp<Key>, const MaskTransform&, const GrStyledShape&);
HashNode(HashNode&& node)
: fPathCache(node.fPathCache), fEntry(std::move(node.fEntry)) {
SkASSERT(!node.fEntry);
@@ -341,7 +341,7 @@
inline GrCCPathCache::HashNode::HashNode(GrCCPathCache* pathCache, sk_sp<Key> key,
- const MaskTransform& m, const GrShape& shape)
+ const MaskTransform& m, const GrStyledShape& shape)
: fPathCache(pathCache)
, fEntry(new GrCCPathCacheEntry(key, m)) {
SkASSERT(shape.hasUnstyledKey());
diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp
index af790c1..3a3d88b 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.cpp
+++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp
@@ -18,7 +18,7 @@
#include "src/gpu/ccpr/GrGSCoverageProcessor.h"
#include "src/gpu/ccpr/GrSampleMaskProcessor.h"
#include "src/gpu/ccpr/GrVSCoverageProcessor.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include <algorithm>
using CoverageType = GrCCAtlas::CoverageType;
@@ -363,8 +363,9 @@
}
GrCCAtlas* GrCCPerFlushResources::renderShapeInAtlas(
- const SkIRect& clipIBounds, const SkMatrix& m, const GrShape& shape, float strokeDevWidth,
- GrOctoBounds* octoBounds, SkIRect* devIBounds, SkIVector* devToAtlasOffset) {
+ const SkIRect& clipIBounds, const SkMatrix& m, const GrStyledShape& shape,
+ float strokeDevWidth, GrOctoBounds* octoBounds, SkIRect* devIBounds,
+ SkIVector* devToAtlasOffset) {
SkASSERT(this->isMapped());
SkASSERT(fNextPathInstanceIdx < fEndPathInstance);
diff --git a/src/gpu/ccpr/GrCCPerFlushResources.h b/src/gpu/ccpr/GrCCPerFlushResources.h
index c094a9f..770b59d 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.h
+++ b/src/gpu/ccpr/GrCCPerFlushResources.h
@@ -20,7 +20,7 @@
class GrCCPathCacheEntry;
class GrOctoBounds;
class GrOnFlushResourceProvider;
-class GrShape;
+class GrStyledShape;
/**
* This struct counts values that help us preallocate buffers for rendered path geometry.
@@ -88,7 +88,7 @@
// strokeDevWidth must be 0 for fills, 1 for hairlines, or the stroke width in device-space
// pixels for non-hairline strokes (implicitly requiring a rigid-body transform).
GrCCAtlas* renderShapeInAtlas(
- const SkIRect& clipIBounds, const SkMatrix&, const GrShape&, float strokeDevWidth,
+ const SkIRect& clipIBounds, const SkMatrix&, const GrStyledShape&, float strokeDevWidth,
GrOctoBounds*, SkIRect* devIBounds, SkIVector* devToAtlasOffset);
const GrCCAtlas* renderDeviceSpacePathInAtlas(
const SkIRect& clipIBounds, const SkPath& devPath, const SkIRect& devPathIBounds,
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
index 242b992..320b743 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
@@ -80,7 +80,7 @@
GrPathRenderer::CanDrawPath GrCoverageCountingPathRenderer::onCanDrawPath(
const CanDrawPathArgs& args) const {
- const GrShape& shape = *args.fShape;
+ const GrStyledShape& shape = *args.fShape;
// We use "kCoverage", or analytic AA, no mater what the coverage type of our atlas: Even if the
// atlas is multisampled, that resolves into analytic coverage before we draw the path to the
// main canvas.
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
index 1b86ad0..a310705 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h
@@ -90,7 +90,7 @@
GrCoverageCountingPathRenderer(CoverageType, AllowCaching, uint32_t contextUniqueID);
// GrPathRenderer overrides.
- StencilSupport onGetStencilSupport(const GrShape&) const override {
+ StencilSupport onGetStencilSupport(const GrStyledShape&) const override {
return GrPathRenderer::kNoSupport_StencilSupport;
}
CanDrawPath onCanDrawPath(const CanDrawPathArgs&) const override;
diff --git a/src/gpu/geometry/GrShape.cpp b/src/gpu/geometry/GrStyledShape.cpp
similarity index 93%
rename from src/gpu/geometry/GrShape.cpp
rename to src/gpu/geometry/GrStyledShape.cpp
index b340c7d..d81b99e 100644
--- a/src/gpu/geometry/GrShape.cpp
+++ b/src/gpu/geometry/GrStyledShape.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "include/private/SkIDChangeListener.h"
#include <utility>
-GrShape& GrShape::operator=(const GrShape& that) {
+GrStyledShape& GrStyledShape::operator=(const GrStyledShape& that) {
fStyle = that.fStyle;
this->changeType(that.fType, Type::kPath == that.fType ? &that.path() : nullptr);
switch (fType) {
@@ -43,41 +43,41 @@
return *this;
}
-static bool flip_inversion(bool originalIsInverted, GrShape::FillInversion inversion) {
+static bool flip_inversion(bool originalIsInverted, GrStyledShape::FillInversion inversion) {
switch (inversion) {
- case GrShape::FillInversion::kPreserve:
+ case GrStyledShape::FillInversion::kPreserve:
return false;
- case GrShape::FillInversion::kFlip:
+ case GrStyledShape::FillInversion::kFlip:
return true;
- case GrShape::FillInversion::kForceInverted:
+ case GrStyledShape::FillInversion::kForceInverted:
return !originalIsInverted;
- case GrShape::FillInversion::kForceNoninverted:
+ case GrStyledShape::FillInversion::kForceNoninverted:
return originalIsInverted;
}
return false;
}
-static bool is_inverted(bool originalIsInverted, GrShape::FillInversion inversion) {
+static bool is_inverted(bool originalIsInverted, GrStyledShape::FillInversion inversion) {
switch (inversion) {
- case GrShape::FillInversion::kPreserve:
+ case GrStyledShape::FillInversion::kPreserve:
return originalIsInverted;
- case GrShape::FillInversion::kFlip:
+ case GrStyledShape::FillInversion::kFlip:
return !originalIsInverted;
- case GrShape::FillInversion::kForceInverted:
+ case GrStyledShape::FillInversion::kForceInverted:
return true;
- case GrShape::FillInversion::kForceNoninverted:
+ case GrStyledShape::FillInversion::kForceNoninverted:
return false;
}
return false;
}
-GrShape GrShape::MakeFilled(const GrShape& original, FillInversion inversion) {
+GrStyledShape GrStyledShape::MakeFilled(const GrStyledShape& original, FillInversion inversion) {
if (original.style().isSimpleFill() && !flip_inversion(original.inverseFilled(), inversion)) {
// By returning the original rather than falling through we can preserve any inherited style
// key. Otherwise, we wipe it out below since the style change invalidates it.
return original;
}
- GrShape result;
+ GrStyledShape result;
if (original.fInheritedPathForListeners.isValid()) {
result.fInheritedPathForListeners.set(*original.fInheritedPathForListeners.get());
}
@@ -130,7 +130,7 @@
return result;
}
-SkRect GrShape::bounds() const {
+SkRect GrStyledShape::bounds() const {
// Bounds where left == bottom or top == right can indicate a line or point shape. We return
// inverted bounds for a truly empty shape.
static constexpr SkRect kInverted = SkRect::MakeLTRB(1, 1, -1, -1);
@@ -168,7 +168,7 @@
SK_ABORT("Unknown shape type");
}
-SkRect GrShape::styledBounds() const {
+SkRect GrStyledShape::styledBounds() const {
if (this->isEmpty() && !fStyle.hasNonDashPathEffect()) {
return SkRect::MakeEmpty();
}
@@ -181,7 +181,7 @@
// If the path is small enough to be keyed from its data this returns key length, otherwise -1.
static int path_key_from_data_size(const SkPath& path) {
const int verbCnt = path.countVerbs();
- if (verbCnt > GrShape::kMaxKeyFromDataVerbCnt) {
+ if (verbCnt > GrStyledShape::kMaxKeyFromDataVerbCnt) {
return -1;
}
const int pointCnt = path.countPoints();
@@ -201,7 +201,7 @@
const int verbCnt = path.countVerbs();
const int pointCnt = path.countPoints();
const int conicWeightCnt = SkPathPriv::ConicWeightCnt(path);
- SkASSERT(verbCnt <= GrShape::kMaxKeyFromDataVerbCnt);
+ SkASSERT(verbCnt <= GrStyledShape::kMaxKeyFromDataVerbCnt);
SkASSERT(pointCnt && verbCnt);
*key++ = (uint32_t)path.getFillType();
*key++ = verbCnt;
@@ -221,7 +221,7 @@
SkASSERT(key - origKey == path_key_from_data_size(path));
}
-int GrShape::unstyledKeySize() const {
+int GrStyledShape::unstyledKeySize() const {
if (fInheritedKey.count()) {
return fInheritedKey.count();
}
@@ -258,7 +258,7 @@
SK_ABORT("Should never get here.");
}
-void GrShape::writeUnstyledKey(uint32_t* key) const {
+void GrStyledShape::writeUnstyledKey(uint32_t* key) const {
SkASSERT(this->unstyledKeySize());
SkDEBUGCODE(uint32_t* origKey = key;)
if (fInheritedKey.count()) {
@@ -307,7 +307,8 @@
SkASSERT(key - origKey == this->unstyledKeySize());
}
-void GrShape::setInheritedKey(const GrShape &parent, GrStyle::Apply apply, SkScalar scale) {
+void GrStyledShape::setInheritedKey(const GrStyledShape &parent, GrStyle::Apply apply,
+ SkScalar scale) {
SkASSERT(!fInheritedKey.count());
// If the output shape turns out to be simple, then we will just use its geometric key
if (Type::kPath == fType) {
@@ -356,7 +357,7 @@
}
}
-const SkPath* GrShape::originalPathForListeners() const {
+const SkPath* GrStyledShape::originalPathForListeners() const {
if (fInheritedPathForListeners.isValid()) {
return fInheritedPathForListeners.get();
} else if (Type::kPath == fType && !fPathData.fPath.isVolatile()) {
@@ -365,15 +366,16 @@
return nullptr;
}
-void GrShape::addGenIDChangeListener(sk_sp<SkIDChangeListener> listener) const {
+void GrStyledShape::addGenIDChangeListener(sk_sp<SkIDChangeListener> listener) const {
if (const auto* lp = this->originalPathForListeners()) {
SkPathPriv::AddGenIDChangeListener(*lp, std::move(listener));
}
}
-GrShape GrShape::MakeArc(const SkRect& oval, SkScalar startAngleDegrees, SkScalar sweepAngleDegrees,
- bool useCenter, const GrStyle& style) {
- GrShape result;
+GrStyledShape GrStyledShape::MakeArc(const SkRect& oval, SkScalar startAngleDegrees,
+ SkScalar sweepAngleDegrees, bool useCenter,
+ const GrStyle& style) {
+ GrStyledShape result;
result.changeType(Type::kArc);
result.fArcData.fOval = oval;
result.fArcData.fStartAngleDegrees = startAngleDegrees;
@@ -385,7 +387,7 @@
return result;
}
-GrShape::GrShape(const GrShape& that) : fStyle(that.fStyle) {
+GrStyledShape::GrStyledShape(const GrStyledShape& that) : fStyle(that.fStyle) {
const SkPath* thatPath = Type::kPath == that.fType ? &that.fPathData.fPath : nullptr;
this->initType(that.fType, thatPath);
switch (fType) {
@@ -414,7 +416,7 @@
}
}
-GrShape::GrShape(const GrShape& parent, GrStyle::Apply apply, SkScalar scale) {
+GrStyledShape::GrStyledShape(const GrStyledShape& parent, GrStyle::Apply apply, SkScalar scale) {
// TODO: Add some quantization of scale for better cache performance here or leave that up
// to caller?
// TODO: For certain shapes and stroke params we could ignore the scale. (e.g. miter or bevel
@@ -428,8 +430,8 @@
SkPathEffect* pe = parent.fStyle.pathEffect();
SkTLazy<SkPath> tmpPath;
- const GrShape* parentForKey = &parent;
- SkTLazy<GrShape> tmpParent;
+ const GrStyledShape* parentForKey = &parent;
+ SkTLazy<GrStyledShape> tmpParent;
this->initType(Type::kPath);
fPathData.fGenID = 0;
if (pe) {
@@ -506,7 +508,7 @@
this->setInheritedKey(*parentForKey, apply, scale);
}
-void GrShape::attemptToSimplifyPath() {
+void GrStyledShape::attemptToSimplifyPath() {
SkRect rect;
SkRRect rrect;
SkPathDirection rrectDir;
@@ -601,7 +603,7 @@
}
}
-void GrShape::attemptToSimplifyRRect() {
+void GrStyledShape::attemptToSimplifyRRect() {
SkASSERT(Type::kRRect == fType);
SkASSERT(!fInheritedKey.count());
if (fRRectData.fRRect.isEmpty()) {
@@ -641,7 +643,7 @@
}
}
-void GrShape::attemptToSimplifyLine() {
+void GrStyledShape::attemptToSimplifyLine() {
SkASSERT(Type::kLine == fType);
SkASSERT(!fInheritedKey.count());
if (fStyle.isDashed()) {
@@ -681,7 +683,7 @@
}
}
-void GrShape::attemptToSimplifyArc() {
+void GrStyledShape::attemptToSimplifyArc() {
SkASSERT(fType == Type::kArc);
SkASSERT(!fArcData.fInverted);
if (fArcData.fOval.isEmpty() || !fArcData.fSweepAngleDegrees) {
@@ -721,7 +723,7 @@
// could as well if the stroke fills the center.
}
-bool GrShape::attemptToSimplifyStrokedLineToRRect() {
+bool GrStyledShape::attemptToSimplifyStrokedLineToRRect() {
SkASSERT(Type::kLine == fType);
SkASSERT(fStyle.strokeRec().getStyle() == SkStrokeRec::kStroke_Style);
diff --git a/src/gpu/geometry/GrShape.h b/src/gpu/geometry/GrStyledShape.h
similarity index 91%
rename from src/gpu/geometry/GrShape.h
rename to src/gpu/geometry/GrStyledShape.h
index a510984..0fc7d1c 100644
--- a/src/gpu/geometry/GrShape.h
+++ b/src/gpu/geometry/GrStyledShape.h
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#ifndef GrShape_DEFINED
-#define GrShape_DEFINED
+#ifndef GrStyledShape_DEFINED
+#define GrStyledShape_DEFINED
#include "include/core/SkPath.h"
#include "include/core/SkRRect.h"
@@ -20,9 +20,9 @@
/**
* Represents a geometric shape (rrect or path) and the GrStyle that it should be rendered with.
- * It is possible to apply the style to the GrShape to produce a new GrShape where the geometry
- * reflects the styling information (e.g. is stroked). It is also possible to apply just the
- * path effect from the style. In this case the resulting shape will include any remaining
+ * It is possible to apply the style to the GrStyledShape to produce a new GrStyledShape where the
+ * geometry reflects the styling information (e.g. is stroked). It is also possible to apply just
+ * the path effect from the style. In this case the resulting shape will include any remaining
* stroking information that is to be applied after the path effect.
*
* Shapes can produce keys that represent only the geometry information, not the style. Note that
@@ -35,26 +35,26 @@
* applying style to the geometry. The idea is to expand this to cover most or all of the geometries
* that have fast paths in the GPU backend.
*/
-class GrShape {
+class GrStyledShape {
public:
// Keys for paths may be extracted from the path data for small paths. Clients aren't supposed
// to have to worry about this. This value is exposed for unit tests.
static constexpr int kMaxKeyFromDataVerbCnt = 10;
- GrShape() { this->initType(Type::kEmpty); }
+ GrStyledShape() { this->initType(Type::kEmpty); }
- explicit GrShape(const SkPath& path) : GrShape(path, GrStyle::SimpleFill()) {}
+ explicit GrStyledShape(const SkPath& path) : GrStyledShape(path, GrStyle::SimpleFill()) {}
- explicit GrShape(const SkRRect& rrect) : GrShape(rrect, GrStyle::SimpleFill()) {}
+ explicit GrStyledShape(const SkRRect& rrect) : GrStyledShape(rrect, GrStyle::SimpleFill()) {}
- explicit GrShape(const SkRect& rect) : GrShape(rect, GrStyle::SimpleFill()) {}
+ explicit GrStyledShape(const SkRect& rect) : GrStyledShape(rect, GrStyle::SimpleFill()) {}
- GrShape(const SkPath& path, const GrStyle& style) : fStyle(style) {
+ GrStyledShape(const SkPath& path, const GrStyle& style) : fStyle(style) {
this->initType(Type::kPath, &path);
this->attemptToSimplifyPath();
}
- GrShape(const SkRRect& rrect, const GrStyle& style) : fStyle(style) {
+ GrStyledShape(const SkRRect& rrect, const GrStyle& style) : fStyle(style) {
this->initType(Type::kRRect);
fRRectData.fRRect = rrect;
fRRectData.fInverted = false;
@@ -63,7 +63,7 @@
this->attemptToSimplifyRRect();
}
- GrShape(const SkRRect& rrect, SkPathDirection dir, unsigned start, bool inverted,
+ GrStyledShape(const SkRRect& rrect, SkPathDirection dir, unsigned start, bool inverted,
const GrStyle& style)
: fStyle(style) {
this->initType(Type::kRRect);
@@ -83,7 +83,7 @@
this->attemptToSimplifyRRect();
}
- GrShape(const SkRect& rect, const GrStyle& style) : fStyle(style) {
+ GrStyledShape(const SkRect& rect, const GrStyle& style) : fStyle(style) {
this->initType(Type::kRRect);
fRRectData.fRRect = SkRRect::MakeRect(rect);
fRRectData.fInverted = false;
@@ -92,12 +92,12 @@
this->attemptToSimplifyRRect();
}
- GrShape(const SkPath& path, const SkPaint& paint) : fStyle(paint) {
+ GrStyledShape(const SkPath& path, const SkPaint& paint) : fStyle(paint) {
this->initType(Type::kPath, &path);
this->attemptToSimplifyPath();
}
- GrShape(const SkRRect& rrect, const SkPaint& paint) : fStyle(paint) {
+ GrStyledShape(const SkRRect& rrect, const SkPaint& paint) : fStyle(paint) {
this->initType(Type::kRRect);
fRRectData.fRRect = rrect;
fRRectData.fInverted = false;
@@ -106,7 +106,7 @@
this->attemptToSimplifyRRect();
}
- GrShape(const SkRect& rect, const SkPaint& paint) : fStyle(paint) {
+ GrStyledShape(const SkRect& rect, const SkPaint& paint) : fStyle(paint) {
this->initType(Type::kRRect);
fRRectData.fRRect = SkRRect::MakeRect(rect);
fRRectData.fInverted = false;
@@ -115,13 +115,13 @@
this->attemptToSimplifyRRect();
}
- static GrShape MakeArc(const SkRect& oval, SkScalar startAngleDegrees,
+ static GrStyledShape MakeArc(const SkRect& oval, SkScalar startAngleDegrees,
SkScalar sweepAngleDegrees, bool useCenter, const GrStyle& style);
- GrShape(const GrShape&);
- GrShape& operator=(const GrShape& that);
+ GrStyledShape(const GrStyledShape&);
+ GrStyledShape& operator=(const GrStyledShape& that);
- ~GrShape() { this->changeType(Type::kEmpty); }
+ ~GrStyledShape() { this->changeType(Type::kEmpty); }
/**
* Informs MakeFilled on how to modify that shape's fill rule when making a simple filled
@@ -140,7 +140,8 @@
* (e.g. filled paths are always closed when stored in a shape and dashed paths are always
* made non-inverted since dashing ignores inverseness).
*/
- static GrShape MakeFilled(const GrShape& original, FillInversion = FillInversion::kPreserve);
+ static GrStyledShape MakeFilled(const GrStyledShape& original,
+ FillInversion = FillInversion::kPreserve);
const GrStyle& style() const { return fStyle; }
@@ -149,8 +150,8 @@
* information from this shape's style to its geometry. Scale is used when approximating the
* output geometry and typically is computed from the view matrix
*/
- GrShape applyStyle(GrStyle::Apply apply, SkScalar scale) const {
- return GrShape(*this, apply, scale);
+ GrStyledShape applyStyle(GrStyle::Apply apply, SkScalar scale) const {
+ return GrStyledShape(*this, apply, scale);
}
bool isRect() const {
@@ -457,8 +458,8 @@
}
/**
- * Gets the size of the key for the shape represented by this GrShape (ignoring its styling).
- * A negative value is returned if the shape has no key (shouldn't be cached).
+ * Gets the size of the key for the shape represented by this GrStyledShape (ignoring its
+ * styling). A negative value is returned if the shape has no key (shouldn't be cached).
*/
int unstyledKeySize() const;
@@ -533,13 +534,13 @@
}
/** Constructor used by the applyStyle() function */
- GrShape(const GrShape& parentShape, GrStyle::Apply, SkScalar scale);
+ GrStyledShape(const GrStyledShape& parentShape, GrStyle::Apply, SkScalar scale);
/**
* Determines the key we should inherit from the input shape's geometry and style when
* we are applying the style to create a new shape.
*/
- void setInheritedKey(const GrShape& parentShape, GrStyle::Apply, SkScalar scale);
+ void setInheritedKey(const GrStyledShape& parentShape, GrStyle::Apply, SkScalar scale);
void attemptToSimplifyPath();
void attemptToSimplifyRRect();
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 24920e4..0aff891 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -19,7 +19,7 @@
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrVertexWriter.h"
#include "src/gpu/geometry/GrPathUtils.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
#include "src/gpu/glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index fd14dc1..db6a9ee 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -25,7 +25,7 @@
#include "src/gpu/GrStyle.h"
#include "src/gpu/effects/GrBezierEffect.h"
#include "src/gpu/geometry/GrPathUtils.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrAAHairLinePathRenderer.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index 64eedbe..d6d6449 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -21,7 +21,7 @@
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrVertexWriter.h"
#include "src/gpu/geometry/GrPathUtils.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
#include "src/gpu/ops/GrAAConvexTessellator.h"
#include "src/gpu/ops/GrAALinearizingConvexPathRenderer.h"
diff --git a/src/gpu/ops/GrDashLinePathRenderer.cpp b/src/gpu/ops/GrDashLinePathRenderer.cpp
index f15309c..96fc06c 100644
--- a/src/gpu/ops/GrDashLinePathRenderer.cpp
+++ b/src/gpu/ops/GrDashLinePathRenderer.cpp
@@ -8,7 +8,7 @@
#include "src/gpu/GrAuditTrail.h"
#include "src/gpu/GrGpu.h"
#include "src/gpu/GrRenderTargetContext.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrDashLinePathRenderer.h"
#include "src/gpu/ops/GrDashOp.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
diff --git a/src/gpu/ops/GrDashLinePathRenderer.h b/src/gpu/ops/GrDashLinePathRenderer.h
index 267eaf8..029f1ab 100644
--- a/src/gpu/ops/GrDashLinePathRenderer.h
+++ b/src/gpu/ops/GrDashLinePathRenderer.h
@@ -18,7 +18,7 @@
CanDrawPath onCanDrawPath(const CanDrawPathArgs&) const override;
- StencilSupport onGetStencilSupport(const GrShape&) const override {
+ StencilSupport onGetStencilSupport(const GrStyledShape&) const override {
return kNoSupport_StencilSupport;
}
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 332560c..7f4f634 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -24,7 +24,7 @@
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrSurfaceContextPriv.h"
#include "src/gpu/geometry/GrPathUtils.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
@@ -36,7 +36,7 @@
#define STENCIL_OFF 0 // Always disable stencil (even when needed)
-static inline bool single_pass_shape(const GrShape& shape) {
+static inline bool single_pass_shape(const GrStyledShape& shape) {
#if STENCIL_OFF
return true;
#else
@@ -55,7 +55,7 @@
}
GrPathRenderer::StencilSupport
-GrDefaultPathRenderer::onGetStencilSupport(const GrShape& shape) const {
+GrDefaultPathRenderer::onGetStencilSupport(const GrStyledShape& shape) const {
if (single_pass_shape(shape)) {
return GrPathRenderer::kNoRestriction_StencilSupport;
} else {
@@ -539,7 +539,7 @@
const GrUserStencilSettings& userStencilSettings,
const GrClip& clip,
const SkMatrix& viewMatrix,
- const GrShape& shape,
+ const GrStyledShape& shape,
bool stencilOnly) {
auto context = renderTargetContext->surfPriv().getContext();
diff --git a/src/gpu/ops/GrDefaultPathRenderer.h b/src/gpu/ops/GrDefaultPathRenderer.h
index a42061c..e709964 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.h
+++ b/src/gpu/ops/GrDefaultPathRenderer.h
@@ -23,7 +23,7 @@
const char* name() const final { return "Default"; }
private:
- StencilSupport onGetStencilSupport(const GrShape&) const override;
+ StencilSupport onGetStencilSupport(const GrStyledShape&) const override;
CanDrawPath onCanDrawPath(const CanDrawPathArgs&) const override;
@@ -37,7 +37,7 @@
const GrUserStencilSettings&,
const GrClip&,
const SkMatrix& viewMatrix,
- const GrShape&,
+ const GrStyledShape&,
bool stencilOnly);
typedef GrPathRenderer INHERITED;
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,
diff --git a/src/gpu/ops/GrSmallPathRenderer.h b/src/gpu/ops/GrSmallPathRenderer.h
index a823286..c03b82a 100644
--- a/src/gpu/ops/GrSmallPathRenderer.h
+++ b/src/gpu/ops/GrSmallPathRenderer.h
@@ -12,7 +12,7 @@
#include "src/gpu/GrOnFlushResourceProvider.h"
#include "src/gpu/GrPathRenderer.h"
#include "src/gpu/geometry/GrRect.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/core/SkOpts.h"
#include "src/core/SkTDynamicHash.h"
@@ -56,7 +56,7 @@
static std::unique_ptr<GrDrawOp> createOp_TestingOnly(GrRecordingContext*,
GrPaint&&,
- const GrShape&,
+ const GrStyledShape&,
const SkMatrix& viewMatrix,
GrDrawOpAtlas* atlas,
ShapeCache*,
@@ -68,7 +68,7 @@
private:
class SmallPathOp;
- StencilSupport onGetStencilSupport(const GrShape&) const override {
+ StencilSupport onGetStencilSupport(const GrStyledShape&) const override {
return GrPathRenderer::kNoSupport_StencilSupport;
}
diff --git a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
index c05b955..0ab1a07 100644
--- a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
@@ -14,7 +14,7 @@
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrStencilClip.h"
#include "src/gpu/GrStyle.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrDrawPathOp.h"
#include "src/gpu/ops/GrStencilAndCoverPathRenderer.h"
#include "src/gpu/ops/GrStencilPathOp.h"
@@ -49,7 +49,7 @@
return CanDrawPath::kYes;
}
-static sk_sp<GrPath> get_gr_path(GrResourceProvider* resourceProvider, const GrShape& shape) {
+static sk_sp<GrPath> get_gr_path(GrResourceProvider* resourceProvider, const GrStyledShape& shape) {
GrUniqueKey key;
bool isVolatile;
GrPath::ComputeKey(shape, &key, &isVolatile);
diff --git a/src/gpu/ops/GrStencilAndCoverPathRenderer.h b/src/gpu/ops/GrStencilAndCoverPathRenderer.h
index 74dd490..8ed422d 100644
--- a/src/gpu/ops/GrStencilAndCoverPathRenderer.h
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.h
@@ -25,7 +25,7 @@
private:
- StencilSupport onGetStencilSupport(const GrShape&) const override {
+ StencilSupport onGetStencilSupport(const GrStyledShape&) const override {
return GrPathRenderer::kStencilOnly_StencilSupport;
}
diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.cpp b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
index b8ab235..0347f4e 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
@@ -23,7 +23,7 @@
#include "src/gpu/GrStyle.h"
#include "src/gpu/GrTriangulator.h"
#include "src/gpu/geometry/GrPathUtils.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrMeshDrawOp.h"
#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
@@ -170,7 +170,7 @@
static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMatrix& viewMatrix,
SkIRect devClipBounds,
GrAAType aaType,
@@ -202,7 +202,7 @@
TriangulatingPathOp(Helper::MakeArgs helperArgs,
const SkPMColor4f& color,
- const GrShape& shape,
+ const GrStyledShape& shape,
const SkMatrix& viewMatrix,
const SkIRect& devClipBounds,
GrAAType aaType,
@@ -401,7 +401,7 @@
Helper fHelper;
SkPMColor4f fColor;
- GrShape fShape;
+ GrStyledShape fShape;
SkMatrix fViewMatrix;
SkIRect fDevClipBounds;
bool fAntiAlias;
@@ -447,7 +447,7 @@
do {
GrTest::TestStyle(random, &style);
} while (!style.isSimpleFill());
- GrShape shape(path, style);
+ GrStyledShape shape(path, style);
return TriangulatingPathOp::Make(context, std::move(paint), shape, viewMatrix, devClipBounds,
aaType, GrGetRandomStencil(random, context));
}
diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.h b/src/gpu/ops/GrTriangulatingPathRenderer.h
index 175325b..c2aa523 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.h
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.h
@@ -26,7 +26,7 @@
private:
CanDrawPath onCanDrawPath(const CanDrawPathArgs&) const override;
- StencilSupport onGetStencilSupport(const GrShape&) const override {
+ StencilSupport onGetStencilSupport(const GrStyledShape&) const override {
return GrPathRenderer::kNoSupport_StencilSupport;
}
diff --git a/src/gpu/tessellate/GrTessellationPathRenderer.cpp b/src/gpu/tessellate/GrTessellationPathRenderer.cpp
index b4c2c53..e632c23 100644
--- a/src/gpu/tessellate/GrTessellationPathRenderer.cpp
+++ b/src/gpu/tessellate/GrTessellationPathRenderer.cpp
@@ -13,7 +13,7 @@
#include "src/gpu/GrRecordingContextPriv.h"
#include "src/gpu/GrRenderTargetContext.h"
#include "src/gpu/GrSurfaceContextPriv.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrFillRectOp.h"
#include "src/gpu/tessellate/GrDrawAtlasPathOp.h"
#include "src/gpu/tessellate/GrTessellatePathOp.h"
diff --git a/src/gpu/tessellate/GrTessellationPathRenderer.h b/src/gpu/tessellate/GrTessellationPathRenderer.h
index f09aa71..bf8ea29 100644
--- a/src/gpu/tessellate/GrTessellationPathRenderer.h
+++ b/src/gpu/tessellate/GrTessellationPathRenderer.h
@@ -22,7 +22,7 @@
const char* name() const final { return "Tess"; }
GrTessellationPathRenderer(const GrCaps&);
- StencilSupport onGetStencilSupport(const GrShape& shape) const override {
+ StencilSupport onGetStencilSupport(const GrStyledShape& shape) const override {
// TODO: Single-pass (e.g., convex) paths can have full support.
return kStencilOnly_StencilSupport;
}
diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index eb6c93a..e6bdcf8 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -15,7 +15,7 @@
#include "src/gpu/GrBlurUtils.h"
#include "src/gpu/GrClip.h"
#include "src/gpu/GrStyle.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#include "src/gpu/ops/GrAtlasTextOp.h"
#include "src/gpu/text/GrAtlasManager.h"
#include "src/gpu/text/GrStrikeCache.h"
@@ -508,7 +508,7 @@
subRun->fStrikeSpec.strikeToSourceRatio());
pathMatrix.postTranslate(pathGlyph.fOrigin.x(), pathGlyph.fOrigin.y());
- // TmpPath must be in the same scope as GrShape shape below.
+ // TmpPath must be in the same scope as GrStyledShape shape below.
SkTLazy<SkPath> tmpPath;
const SkPath* path = &pathGlyph.fPath;
if (!scalePath) {
@@ -526,7 +526,7 @@
}
// TODO: we are losing the mutability of the path here
- GrShape shape(*path, paint);
+ GrStyledShape shape(*path, paint);
target->drawShape(clip, runPaint, ctm, shape);
}
} else {
diff --git a/src/gpu/text/GrTextTarget.h b/src/gpu/text/GrTextTarget.h
index 8498d71..693597f 100644
--- a/src/gpu/text/GrTextTarget.h
+++ b/src/gpu/text/GrTextTarget.h
@@ -15,7 +15,7 @@
class GrClip;
class GrPaint;
class GrRecordingContext;
-class GrShape;
+class GrStyledShape;
class SkGlyphRunListPainter;
class SkMatrix;
struct SkIRect;
@@ -33,7 +33,7 @@
virtual void addDrawOp(const GrClip&, std::unique_ptr<GrAtlasTextOp> op) = 0;
virtual void drawShape(const GrClip&, const SkPaint&,
- const SkMatrix& viewMatrix, const GrShape&) = 0;
+ const SkMatrix& viewMatrix, const GrStyledShape&) = 0;
virtual void makeGrPaint(GrMaskFormat, const SkPaint&, const SkMatrix& viewMatrix,
GrPaint*) = 0;
diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp
index ae9249a..869997f 100644
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@@ -31,7 +31,7 @@
#include <new>
#if SK_SUPPORT_GPU
#include "src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
#endif
/**
@@ -393,7 +393,7 @@
const SkPath* fPath;
const SkMatrix* fViewMatrix;
#if SK_SUPPORT_GPU
- GrShape fShapeForKey;
+ GrStyledShape fShapeForKey;
#endif
};