summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-02-17 21:31:54 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-02-17 21:31:54 +0100
commit91903016bd260ffdb10d374900741ede33df2020 (patch)
tree134643c1647171c0bc8b67e879f68a976771bfaa
parentc13bd1bba28a71d0a2263882b3c72d59a8c32478 (diff)
downloadUXP-91903016bd260ffdb10d374900741ede33df2020.tar
UXP-91903016bd260ffdb10d374900741ede33df2020.tar.gz
UXP-91903016bd260ffdb10d374900741ede33df2020.tar.lz
UXP-91903016bd260ffdb10d374900741ede33df2020.tar.xz
UXP-91903016bd260ffdb10d374900741ede33df2020.zip
Skia: Be consistent about int for incReserve.
Upstream port.
-rw-r--r--gfx/skia/skia/include/core/SkPath.h2
-rw-r--r--gfx/skia/skia/src/core/SkPath.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/gfx/skia/skia/include/core/SkPath.h b/gfx/skia/skia/include/core/SkPath.h
index d1af4f31b..bde07c498 100644
--- a/gfx/skia/skia/include/core/SkPath.h
+++ b/gfx/skia/skia/include/core/SkPath.h
@@ -373,7 +373,7 @@ public:
@param extraPtCount The number of extra points the path should
preallocate for.
*/
- void incReserve(unsigned extraPtCount);
+ void incReserve(int extraPtCount);
/** Set the beginning of the next contour to the point (x,y).
diff --git a/gfx/skia/skia/src/core/SkPath.cpp b/gfx/skia/skia/src/core/SkPath.cpp
index 8f93c9c18..b7d392025 100644
--- a/gfx/skia/skia/src/core/SkPath.cpp
+++ b/gfx/skia/skia/src/core/SkPath.cpp
@@ -716,9 +716,11 @@ void SkPath::setConvexity(Convexity c) {
fFirstDirection = SkPathPriv::kUnknown_FirstDirection; \
} while (0)
-void SkPath::incReserve(U16CPU inc) {
+void SkPath::incReserve(int inc) {
SkDEBUGCODE(this->validate();)
- SkPathRef::Editor(&fPathRef, inc, inc);
+ if (inc > 0) {
+ SkPathRef::Editor(&fPathRef, inc, inc);
+ }
SkDEBUGCODE(this->validate();)
}