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/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 5b61be2..dc04fcd 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -90,19 +90,16 @@
} else {
fExtMatrix.reset();
}
- if (context->getClip().hasConservativeBounds()) {
- if (!fExtMatrix.isIdentity()) {
- GrMatrix inverse;
- GrRect r = context->getClip().getConservativeBounds();
- if (fExtMatrix.invert(&inverse)) {
- inverse.mapRect(&r);
- r.roundOut(&fClipRect);
- }
- } else {
- context->getClip().getConservativeBounds().roundOut(&fClipRect);
+
+ if (!fExtMatrix.isIdentity()) {
+ GrMatrix inverse;
+ GrRect r = context->getClip().getConservativeBounds();
+ if (fExtMatrix.invert(&inverse)) {
+ inverse.mapRect(&r);
+ r.roundOut(&fClipRect);
}
} else {
- fClipRect.setLargest();
+ context->getClip().getConservativeBounds().roundOut(&fClipRect);
}
// save the context's original matrix off and restore in destructor