Partial revert of r9087

https://codereview.chromium.org/14858035/



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

1 files changed, 6 insertions, 1 deletions

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 679771eed1..a865d81729 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -681,6 +681,7 @@ static void setStrokeRectStrip(GrPoint verts[10], GrRect rect,
 }
 
 static bool apply_aa_to_rect(GrDrawTarget* target,
+                             const GrRect& rect,
                              SkScalar strokeWidth,
                              const SkMatrix* matrix,
                              SkMatrix* combinedMatrix,
@@ -753,6 +754,10 @@ static bool apply_aa_to_rect(GrDrawTarget* target,
 #endif
     }
 
+    if (0 == rect.width() || 0 == rect.height()) {
+        return false;
+    }
+
     return true;
 }
 
@@ -769,7 +774,7 @@ void GrContext::drawRect(const GrPaint& paint,
     bool useVertexCoverage;
     bool needAA = paint.isAntiAlias() &&
                   !this->getRenderTarget()->isMultisampled();
-    bool doAA = needAA && apply_aa_to_rect(target, width, matrix,
+    bool doAA = needAA && apply_aa_to_rect(target, rect, width, matrix,
                                            &combinedMatrix,
                                            &useVertexCoverage);
     if (doAA) {