Forced GrClip to always have conservative bounds
http://codereview.appspot.com/6353089/
git-svn-id: http://skia.googlecode.com/svn/trunk@4545 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index bccfc47..5ab5fb4 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -46,15 +46,12 @@
}
*pathBounds = GrIRect::MakeWH(rt->width(), rt->height());
const GrClip& clip = target->getClip();
- if (clip.hasConservativeBounds()) {
- clip.getConservativeBounds().roundOut(clipBounds);
- if (!pathBounds->intersect(*clipBounds)) {
- return false;
- }
- } else {
- // pathBounds is currently the rt extent, set clip bounds to that rect.
- *clipBounds = *pathBounds;
+
+ clip.getConservativeBounds().roundOut(clipBounds);
+ if (!pathBounds->intersect(*clipBounds)) {
+ return false;
}
+
if (!path.getBounds().isEmpty()) {
GrRect pathSBounds;
matrix.mapRect(&pathSBounds, path.getBounds());