diff options
author | Jim Van Verth <jvanverth@google.com> | 2017-01-11 18:35:02 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 18:35:17 +0000 |
commit | 000ca636e6de2e2b8bf9c82e3dee2d7ad8e1bed8 (patch) | |
tree | 16948dc5a8d38b41f6c2c85ee153289d8463c3e8 /gm/pathfill.cpp | |
parent | 1252ec4bdaaa2bf0d1d3b2df8df735eb879427c2 (diff) |
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>
Diffstat (limited to 'gm/pathfill.cpp')
-rw-r--r-- | gm/pathfill.cpp | 50 |
1 files changed, 0 insertions, 50 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: |