validate using nx to match bounds

src/core/SkPathRef.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBuffer.h"
 #include "SkOnce.h"
 #include "SkPath.h"
@@ skipping 659 matching lines @@
     fPts = srcPts;
     return (uint8_t) verb;
 }
 
 uint8_t SkPathRef::Iter::peek() const {
     const uint8_t* next = fVerbs - 1;
     return next <= fVerbStop ? (uint8_t) SkPath::kDone_Verb : *next;
 }
 
 #ifdef SK_DEBUG
+
+#include "SkNx.h"
+
 void SkPathRef::validate() const {
     SkASSERT(static_cast<ptrdiff_t>(fFreeSpace) >= 0);
     SkASSERT(reinterpret_cast<intptr_t>(fVerbs) - reinterpret_cast<intptr_t>(fPoints) >= 0);
     SkASSERT((nullptr == fPoints) == (nullptr == fVerbs));
     SkASSERT(!(nullptr == fPoints && 0 != fFreeSpace));
     SkASSERT(!(nullptr == fPoints && 0 != fFreeSpace));
     SkASSERT(!(nullptr == fPoints && fPointCnt));
     SkASSERT(!(nullptr == fVerbs && fVerbCnt));
     SkASSERT(this->currSize() ==
                 fFreeSpace + sizeof(SkPoint) * fPointCnt + sizeof(uint8_t) * fVerbCnt);
 
     if (fIsOval || fIsRRect) {
         // Currently we don't allow both of these to be set, even though ovals are round rects.
         SkASSERT(fIsOval != fIsRRect);
         if (fIsOval) {
             SkASSERT(fRRectOrOvalStartIdx < 4);
         } else {
             SkASSERT(fRRectOrOvalStartIdx < 8);
         }
     }
 
     if (!fBoundsIsDirty && !fBounds.isEmpty()) {
         bool isFinite = true;
+        Sk2s leftTop = Sk2s(fBounds.fLeft, fBounds.fTop);
+        Sk2s rightBot = Sk2s(fBounds.fRight, fBounds.fBottom);
         for (int i = 0; i < fPointCnt; ++i) {
+            Sk2s point = Sk2s(fPoints[i].fX, fPoints[i].fY);
 #ifdef SK_DEBUG
             if (fPoints[i].isFinite() &&
-                (fPoints[i].fX < fBounds.fLeft || fPoints[i].fX > fBounds.fRight ||
-                 fPoints[i].fY < fBounds.fTop || fPoints[i].fY > fBounds.fBottom)) {
+                ((point < leftTop).anyTrue() || (point > rightBot).anyTrue())) {
                 SkDebugf("bounds: %f %f %f %f\n",
                          fBounds.fLeft, fBounds.fTop, fBounds.fRight, fBounds.fBottom);
                 for (int j = 0; j < fPointCnt; ++j) {
                     if (i == j) {
                         SkDebugf("*");
                     }
                     SkDebugf("%f %f\n", fPoints[j].fX, fPoints[j].fY);
                 }
             }
 #endif
 
             SkASSERT(!fPoints[i].isFinite() ||
-                     (fPoints[i].fX >= fBounds.fLeft && fPoints[i].fX <= fBounds.fRight &&
-                      fPoints[i].fY >= fBounds.fTop && fPoints[i].fY <= fBounds.fBottom));
+                    (!(point < leftTop).anyTrue() && !(point > rightBot).anyTrue()));
             if (!fPoints[i].isFinite()) {
                 isFinite = false;
             }
         }
         SkASSERT(SkToBool(fIsFinite) == isFinite);
     }
 
 #ifdef SK_DEBUG_PATH
     uint32_t mask = 0;
     for (int i = 0; i < fVerbCnt; ++i) {
@@ skipping 19 matching lines @@
                 break;
             default:
                 SkDEBUGFAIL("Unknown Verb");
                 break;
         }
     }
     SkASSERT(mask == fSegmentMask);
 #endif // SK_DEBUG_PATH
 }
 #endif