Make distance field bounds calculation more accurate for strokes

src/gpu/batches/GrAADistanceFieldPathRenderer.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAADistanceFieldPathRenderer.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 83 matching lines @@
 
     // currently don't support perspective
     if (args.fViewMatrix->hasPerspective()) {
         return false;
     }
 
     // only support paths with bounds within kMediumMIP by kMediumMIP,
     // scaled to have bounds within 2.0f*kLargeMIP by 2.0f*kLargeMIP
     // the goal is to accelerate rendering of lots of small paths that may be scaling
     SkScalar maxScale = args.fViewMatrix->getMaxScale();
-#if 0 // This is more accurate but changes some GMs. TODO: Standalone change to enable this.
     SkRect bounds;
     args.fStyle->adjustBounds(&bounds, args.fPath->getBounds());
     SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
-#else
-    const SkRect& bounds = args.fPath->getBounds();
-    SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
-    const SkStrokeRec& stroke = args.fStyle->strokeRec();
-    // Approximate stroked size by adding the maximum of the stroke width or 2x the miter limit
-    if (!stroke.isFillStyle()) {
-        SkScalar extraWidth = stroke.getWidth();
-        if (SkPaint::kMiter_Join == stroke.getJoin()) {
-            extraWidth = SkTMax(extraWidth, 2.0f*stroke.getMiter());
-        }
-        maxDim += extraWidth;
-    }
-#endif
 
     return maxDim <= kMediumMIP && maxDim * maxScale <= 2.0f*kLargeMIP;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // padding around path bounds to allow for antialiased pixels
 static const SkScalar kAntiAliasPad = 1.0f;
 
 class AADistanceFieldPathBatch : public GrVertexBatch {
@@ skipping 523 matching lines @@
     geometry.fGenID = random->nextU();
 
     return AADistanceFieldPathBatch::Create(geometry, viewMatrix,
                                             gTestStruct.fAtlas,
                                             &gTestStruct.fPathCache,
                                             &gTestStruct.fPathList,
                                             gammaCorrect);
 }
 
 #endif