Remove SHADER_AA_FILL_RECT flag

src/gpu/GrDrawContext.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAARectRenderer.h"
 #include "GrAtlasTextContext.h"
@@ skipping 195 matching lines @@
          SkScalarIsInt(r.fRight) && SkScalarIsInt(r.fBottom);
 }
 
 static bool apply_aa_to_rect(GrDrawTarget* target,
                              GrPipelineBuilder* pipelineBuilder,
                              SkRect* devBoundRect,
                              const SkRect& rect,
                              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;
     }
 
     if (strokeWidth < 0) {
         return !is_irect(*devBoundRect);
     }
 
     return true;
@@ skipping 1089 matching lines @@
     return DrawVerticesBatch::Create(geometry, type, viewMatrix,
                                      positions.begin(), vertexCount,
                                      indices.begin(), hasIndices ? vertexCount : 0,
                                      colors.begin(),
                                      texCoords.begin(),
                                      bounds);
 }
 
 #endif