Revert "More fixes for distance field paths"

This reverts commit d081ff314f07104adacaadc3d0f8f13dc741f016.

Reason for revert: Failing unit tests.

Original change's description:
> More fixes for distance field paths
> 
> Disables use of SDFs for very small paths (because of blurring) and
> adds a border of 1 pixel in device space to handle antialiasing.
> 
> BUG=chromium:677889
> 
> Change-Id: I81e49477c943d41523fd836e55abd696a985491f
> Reviewed-on: https://skia-review.googlesource.com/6832
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> 

TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
BUG=chromium:677889
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I4a6a698fa2e9e58c1c98a5a89f54bed724527951
Reviewed-on: https://skia-review.googlesource.com/6890
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>

3 files changed, 31 insertions, 95 deletions

diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp
index 2562e7c9a5..da0efea243 100644
--- a/gm/pathfill.cpp
+++ b/gm/pathfill.cpp
@@ -140,49 +140,6 @@ static SkScalar make_line(SkPath* path) {
     return SkIntToScalar(40);
 }
 
-static SkScalar make_info(SkPath* path) {
-    path->moveTo(24, 4);
-    path->cubicTo(12.94999980926514f,
-                  4,
-                  4,
-                  12.94999980926514f,
-                  4,
-                  24);
-    path->cubicTo(4,
-                  35.04999923706055f,
-                  12.94999980926514f,
-                  44,
-                  24,
-                  44);
-    path->cubicTo(35.04999923706055f,
-                  44,
-                  44,
-                  35.04999923706055f,
-                  44,
-                  24);
-    path->cubicTo(44,
-                  12.95000076293945f,
-                  35.04999923706055f,
-                  4,
-                  24,
-                  4);
-    path->close();
-    path->moveTo(26, 34);
-    path->lineTo(22, 34);
-    path->lineTo(22, 22);
-    path->lineTo(26, 22);
-    path->lineTo(26, 34);
-    path->close();
-    path->moveTo(26, 18);
-    path->lineTo(22, 18);
-    path->lineTo(22, 14);
-    path->lineTo(26, 14);
-    path->lineTo(26, 18);
-    path->close();
-
-    return SkIntToScalar(44);
-}
-
 constexpr MakePathProc gProcs[] = {
     make_frame,
     make_triangle,
@@ -201,14 +158,11 @@ constexpr MakePathProc gProcs[] = {
 class PathFillGM : public skiagm::GM {
     SkPath  fPath[N];
     SkScalar fDY[N];
-    SkPath  fInfoPath;
 protected:
     void onOnceBeforeDraw() override {
         for (size_t i = 0; i < N; i++) {
             fDY[i] = gProcs[i](&fPath[i]);
         }
-
-        (void) make_info(&fInfoPath);
     }
 
 
@@ -228,10 +182,6 @@ protected:
             canvas->drawPath(fPath[i], paint);
             canvas->translate(SkIntToScalar(0), fDY[i]);
         }
-
-        canvas->scale(0.300000011920929f, 0.300000011920929f);
-        canvas->translate(50, 50);
-        canvas->drawPath(fInfoPath, paint);
     }
 
 private:
diff --git a/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
index 455d76eb46..c9b30f5154 100644
--- a/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
@@ -38,7 +38,6 @@ static int g_NumFreedShapes = 0;
 #endif
 
 // mip levels
-static const int kMinSize = 16;
 static const int kSmallMIP = 32;
 static const int kMediumMIP = 73;
 static const int kLargeMIP = 162;
@@ -107,17 +106,14 @@ bool GrAADistanceFieldPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) c
         return false;
     }
 
-    // Only support paths with bounds within kMediumMIP by kMediumMIP,
-    // scaled to have bounds within 2.0f*kLargeMIP by 2.0f*kLargeMIP.
-    // For clarity, the original or scaled path should be at least kMinSize by kMinSize.
-    // TODO: revisit this last criteria with Joel's patch.
-    // The goal is to accelerate rendering of lots of small paths that may be scaling.
+    // 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();
     SkRect bounds = args.fShape->styledBounds();
     SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
 
-    return maxDim >= kMinSize && maxDim <= kMediumMIP &&
-           maxDim * maxScale >= kMinSize && maxDim * maxScale <= 2.0f*kLargeMIP;
+    return maxDim <= kMediumMIP && maxDim * maxScale <= 2.0f*kLargeMIP;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -402,12 +398,29 @@ private:
         // set the bounds rect to the original bounds
         shapeData->fBounds = bounds;
 
