Remove SHADER_AA_FILL_RECT flag

src/gpu/GrDrawContext.cpp

Index: src/gpu/GrDrawContext.cpp
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
index 288841c1120abbcb8e61db4d49b447a369d547c3..dff0818d3a3f7aa25b2438bf45e645e1f6ae6142 100644
--- a/src/gpu/GrDrawContext.cpp
+++ b/src/gpu/GrDrawContext.cpp
@@ -213,25 +213,11 @@ static bool apply_aa_to_rect(GrDrawTarget* target,
                              SkScalar strokeWidth,
                              const SkMatrix& combinedMatrix,
                              GrColor color) {
-    if (pipelineBuilder->getRenderTarget()->isUnifiedMultisampled()) {
+    if (pipelineBuilder->getRenderTarget()->isUnifiedMultisampled() ||
+        !combinedMatrix.preservesAxisAlignment()) {
         return false;
     }
 
-#ifdef SHADER_AA_FILL_RECT
-    if (strokeWidth >= 0) {
-#endif
-        if (!combinedMatrix.preservesAxisAlignment()) {
-            return false;
-        }
-
-#ifdef SHADER_AA_FILL_RECT
-    } else {
-        if (!combinedMatrix.preservesRightAngles()) {
-            return false;
-        }
-    }
-#endif
-
     combinedMatrix.mapRect(devBoundRect, rect);
     if (!combinedMatrix.rectStaysRect()) {
         return true;