commit 7b11807968d74bf08cabbb6fcb03daabf234711f
author scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 23 15:04:26 2011 +0000
committer scroggo <scroggo@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 23 15:04:26 2011 +0000
tree 50793d5145e8b5ccacb3150780fb1daff995a0c1
parent 0a0a236c3ba241046d38caaf78226ec68ff9c998

Fix a crash.

http://codereview.appspot.com/4272065/


git-svn-id: http://skia.googlecode.com/svn/trunk@986 2bbb7eff-a529-9590-31e7-b0007b416f81

include/gpu/SkGr.h

diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h
index 7221213..223923b 100644
--- a/include/gpu/SkGr.h
+++ b/include/gpu/SkGr.h
@@ -207,7 +207,11 @@
     virtual GrSetOp getOp() const;
 
     virtual void getRect(GrRect* rect) const {
-        *rect = Sk2Gr(*fCurr->fRect);
+        if (!fCurr->fRect) {
+            rect->setEmpty();
+        } else {
+            *rect = Sk2Gr(*fCurr->fRect);
+        }
     }
 
     virtual GrPathIter* getPathIter() {

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index e57f88a..ec4fc1d 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -166,10 +166,9 @@
 
 GrClipType SkGrClipIterator::getType() const {
     GrAssert(!this->isDone());
-    if (NULL != fCurr->fRect) {
+    if (NULL == fCurr->fPath) {
         return kRect_ClipType;
     } else {
-        GrAssert(NULL != fCurr->fPath);
         return kPath_ClipType;
     }
 }