fix fuzzers
Many old pathops-related fuzz failures have built up while
the codebase was under a state a flux. Now that the code
is stable, address these failures.
Most of the CL plumbs the debug global state to downstream
routines so that, if the data is not trusted (ala fuzzed)
the function can safely exit without asserting.
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2426173002
Review-Url: https://chromiumcodereview.appspot.com/2426173002
diff --git a/src/pathops/SkPathOpsConic.h b/src/pathops/SkPathOpsConic.h
index 4cbe147..4236279 100644
--- a/src/pathops/SkPathOpsConic.h
+++ b/src/pathops/SkPathOpsConic.h
@@ -31,15 +31,23 @@
fPts.debugInit();
}
+ void debugSet(const SkDPoint* pts, SkScalar weight);
+
SkDConic flip() const {
- SkDConic result = {{{fPts[2], fPts[1], fPts[0]}}, fWeight};
+ SkDConic result = {{{fPts[2], fPts[1], fPts[0]}
+ SkDEBUGPARAMS(fPts.fDebugGlobalState) }, fWeight};
return result;
}
+#ifdef SK_DEBUG
+ SkOpGlobalState* globalState() const { return fPts.globalState(); }
+#endif
+
static bool IsConic() { return true; }
- const SkDConic& set(const SkPoint pts[kPointCount], SkScalar weight) {
- fPts.set(pts);
+ const SkDConic& set(const SkPoint pts[kPointCount], SkScalar weight
+ SkDEBUGPARAMS(SkOpGlobalState* state = nullptr)) {
+ fPts.set(pts SkDEBUGPARAMS(state));
fWeight = weight;
return *this;
}
@@ -117,6 +125,7 @@
void dump() const;
void dumpID(int id) const;
void dumpInner() const;
+
};