Merge pull request #134 from kyamagu/implement-svgdom

Implement SVGDOM API
kyamagu · Jan 6, 2021 · 5ddcfbf · 5ddcfbf
2 parents c39b6c5 + 5a11a84
commit 5ddcfbf
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 34 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,11 +51,11 @@ jobs:
     - name: Build Skia
       run: |
         cd skia
+        patch -p1 < ../patch/git-sync-deps.patch
         python tools/git-sync-deps
         cp -f ../gn/out/gn bin/gn  # Replace gn.
         bin/gn gen out/Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false extra_cflags_cc=["-frtti"] extra_ldflags=["-lrt"]'
-        ninja -C out/Release skia skia.h
-        rm -rf out/Release/obj
+        ninja -C out/Release skia skia.h experimental_svg_model
         cd ..
       if: steps.cache.outputs.cache-hit != 'true'
     - name: Set up Python
@@ -98,8 +98,7 @@ jobs:
         cd skia
         python tools/git-sync-deps
         bin/gn gen out/Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false extra_cflags_cc=["-frtti", "-mmacosx-version-min=10.9"]'
-        ninja -C out/Release skia skia.h
-        rm -rf out/Release/obj
+        ninja -C out/Release skia skia.h experimental_svg_model
         cd ..
       if: steps.cache.outputs.cache-hit != 'true'
     - name: Set up Python
@@ -160,8 +159,7 @@ jobs:
         cd skia
         python tools\git-sync-deps
         bin\gn gen out\Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false skia_use_system_expat=false skia_use_system_zlib=false extra_cflags_cc=[\"/GR\", \"/EHsc\", \"/MD\"] target_cpu=\"${{ matrix.arch }}\"'
-        ninja -C out\Release skia skia.h
-        rm out\Release\obj -r -fo
+        ninja -C out\Release skia skia.h experimental_svg_model
         cd ..
       if: steps.cache.outputs.cache-hit != 'true'
     - name: Set up Python

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,11 +45,11 @@ jobs:
     - name: Build Skia
       run: |
         cd skia
+        patch -p1 < ../patch/git-sync-deps.patch
         python tools/git-sync-deps
         cp -f ../gn/out/gn bin/gn  # Replace gn.
         bin/gn gen out/Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false extra_cflags_cc=["-frtti"] extra_ldflags=["-lrt"]'
-        ninja -C out/Release skia skia.h
-        rm -rf out/Release/obj
+        ninja -C out/Release skia skia.h experimental_svg_model
         cd ..
     - name: Set up Python
       run: echo "/opt/python/${{ matrix.python-version }}/bin" >> $GITHUB_PATH
@@ -85,8 +85,7 @@ jobs:
         cd skia
         python tools/git-sync-deps
         bin/gn gen out/Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false extra_cflags_cc=["-frtti", "-mmacosx-version-min=10.9"]'
-        ninja -C out/Release skia skia.h
-        rm -rf out/Release/obj
+        ninja -C out/Release skia skia.h experimental_svg_model
         cd ..
     - name: Set up Python
       uses: actions/setup-python@v1
@@ -127,8 +126,7 @@ jobs:
         cd skia
         python tools\git-sync-deps
         bin\gn gen out\Release --args='is_official_build=true skia_enable_tools=true skia_use_system_libjpeg_turbo=false skia_use_system_libwebp=false skia_use_system_libpng=false skia_use_system_icu=false skia_use_system_harfbuzz=false skia_use_system_expat=false skia_use_system_zlib=false extra_cflags_cc=[\"/GR\", \"/EHsc\", \"/MD\"] target_cpu=\"${{ matrix.arch }}\"'
-        ninja -C out\Release skia skia.h
-        rm out\Release\obj -r -fo
+        ninja -C out\Release skia skia.h experimental_svg_model
         cd ..
     - name: Set up Python
       uses: actions/setup-python@v1

diff --git a/patch/git-sync-deps.patch b/patch/git-sync-deps.patch
@@ -0,0 +1,17 @@
+diff --git a/tools/git-sync-deps b/tools/git-sync-deps
+index ca1ba47a75..92ff8ef7bc 100755
+--- a/tools/git-sync-deps
++++ b/tools/git-sync-deps
+@@ -235,9 +235,9 @@ def git_sync_deps(deps_file_path, command_line_os_requests, verbose):
+
+
+ def multithread(function, list_of_arg_lists):
+-  # for args in list_of_arg_lists:
+-  #   function(*args)
+-  # return
++  for args in list_of_arg_lists:
++    function(*args)
++  return
+   threads = []
+   for args in list_of_arg_lists:
+     thread = threading.Thread(None, function, None, args)
diff --git a/setup.cfg b/setup.cfg
@@ -2,7 +2,7 @@
 testpaths = tests
 
 [tox:tox]
-envlist = py35,py36,py37,py38
+envlist = py36,py37,py38,py39
 
 [testenv]
 changedir = tests

diff --git a/setup.py b/setup.py
@@ -12,11 +12,12 @@
     pass
 
 NAME = 'skia-python'
-__version__ = '87.0'
+__version__ = '87.1'
 
 SKIA_PATH = os.getenv('SKIA_PATH', 'skia')
 SKIA_OUT_PATH = os.getenv(
-    'SKIA_OUT_PATH', os.path.join(SKIA_PATH, 'out', 'Release'))
+    'SKIA_OUT_PATH', os.path.join(SKIA_PATH, 'out', 'Release')
+)
 
 if sys.platform == 'win32':
     DEFINE_MACROS = []  # doesn't work for cl.exe
