AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reland "fix sense of ifdef for deprecated method"

Browse Source 
This reverts commit b97a24a009.

Reason for revert: flag added to chrome

Original change's description:
> Revert "fix sense of ifdef for deprecated method"
> 
> This reverts commit aa98dd3d27.
> 
> 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 <fmalita@chromium.org>
> > Reviewed-by: Kevin Lubick <kjlubick@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> 
> 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 <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2019-12-02 17:45:20 +00:00 committed by Skia Commit-Bot
parent b97a24a009
commit 2e3be5648a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkPath.h
View File

@ -1555,7 +1555,7 @@ public:
*/ */
Verb next(SkPoint pts[4]); Verb next(SkPoint pts[4]);
#ifndef SK_SUPPORT_LEGACY_PATH_ITER_NEXT #ifdef SK_SUPPORT_LEGACY_PATHITER_NEXT
// DEPRECATED // DEPRECATED
Verb next(SkPoint pts[4], bool /*doConsumeDegenerates*/, bool /*exact*/ = false) { Verb next(SkPoint pts[4], bool /*doConsumeDegenerates*/, bool /*exact*/ = false) {
return this->next(pts); return this->next(pts);

2
modules/pathkit/pathkit_wasm_bindings.cpp
View File

@ -275,7 +275,7 @@ void EMSCRIPTEN_KEEPALIVE ToCanvas(const SkPath& path, emscripten::val /* Path2D
SkPath::Iter iter(path, false); SkPath::Iter iter(path, false);
SkPoint pts[4]; SkPoint pts[4];
SkPath::Verb verb; SkPath::Verb verb;
while ((verb = iter.next(pts, false)) != SkPath::kDone_Verb) { while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
switch (verb) { switch (verb) {
case SkPath::kMove_Verb: case SkPath::kMove_Verb:
ctx.call<void>("moveTo", pts[0].x(), pts[0].y()); ctx.call<void>("moveTo", pts[0].x(), pts[0].y());