From 2e3be5648a9ffe6f26b4fb201cc189c0e6630367 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 2 Dec 2019 17:45:20 +0000 Subject: [PATCH] Reland "fix sense of ifdef for deprecated method" This reverts commit b97a24a009a13e31f0528cbc0d14a5a8f2248575. Reason for revert: flag added to chrome Original change's description: > Revert "fix sense of ifdef for deprecated method" > > This reverts commit aa98dd3d2722cc531acd280cf5e393019c9a29a9. > > Reason for revert: broke chrome, easy to add a flag there > > Original change's description: > > fix sense of ifdef for deprecated method > > > > Change-Id: I32164225750b23e1cc26aa36a60feda27bbd90a8 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/257319 > > Reviewed-by: Florin Malita > > Reviewed-by: Kevin Lubick > > Commit-Queue: Mike Reed > > TBR=bungeman@google.com,kjlubick@google.com,fmalita@chromium.org,reed@google.com > > Change-Id: I629bbd7f04a4ac8227c62f4d05cf2cb2601900c3 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/257328 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed TBR=bungeman@google.com,kjlubick@google.com,fmalita@chromium.org,reed@google.com Change-Id: If4c1e2a51fc8bc34f8053d716efea55e809967f7 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/257378 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- include/core/SkPath.h | 2 +- modules/pathkit/pathkit_wasm_bindings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/core/SkPath.h b/include/core/SkPath.h index 1c9904807c..5b5a1d09b1 100644 --- a/include/core/SkPath.h +++ b/include/core/SkPath.h @@ -1555,7 +1555,7 @@ public: */ Verb next(SkPoint pts[4]); -#ifndef SK_SUPPORT_LEGACY_PATH_ITER_NEXT +#ifdef SK_SUPPORT_LEGACY_PATHITER_NEXT // DEPRECATED Verb next(SkPoint pts[4], bool /*doConsumeDegenerates*/, bool /*exact*/ = false) { return this->next(pts); diff --git a/modules/pathkit/pathkit_wasm_bindings.cpp b/modules/pathkit/pathkit_wasm_bindings.cpp index 25aeca9f3e..34358d5bfd 100644 --- a/modules/pathkit/pathkit_wasm_bindings.cpp +++ b/modules/pathkit/pathkit_wasm_bindings.cpp @@ -275,7 +275,7 @@ void EMSCRIPTEN_KEEPALIVE ToCanvas(const SkPath& path, emscripten::val /* Path2D SkPath::Iter iter(path, false); SkPoint pts[4]; SkPath::Verb verb; - while ((verb = iter.next(pts, false)) != SkPath::kDone_Verb) { + while ((verb = iter.next(pts)) != SkPath::kDone_Verb) { switch (verb) { case SkPath::kMove_Verb: ctx.call("moveTo", pts[0].x(), pts[0].y());