@@ -29,7 +30,18 @@
         'OpenGL32',
         'Gdi32',
     ]
-    EXTRA_OBJECTS = [os.path.join(SKIA_OUT_PATH, 'skia.lib')]
+    EXTRA_OBJECTS = list(
+        glob.glob(
+            os.path.join(
+                SKIA_OUT_PATH,
+                'obj',
+                'experimental',
+                'svg',
+                'model',
+                '*.obj',
+            )
+        )
+    ) + [os.path.join(SKIA_OUT_PATH, 'skia.lib')]
     EXTRA_COMPILE_ARGS = [
         '/std:c++17',  # c++20 fails.
         '/DVERSION_INFO=%s' % __version__,
@@ -41,7 +53,7 @@
         '/wd4267',  # Conversion from 'size_t' to 'int', possible loss of data.
         '/wd4800',  # Forcing value to bool 'true' or 'false'.
         '/wd4180',  # Qualifier applied to function type has no meaning.
-        '/MD',      # Bugfix: https://bugs.python.org/issue38597
+        '/MD',  # Bugfix: https://bugs.python.org/issue38597
     ]
     EXTRA_LINK_ARGS = [
         '/OPT:ICF',
@@ -55,7 +67,18 @@
     LIBRARIES = [
         'dl',
     ]
-    EXTRA_OBJECTS = [os.path.join(SKIA_OUT_PATH, 'libskia.a')]
+    EXTRA_OBJECTS = list(
+        glob.glob(
+            os.path.join(
+                SKIA_OUT_PATH,
+                'obj',
+                'experimental',
+                'svg',
+                'model',
+                '*.o',
+            )
+        )
+    ) + [os.path.join(SKIA_OUT_PATH, 'libskia.a')]
     EXTRA_COMPILE_ARGS = [
         '-std=c++14',
         '-stdlib=libc++',
@@ -66,9 +89,12 @@
         '-stdlib=libc++',
         '-mmacosx-version-min=10.9',
         '-dead_strip',
-        '-framework', 'AppKit',
-        '-framework', 'ApplicationServices',
-        '-framework', 'OpenGL',
+        '-framework',
+        'AppKit',
+        '-framework',
+        'ApplicationServices',
+        '-framework',
+        'OpenGL',
     ]
 else:
     DEFINE_MACROS = [
@@ -81,7 +107,18 @@
         'freetype',
         'GL',
     ]
-    EXTRA_OBJECTS = [os.path.join(SKIA_OUT_PATH, 'libskia.a')]
+    EXTRA_OBJECTS = list(
+        glob.glob(
+            os.path.join(
+                SKIA_OUT_PATH,
+                'obj',
+                'experimental',
+                'svg',
+                'model',
+                '*.o',
+            )
+        )
+    ) + [os.path.join(SKIA_OUT_PATH, 'libskia.a')]
     EXTRA_COMPILE_ARGS = [
         '-std=c++14',
         '-fvisibility=hidden',
@@ -102,7 +139,6 @@ class get_pybind_include(object):
     The purpose of this class is to postpone importing pybind11
     until it is actually installed, so that the ``get_include()``
     method can be invoked. """
-
     def __init__(self, user=False):
         self.user = user
 
@@ -141,7 +177,6 @@ def build_extensions(self):
     language='c++',
 )
 
-
 setup(
     name=NAME,
     version=__version__,

diff --git a/skia b/skia
diff --git a/src/skia/SVGDOM.cpp b/src/skia/SVGDOM.cpp
@@ -0,0 +1,17 @@
+#include "common.h"
+#include "experimental/svg/model/SkSVGDOM.h"
+#include "experimental/svg/model/SkSVGNode.h"
+
+void initSVGDOM(py::module &m) {
+py::class_<SkSVGDOM, sk_sp<SkSVGDOM>, SkRefCnt> SVGDOM(m, "SVGDOM");
+
+SVGDOM.def(py::init<>())
+    // .def_static("MakeFromDOM", &SkSVGDOM::MakeFromDOM, py::arg("dom"))
+    .def_static("MakeFromStream", &SkSVGDOM::MakeFromStream, py::arg("stream"))
+    .def("containerSize", &SkSVGDOM::containerSize)
+    .def("setContainerSize", &SkSVGDOM::setContainerSize)
+    // .def("setRoot", &SkSVGDOM::setRoot)
+    // .def("findNodeById", &SkSVGDOM::findNodeById)
+    .def("render", &SkSVGDOM::render)
+    ;
+}
diff --git a/src/skia/main.cpp b/src/skia/main.cpp
@@ -31,6 +31,7 @@ void initString(py::module &);
 void initSurface(py::module &);
 void initTextBlob(py::module &);
 void initVertices(py::module &);
+void initSVGDOM(py::module &);
 
 // Main entry point.
 PYBIND11_MODULE(skia, m) {
@@ -68,6 +69,7 @@ PYBIND11_MODULE(skia, m) {
 
     initCanvas(m);
     initSurface(m);
+    initSVGDOM(m);
 
 #ifdef VERSION_INFO
     m.attr("__version__") = XSTRING(VERSION_INFO);

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,6 @@
 import contextlib
 import skia
+import os
 import pytest
 import sys
 import logging
@@ -79,11 +80,14 @@ def canvas(surface):
 
 
 @pytest.fixture(scope='session')
-def png_path():
-    import os
+def resource_path():
     root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    return os.path.join(
-        root_dir, 'skia', 'resources', 'images', 'color_wheel.png')
+    return os.path.join(root_dir, 'skia', 'resources')
+
+
+@pytest.fixture(scope='session')
+def png_path(resource_path):
+    return os.path.join(resource_path, 'images', 'color_wheel.png')
 
 
 @pytest.fixture(scope='session')
@@ -123,8 +127,5 @@ def vertices():
 
 
 @pytest.fixture(scope='session')
-def ttf_path():
-    import os
-    root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    return os.path.join(
-        root_dir, 'skia', 'resources', 'fonts', 'Distortable.ttf')
+def ttf_path(resource_path):
+    return os.path.join(resource_path, 'fonts', 'Distortable.ttf')
diff --git a/tests/test_svgdom.py b/tests/test_svgdom.py
@@ -0,0 +1,26 @@
+import os
+import pytest
+import skia
+
+
+@pytest.fixture
+def svgdom(resource_path):
+    stream = skia.FILEStream(os.path.join(resource_path, 'Cowboy.svg'))
+    return skia.SVGDOM.MakeFromStream(stream)
+
+
+def test_SVGDOM_MakeFromStream(resource_path):
+    stream = skia.FILEStream(os.path.join(resource_path, 'Cowboy.svg'))
+    assert isinstance(skia.SVGDOM.MakeFromStream(stream), skia.SVGDOM)
+
+
+def test_SVGDOM_containerSize(svgdom):
+    assert isinstance(svgdom.containerSize(), skia.Size)
+
+
+def test_SVGDOM_setContainerSize(svgdom):
+    svgdom.setContainerSize((100, 100))
+
+
+def test_SVGDOM_render(svgdom, canvas):
+    svgdom.render(canvas)