-        // set up path to texture coordinate transform
-        shapeData->fScale = scale;
+        // set up texture coordinates
+        SkScalar texLeft = bounds.fLeft;
+        SkScalar texTop = bounds.fTop;
+        SkScalar texRight = bounds.fRight;
+        SkScalar texBottom = bounds.fBottom;
+
+        // transform original path's bounds to texture space
+        texLeft *= scale;
+        texTop *= scale;
+        texRight *= scale;
+        texBottom *= scale;
         dx -= SK_DistanceFieldPad + kAntiAliasPad;
         dy -= SK_DistanceFieldPad + kAntiAliasPad;
-        shapeData->fTranslate.fX = atlasLocation.fX - dx;
-        shapeData->fTranslate.fY = atlasLocation.fY - dy;
+        texLeft += atlasLocation.fX - dx;
+        texTop += atlasLocation.fY - dy;
+        texRight += atlasLocation.fX - dx;
+        texBottom += atlasLocation.fY - dy;
+
+        GrTexture* texture = atlas->getTexture();
+        shapeData->fTexCoords.setLTRB(texLeft / texture->width(),
+                                      texTop / texture->height(),
+                                      texRight / texture->width(),
+                                      texBottom / texture->height());
 
         fShapeCache->add(shapeData);
         fShapeList->addToTail(shapeData);
@@ -426,15 +439,10 @@ private:
                            const ShapeData* shapeData) const {
         SkPoint* positions = reinterpret_cast<SkPoint*>(offset);
 
-        // outset bounds to include ~1 pixel of AA in device space
-        SkRect bounds = shapeData->fBounds;
-        SkScalar outset = SkScalarInvert(maxScale);
-        bounds.outset(outset, outset);
-
         // vertex positions
         // TODO make the vertex attributes a struct
-        positions->setRectFan(bounds.left(), bounds.top(), bounds.right(), bounds.bottom(),
-                              vertexStride);
+        positions->setRectFan(shapeData->fBounds.left(), shapeData->fBounds.top(),
+                              shapeData->fBounds.right(), shapeData->fBounds.bottom(), vertexStride);
 
         // colors
         for (int i = 0; i < kVerticesPerQuad; i++) {
@@ -442,32 +450,11 @@ private:
             *colorPtr = color;
         }
 
-        // set up texture coordinates
-        SkScalar texLeft = bounds.fLeft;
-        SkScalar texTop = bounds.fTop;
-        SkScalar texRight = bounds.fRight;
-        SkScalar texBottom = bounds.fBottom;
-
-        // transform original path's bounds to texture space
-        SkScalar scale = shapeData->fScale;
-        const SkVector& translate = shapeData->fTranslate;
-        texLeft *= scale;
-        texTop *= scale;
-        texRight *= scale;
-        texBottom *= scale;
-        texLeft += translate.fX;
-        texTop += translate.fY;
-        texRight += translate.fX;
-        texBottom += translate.fY;
-
         // vertex texture coords
         // TODO make these int16_t
         SkPoint* textureCoords = (SkPoint*)(offset + sizeof(SkPoint) + sizeof(GrColor));
-        GrTexture* texture = atlas->getTexture();
-        textureCoords->setRectFan(texLeft / texture->width(),
-                                  texTop / texture->height(),
-                                  texRight / texture->width(),
-                                  texBottom / texture->height(),
+        textureCoords->setRectFan(shapeData->fTexCoords.left(), shapeData->fTexCoords.top(),
+                                  shapeData->fTexCoords.right(), shapeData->fTexCoords.bottom(),
                                   vertexStride);
     }
 
diff --git a/src/gpu/ops/GrAADistanceFieldPathRenderer.h b/src/gpu/ops/GrAADistanceFieldPathRenderer.h
index 202b114e23..5d3480743d 100644
--- a/src/gpu/ops/GrAADistanceFieldPathRenderer.h
+++ b/src/gpu/ops/GrAADistanceFieldPathRenderer.h
@@ -71,9 +71,8 @@ private:
         };
         Key fKey;
         GrDrawOpAtlas::AtlasID fID;
-        SkRect   fBounds;
-        SkScalar fScale;
-        SkVector fTranslate;
+        SkRect fBounds;
+        SkRect fTexCoords;
         SK_DECLARE_INTERNAL_LLIST_INTERFACE(ShapeData);
 
         static inline const Key& GetKey(const ShapeData& data) {