Merge pull request #81 from fonttools/update-skia-m143

Migrate Skia to m143 and SkPathBuilder

Author: anthrotype

.github/workflows/ci.yml

@@ -8,8 +8,10 @@ on:
     branches: [main]
 
 env:
-  # skip 3.7 on all platforms; only build pypy3 for linux
-  CIBW_SKIP: cp37-* pp*-macosx_x86_64 pp*-win_amd64
+  # skip 3.8, 3.9 (EOL); skip free-threaded 3.14 (untested yet)
+  CIBW_SKIP: cp38-* cp39-* cp314t-*
+  # enable PyPy builds on all platforms
+  CIBW_ENABLE: pypy
   CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
   CIBW_MANYLINUX_I686_IMAGE: manylinux2014
   CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014
@@ -24,19 +26,28 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       CIBW_ARCHS: ${{ matrix.arch }}
+      CIBW_BUILD: ${{ matrix.cibw_build_filter || '' }}
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        # macos-13 runners are still x86_64, macos-14 (latest) are arm64; we want to build
-        # the x86_64 wheel on/for x86_64 macs
-        os: [macos-13, ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest]
         arch: [auto64]
         include:
+          # CPython universal2 wheels (x86_64 + arm64) for macOS
           - os: macos-latest
             arch: universal2
+            cibw_build_filter: "cp*"
+          # PyPy x86_64 wheels for macOS (PyPy doesn't support universal2)
+          - os: macos-13
+            arch: x86_64
+            cibw_build_filter: "pp*"
+          # PyPy arm64 wheels for macOS (PyPy doesn't support universal2)
+          - os: macos-latest
+            arch: arm64
+            cibw_build_filter: "pp*"
           - os: windows-latest
             arch: x86
     steps:
@@ -54,7 +65,11 @@ jobs:
         if [ "$BUILD_SKIA_FROM_SOURCE" == "0" ]; then
           pip install setuptools githubrelease
           if ! [[ $CIBW_ARCHS =~ ^auto ]]; then
-            cpu_arch="--cpu-arch=$CIBW_ARCHS"
+            # translate cibuildwheel arch names to download_libskia.py names
+            case "$CIBW_ARCHS" in
+              x86_64) cpu_arch="--cpu-arch=x64" ;;
+              *) cpu_arch="--cpu-arch=$CIBW_ARCHS" ;;
+            esac
           fi
           python ci/download_libskia.py -d "${SKIA_LIBRARY_DIR}" $cpu_arch
         fi
@@ -72,7 +87,7 @@ jobs:
     strategy:
       matrix:
         # aarch64 uses qemu so it's slow, build each py version in parallel jobs
-        python: [38, 39, 310, 311, 312, 313]
+        python: [310, 311, 312, 313, 314]
         arch: [aarch64]
     env:
       # Skip building aarch64 wheels for musllinux until I figure out why I get

pyproject.toml

@@ -1,8 +1,6 @@
 [build-system]
 requires = [
-    # pin setuptools on pypy to workaround this bug: https://github.com/pypa/distutils/issues/283
-    "setuptools<72.2.0; platform_python_implementation == 'PyPy'",
-    "setuptools; platform_python_implementation != 'PyPy'",
+    "setuptools",
     "wheel",
     "setuptools_scm",
     "cython >= 0.28.4",

setup.py

@@ -329,7 +329,7 @@ def get_skia_using_pkgconfig():
         [
             # extra flags needed on macOS for C++11
             "-stdlib=libc++",
-            "-mmacosx-version-min=10.9",
+            "-mmacosx-version-min=11.0",
         ]
         if platform.system() == "Darwin"
         else []
@@ -352,6 +352,7 @@ def get_skia_using_pkgconfig():
         ],
         include_dirs=include_dirs,
         extra_compile_args=extra_compile_args,
+        define_macros=[("SK_SUPPORT_UNSPANNED_APIS", "1")],
         libraries=["skia", *pkg_config_op.libraries],
         library_dirs=library_dirs,
         language="c++",
@@ -391,7 +392,7 @@ def get_skia_using_pkgconfig():
             # "pytest-cython",
         ],
     },
