diff options
| author |  skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-23 07:01:28 +0000 |
|---|---|---|
| committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-23 07:01:28 +0000 |
| commit | 7e32851d5473d14db5c396f5877e3dfcb7b19f6d (patch) | |
| tree | 210129e87f9c4ffb02fb72c65cefcdad26d2d5b7 /src/gpu | |
| parent | 72657e00cab4d57b38db94e1870a5356773735e7 (diff) | |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8350 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrContext.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrOvalRenderer.cpp | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index eee3307c40..e2c41d1b3a 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1026,7 +1026,7 @@ void GrContext::drawPath(const GrPaint& paint, const SkPath& path, const SkStrok SkRect ovalRect; bool isOval = path.isOval(&ovalRect); - if (!isOval || path.isInverseFillType() + if (!isOval || path.isInverseFillType() || !fOvalRenderer->drawOval(target, this, paint, ovalRect, stroke)) { this->internalDrawPath(target, paint, path, stroke); } diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index 4847e0e9e1..2d25d54ce5 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -40,7 +40,7 @@ inline bool circle_stays_circle(const SkMatrix& m) { } -bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint, +bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint, const GrRect& oval, const SkStrokeRec& stroke) { if (!paint.isAntiAlias()) { @@ -49,8 +49,8 @@ bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, co const SkMatrix& vm = context->getMatrix(); - // we can draw circles - if (SkScalarNearlyEqual(oval.width(), oval.height()) + // we can draw circles + if (SkScalarNearlyEqual(oval.width(), oval.height()) && circle_stays_circle(vm)) { drawCircle(target, paint, oval, stroke); @@ -65,7 +65,7 @@ bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, co return true; } -void GrOvalRenderer::drawCircle(GrDrawTarget* target, +void GrOvalRenderer::drawCircle(GrDrawTarget* target, const GrPaint& paint, const GrRect& circle, const SkStrokeRec& stroke) @@ -109,7 +109,7 @@ void GrOvalRenderer::drawCircle(GrDrawTarget* target, kEdgeEffectStage = GrPaint::kTotalStages, }; drawState->setAttribBindings(GrDrawState::kDefault_AttribBindings); - + GrEffectRef* effect = GrCircleEdgeEffect::Create(isStroked); static const int kCircleEdgeAttrIndex = 1; drawState->setEffect(kEdgeEffectStage, effect, kCircleEdgeAttrIndex)->unref(); @@ -156,7 +156,7 @@ void GrOvalRenderer::drawCircle(GrDrawTarget* target, target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4); } -void GrOvalRenderer::drawEllipse(GrDrawTarget* target, +void GrOvalRenderer::drawEllipse(GrDrawTarget* target, const GrPaint& paint, const GrRect& ellipse, const SkStrokeRec& stroke) @@ -275,4 +275,3 @@ void GrOvalRenderer::drawEllipse(GrDrawTarget* target, target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4); } - |