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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gpu/GrClip.cpp b/src/gpu/GrClip.cpp
index a5120d4ff1..7803edcf75 100644
--- a/src/gpu/GrClip.cpp
+++ b/src/gpu/GrClip.cpp
@@ -29,7 +29,7 @@ GrClip::GrClip(const GrRect& rect) {
 }
 
 GrClip::GrClip(GrClipIterator* iter, GrScalar tx, GrScalar ty,
-               const GrRect* bounds) {
+               const GrRect& bounds) {
     this->setFromIterator(iter, tx, ty, bounds);
 }
 
@@ -89,7 +89,7 @@ static void intersectWith(SkRect* dst, const SkRect& src) {
 }
 
 void GrClip::setFromIterator(GrClipIterator* iter, GrScalar tx, GrScalar ty,
-                             const GrRect* conservativeBounds) {
+                             const GrRect& conservativeBounds) {
     fList.reset();
     fRequiresAA = false;
 
@@ -148,8 +148,8 @@ void GrClip::setFromIterator(GrClipIterator* iter, GrScalar tx, GrScalar ty,
     if (isectRectValid && rectCount) {
         fConservativeBounds = fList[0].fRect;
         fConservativeBoundsValid = true;
-    } else if (NULL != conservativeBounds) {
-        fConservativeBounds = *conservativeBounds;
+    } else {
+        fConservativeBounds = conservativeBounds;
         fConservativeBoundsValid = true;
     }
 }