diff --git a/projects/skia/skia.diff b/projects/skia/skia.diff index 5899bf5af..4e0c269e4 100644 --- a/projects/skia/skia.diff +++ b/projects/skia/skia.diff @@ -1,5 +1,5 @@ diff --git a/fuzz/FuzzPathMeasure.cpp b/fuzz/FuzzPathMeasure.cpp -index 62e7b7434c..f64faab8be 100644 +index 8526ff8cc6..116302f5fe 100644 --- a/fuzz/FuzzPathMeasure.cpp +++ b/fuzz/FuzzPathMeasure.cpp @@ -22,6 +22,9 @@ DEF_FUZZ(PathMeasure, fuzz) { @@ -13,10 +13,10 @@ index 62e7b7434c..f64faab8be 100644 SkPathMeasure measure(path, bits & 1, resScale); SkPoint position; diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp -index baf8277e03..7480e0ea9e 100644 +index c33ea9510d..a4d09c265d 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp -@@ -1548,6 +1548,12 @@ static void operateY(SkAAClip::Builder& builder, const SkAAClip& A, +@@ -1547,6 +1547,12 @@ static void operateY(SkAAClip::Builder& builder, const SkAAClip& A, int topB = iterB.top(); int botB = iterB.bottom(); @@ -30,7 +30,7 @@ index baf8277e03..7480e0ea9e 100644 const uint8_t* rowA = nullptr; const uint8_t* rowB = nullptr; diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp -index 90bdf4772d..48ffbdfb79 100644 +index 296329a52d..9b74d50146 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -959,6 +959,12 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint, @@ -47,10 +47,10 @@ index 90bdf4772d..48ffbdfb79 100644 } diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp -index 01767c8618..18305a4f4f 100644 +index 107566459b..bac5263e47 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp -@@ -91,6 +91,12 @@ bool SkImageFilter::Common::unflatten(SkReadBuffer& buffer, int expectedCount) { +@@ -176,6 +176,12 @@ bool SkImageFilter_Base::Common::unflatten(SkReadBuffer& buffer, int expectedCou return false; } @@ -64,10 +64,10 @@ index 01767c8618..18305a4f4f 100644 for (int i = 0; i < count; i++) { fInputs.push_back(buffer.readBool() ? buffer.readImageFilter() : nullptr); diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp -index 7f625cf466..c90a9c99bd 100644 +index d998029a2b..8807c1fc4d 100644 --- a/src/core/SkMallocPixelRef.cpp +++ b/src/core/SkMallocPixelRef.cpp -@@ -70,6 +70,11 @@ sk_sp SkMallocPixelRef::MakeAllocate(const SkImageInfo& info, size_t +@@ -37,6 +37,11 @@ sk_sp SkMallocPixelRef::MakeAllocate(const SkImageInfo& info, size_t return nullptr; } } @@ -80,10 +80,10 @@ index 7f625cf466..c90a9c99bd 100644 if (nullptr == addr) { return nullptr; diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp -index 766be2bedf..32ec8184cb 100644 +index 573fe3cabb..cae96b00cc 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp -@@ -261,6 +261,11 @@ bool SkMaskFilterBase::filterPath(const SkPath& devPath, const SkMatrix& matrix, +@@ -262,6 +262,11 @@ bool SkMaskFilterBase::filterPath(const SkPath& devPath, const SkMatrix& matrix, SkMask srcM, dstM; @@ -96,10 +96,10 @@ index 766be2bedf..32ec8184cb 100644 SkMask::kComputeBoundsAndRenderImage_CreateMode, style)) { diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp -index 919e49f31d..0a90eec722 100644 +index f294dbe4a0..12100e1624 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp -@@ -452,6 +452,13 @@ bool SkPaint::getFillPath(const SkPath& src, SkPath* dst, const SkRect* cullRect +@@ -449,6 +449,13 @@ bool SkPaint::getFillPath(const SkPath& src, SkPath* dst, const SkRect* cullRect SkStrokeRec rec(*this, resScale); @@ -114,10 +114,10 @@ index 919e49f31d..0a90eec722 100644 SkPath tmpPath; diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp -index 35939679c6..95312d4864 100644 +index 5679a9d182..104523a6af 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp -@@ -3791,7 +3791,11 @@ void SkPathPriv::CreateDrawArcPath(SkPath* path, const SkRect& oval, SkScalar st +@@ -3120,7 +3120,11 @@ void SkPathPriv::CreateDrawArcPath(SkPath* path, const SkRect& oval, SkScalar st SkScalar sweepAngle, bool useCenter, bool isFillNoPathEffect) { SkASSERT(!oval.isEmpty()); SkASSERT(sweepAngle); @@ -129,9 +129,9 @@ index 35939679c6..95312d4864 100644 +#endif path->reset(); path->setIsVolatile(true); - path->setFillType(SkPath::kWinding_FillType); + path->setFillType(SkPathFillType::kWinding); diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp -index 9febf01bfa..d1b701fe62 100644 +index ff78b74a34..ce846799a4 100644 --- a/src/core/SkReadBuffer.cpp +++ b/src/core/SkReadBuffer.cpp @@ -277,7 +277,12 @@ sk_sp SkReadBuffer::readByteArrayAsData() { @@ -148,7 +148,7 @@ index 9febf01bfa..d1b701fe62 100644 /* Format: diff --git a/src/core/SkScan_Hairline.cpp b/src/core/SkScan_Hairline.cpp -index d9c0408b34..8f44cba5f3 100644 +index f9365cecb2..7b77341e06 100644 --- a/src/core/SkScan_Hairline.cpp +++ b/src/core/SkScan_Hairline.cpp @@ -121,7 +121,11 @@ void SkScan::HairLineRgn(const SkPoint array[], int arrayCount, const SkRegion* @@ -178,7 +178,7 @@ index d9c0408b34..8f44cba5f3 100644 SkFixed startX = SkFDot6ToFixed(x0) + (slope * ((32 - y0) & 63) >> 6); diff --git a/src/effects/Sk1DPathEffect.cpp b/src/effects/Sk1DPathEffect.cpp -index fbb73f5959..3cafd47f65 100644 +index 360179d663..04df451f2a 100644 --- a/src/effects/Sk1DPathEffect.cpp +++ b/src/effects/Sk1DPathEffect.cpp @@ -19,6 +19,11 @@ @@ -194,7 +194,7 @@ index fbb73f5959..3cafd47f65 100644 int governor = MAX_REASONABLE_ITERATIONS; SkScalar length = meas.getLength(); diff --git a/src/effects/Sk2DPathEffect.cpp b/src/effects/Sk2DPathEffect.cpp -index fb6a88e0fb..8253a1284d 100644 +index fa19bb96b8..005daff13b 100644 --- a/src/effects/Sk2DPathEffect.cpp +++ b/src/effects/Sk2DPathEffect.cpp @@ -51,6 +51,11 @@ void Sk2DPathEffect::nextSpan(int x, int y, int count, SkPath* path) const { @@ -210,7 +210,7 @@ index fb6a88e0fb..8253a1284d 100644 const SkMatrix& mat = this->getMatrix(); SkPoint src, dst; diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp -index ebcc683dca..753310f4c1 100644 +index 913d851c04..bd4ea876c0 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -381,6 +381,12 @@ sk_sp SkDashImpl::CreateProc(SkReadBuffer& buffer) { @@ -227,7 +227,7 @@ index ebcc683dca..753310f4c1 100644 if (buffer.readScalarArray(intervals.get(), count)) { return SkDashPathEffect::Make(intervals.get(), SkToInt(count), phase); diff --git a/src/effects/SkDiscretePathEffect.cpp b/src/effects/SkDiscretePathEffect.cpp -index 2c913d8d9e..61b9629766 100644 +index 93ea43fa29..69527725a6 100644 --- a/src/effects/SkDiscretePathEffect.cpp +++ b/src/effects/SkDiscretePathEffect.cpp @@ -97,6 +97,11 @@ bool SkDiscretePathEffect::onFilterPath(SkPath* dst, const SkPath& src, @@ -243,10 +243,10 @@ index 2c913d8d9e..61b9629766 100644 if (fSegLength * (2 + doFill) > length) { meas.getSegment(0, length, dst, true); // to short for us to mangle diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp -index cd3f51bac3..d2b5050f0c 100644 +index 42592211a9..3b46f632cf 100644 --- a/src/effects/SkLayerDrawLooper.cpp +++ b/src/effects/SkLayerDrawLooper.cpp -@@ -228,6 +228,11 @@ void SkLayerDrawLooper::flatten(SkWriteBuffer& buffer) const { +@@ -213,6 +213,11 @@ void SkLayerDrawLooper::flatten(SkWriteBuffer& buffer) const { sk_sp SkLayerDrawLooper::CreateProc(SkReadBuffer& buffer) { int count = buffer.readInt(); @@ -259,7 +259,7 @@ index cd3f51bac3..d2b5050f0c 100644 for (int i = 0; i < count; i++) { LayerInfo info; diff --git a/src/ports/SkDebug_stdio.cpp b/src/ports/SkDebug_stdio.cpp -index ec4e3fec77..4bc01d5d51 100644 +index 1bba63cc0a..e569514902 100644 --- a/src/ports/SkDebug_stdio.cpp +++ b/src/ports/SkDebug_stdio.cpp @@ -12,9 +12,13 @@