-    python_requires=">=3.8",
+    python_requires=">=3.10",
     zip_safe=False,
     classifiers=[
         "Development Status :: 4 - Beta",

src/cpp/skia-builder

@@ -1,19 +1,15 @@
 from ._skia.core cimport (
+    SkArcSize,
     SkLineCap,
     SkLineJoin,
     SkPath,
+    SkPathBuilder,
     SkPathFillType,
+    SkPathIter,
+    SkPathVerb,
     SkPoint,
     SkScalar,
-    kMove_Verb,
-    kLine_Verb,
-    kQuad_Verb,
-    kConic_Verb,
-    kCubic_Verb,
-    kClose_Verb,
-    kDone_Verb,
-    kSmall_ArcSize,
-    kLarge_ArcSize,
+    SkSpan,
     SkPathDirection,
     SkMatrix,
 )
@@ -27,6 +23,7 @@ from ._skia.pathops cimport (
     kReverseDifference_SkPathOp,
 )
 from libc.stdint cimport uint8_t, int32_t, uint32_t
+from libcpp.optional cimport optional
 
 
 cpdef enum PathOp:
@@ -56,8 +53,8 @@ cpdef enum LineJoin:
 
 
 cpdef enum ArcSize:
-    SMALL = kSmall_ArcSize
-    LARGE = kLarge_ArcSize
+    SMALL = <uint32_t>SkArcSize.kSmall_ArcSize
+    LARGE = <uint32_t>SkArcSize.kLarge_ArcSize
 
 
 cpdef enum Direction:
@@ -97,10 +94,10 @@ cdef bint collinear(
 
 cdef class Path:
 
-    cdef SkPath path
+    cdef SkPathBuilder path
 
     @staticmethod
-    cdef Path create(const SkPath& path)
+    cdef Path create(const SkPathBuilder& path)
 
     cpdef PathPen getPen(self, object glyphSet=*, bint allow_open_paths=*)
 
@@ -200,13 +197,12 @@ cdef class Path:
 
 
 cpdef enum PathVerb:
-    MOVE = kMove_Verb
-    LINE = kLine_Verb
-    QUAD = kQuad_Verb
-    CONIC = kConic_Verb  # unsupported
-    CUBIC = kCubic_Verb
-    CLOSE = kClose_Verb
-    DONE = kDone_Verb  # unused; we raise StopIteration instead
+    MOVE = <uint8_t>SkPathVerb.kMove
+    LINE = <uint8_t>SkPathVerb.kLine
+    QUAD = <uint8_t>SkPathVerb.kQuad
+    CONIC = <uint8_t>SkPathVerb.kConic  # unsupported
+    CUBIC = <uint8_t>SkPathVerb.kCubic
+    CLOSE = <uint8_t>SkPathVerb.kClose
 
 
 cdef uint8_t *POINTS_IN_VERB
@@ -219,20 +215,19 @@ cdef dict PEN_METHODS
 cdef class RawPathIterator:
 
     cdef Path path
-    cdef SkPath.RawIter iterator
+    cdef optional[SkPathIter] iterator
 
 
 cdef class SegmentPenIterator:
 
-    cdef _SkPointArray pa
-    cdef SkPoint *pts
-    cdef _VerbArray va
-    cdef uint8_t *verbs
-    cdef uint8_t *verb_stop
+    cdef Path path
+    cdef const SkPoint *pts
+    cdef const SkPathVerb *verbs
+    cdef const SkPathVerb *verb_stop
     cdef SkPoint move_pt
     cdef bint closed
 
-    cdef uint8_t peek(self)
+    cdef bint nextIsClose(self)
 
     cdef tuple _join_quadratic_segments(self)
 
@@ -260,25 +255,7 @@ cdef class PathPen:
     cpdef addComponent(self, glyphName, transformation)
 
 
-cdef double get_path_area(const SkPath& path) except? -1234567
-
-
-cdef class _VerbArray:
-
-    cdef uint8_t *data
-    cdef int count
-
-    @staticmethod
-    cdef _VerbArray create(const SkPath& path)
-
-
-cdef class _SkPointArray:
-
-    cdef SkPoint *data
-    cdef int count
-
-    @staticmethod
-    cdef _SkPointArray create(const SkPath& path)
+cdef double get_path_area(const SkPathBuilder& path) except? -1234567
 
 
 cdef class _SkScalarArray:
@@ -290,13 +267,13 @@ cdef class _SkScalarArray:
     cdef _SkScalarArray create(object values)
 
 
-cdef int pts_in_verb(unsigned v) except -1
+cdef int pts_in_verb(SkPathVerb v) except -1
 
 
-cdef bint reverse_contour(SkPath& path) except False
+cdef bint reverse_contour(SkPathBuilder& path) except False
 
 
-cdef int path_is_inside(const SkPath& self, const SkPath& other) except -1
+cdef int path_is_inside(const SkPathBuilder& self, const SkPathBuilder& other) except -1
 
 
 cpdef int restore_starting_points(Path path, list points) except -1
@@ -313,17 +290,17 @@ cdef int find_oncurve_point(
     SkScalar y,
     const SkPoint *pts,
     int pt_count,
-    const uint8_t *verbs,
+    const SkPathVerb *verbs,
     int verb_count,
     int *pt_index,
     int *verb_index,
 ) except -1
 
 
-cdef int contour_is_closed(const uint8_t *verbs, int verb_count) except -1
+cdef int contour_is_closed(SkSpan[const SkPathVerb] verbs) except -1
 
 
-cdef int set_contour_start_point(SkPath& path, SkScalar x, SkScalar y) except -1
+cdef int set_contour_start_point(SkPathBuilder& path, SkScalar x, SkScalar y) except -1
 
 
 cdef int compute_conic_to_quad_pow2(