commit 957189bfc2784ad92bd5384f8cfc0e7077f55ca5
author Chris Dalton <csmartdalton@google.com> Thu May 07 12:47:26 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 07 19:38:50 2020 +0000
tree 0e62a02cc2af932a09b0bc77453fb3016e05ce26
parent c66cd987f7c0e71eaf3a5239ae4e89228f490cab

Remove RawIter usages from pathops

Change-Id: Ib988271088cb1459d026faeb497eeed793172928
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/287887
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Mike Reed <reed@google.com>

src/pathops/SkPathOpsTightBounds.cpp

diff --git a/src/pathops/SkPathOpsTightBounds.cpp b/src/pathops/SkPathOpsTightBounds.cpp
index 4e2af89..d11b292 100644
--- a/src/pathops/SkPathOpsTightBounds.cpp
+++ b/src/pathops/SkPathOpsTightBounds.cpp
@@ -4,33 +4,30 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "src/core/SkPathPriv.h"
 #include "src/pathops/SkOpEdgeBuilder.h"
 #include "src/pathops/SkPathOpsCommon.h"
 
 bool TightBounds(const SkPath& path, SkRect* result) {
-    SkPath::RawIter iter(path);
     SkRect moveBounds = { SK_ScalarMax, SK_ScalarMax, SK_ScalarMin, SK_ScalarMin };
     bool wellBehaved = true;
-    SkPath::Verb verb;
-    do {
-        SkPoint pts[4];
-        verb = iter.next(pts);
+    for (auto [verb, pts, w] : SkPathPriv::Iterate(path)) {
         switch (verb) {
-            case SkPath::kMove_Verb:
+            case SkPathVerb::kMove:
                 moveBounds.fLeft = std::min(moveBounds.fLeft, pts[0].fX);
                 moveBounds.fTop = std::min(moveBounds.fTop, pts[0].fY);
                 moveBounds.fRight = std::max(moveBounds.fRight, pts[0].fX);
                 moveBounds.fBottom = std::max(moveBounds.fBottom, pts[0].fY);
                 break;
-            case SkPath::kQuad_Verb:
-            case SkPath::kConic_Verb:
+            case SkPathVerb::kQuad:
+            case SkPathVerb::kConic:
                 if (!wellBehaved) {
                     break;
                 }
                 wellBehaved &= between(pts[0].fX, pts[1].fX, pts[2].fX);
                 wellBehaved &= between(pts[0].fY, pts[1].fY, pts[2].fY);
                 break;
-            case SkPath::kCubic_Verb:
+            case SkPathVerb::kCubic:
                 if (!wellBehaved) {
                     break;
                 }
@@ -42,7 +39,7 @@
             default:
                 break;
         }
-    } while (verb != SkPath::kDone_Verb);
+    }
     if (wellBehaved) {
         *result = path.getBounds();
         return true;