aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar brianosman <brianosman@google.com>2016-02-14 10:33:03 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-14 10:33:03 -0800
commitbd6366a69ec890211496892e1a76535439ca2b30 (patch)
treecedaeb8ec323507118b09c3207e401d396c28056 /src
parentfdb627dcc6485874d741c0730873d49126bf5d34 (diff)
Roll back ellipse logic for now. This was (probably) still wrong.
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrOvalRenderer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 5779f8ac4c..d3f590277e 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -1081,8 +1081,8 @@ static GrDrawBatch* create_ellipse_batch(GrColor color,
// We've extended the outer x radius out half a pixel to antialias.
// This will also expand the rect so all the pixels will be captured.
// TODO: Consider if we should use sqrt(2)/2 instead
- SkScalar geoXRadius = xRadius + SK_ScalarHalf;
- SkScalar geoYRadius = yRadius + SK_ScalarHalf;
+ xRadius += SK_ScalarHalf;
+ yRadius += SK_ScalarHalf;
EllipseBatch::Geometry geometry;
geometry.fViewMatrix = viewMatrix;
@@ -1092,8 +1092,8 @@ static GrDrawBatch* create_ellipse_batch(GrColor color,
geometry.fInnerXRadius = innerXRadius;
geometry.fInnerYRadius = innerYRadius;
geometry.fStroke = isStrokeOnly && innerXRadius > 0 && innerYRadius > 0;
- geometry.fDevBounds = SkRect::MakeLTRB(center.fX - geoXRadius, center.fY - geoYRadius,
- center.fX + geoXRadius, center.fY + geoYRadius);
+ geometry.fDevBounds = SkRect::MakeLTRB(center.fX - xRadius, center.fY - yRadius,
+ center.fX + xRadius, center.fY + yRadius);
return EllipseBatch::Create(geometry);
}