commit | 217056c04885914101c403cb7e4bc09d7902d5bc | [log] [tgz] |
---|---|---|
author | Kevin Lubick <kjlubick@google.com> | Thu Sep 20 17:39:31 2018 -0400 |
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Fri Sep 21 12:03:55 2018 +0000 |
tree | fc848259c217d38affdc5024019b37fd9379c238 | |
parent | 38ca6d509d9f7b0db55ae747c28ca373d6143250 [diff] [blame] |
[CanvasKit] Implement some basic Canvas/Surface things. drawText is having issues in a release build. Skottie sometimes asserts in debug mode. This possibly has something to do with memory alignment - like https://skia-review.googlesource.com/c/skia/+/155980 helped fix. Patchset 9 shows off integrating Skia drawing to an HTML canvas using Ganesh. To see it locally, set up https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html and then set $EMSDK to be that directory. Then run make clean make local-example and navigate to http://localhost:8000/skia-wasm/example.html Patchset 20 shows off Skottie animating directly to a Canvas. Docs-Preview: https://skia.org/?cl=153882 Bug: skia: Change-Id: I2ad2f4ffac00925ee901982ccbaeb7aa63b1ea23 Reviewed-on: https://skia-review.googlesource.com/153882 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/BUILD.gn b/BUILD.gn index 67195fc..fe37aed 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -399,7 +399,8 @@ } optional("fontmgr_custom") { - enabled = is_linux && skia_use_freetype && !skia_use_fontconfig + enabled = (is_linux || target_cpu == "wasm") && skia_use_freetype && + !skia_use_fontconfig deps = [ ":typeface_freetype", @@ -929,7 +930,7 @@ ] } - if (is_linux) { + if (is_linux || target_cpu == "wasm") { sources += [ "src/ports/SkDebug_stdio.cpp" ] if (skia_use_egl) { libs += [ "GLESv2" ]