diff options
| author | Kevin Lubick <kjlubick@google.com> | 2018-10-02 09:02:18 -0400 |
|---|---|---|
| committer | Kevin Lubick <kjlubick@google.com> | 2018-10-02 13:27:29 +0000 |
| commit | cbcff385c1742a57e99bf1e03687dfe2d3e4d52f (patch) | |
| tree | 7b9efb257ad55350d6738ebcab85e824b4b958ea /src/effects | |
| parent | 15f0f29d7f1228a516f2f6ee05b714def0227bd1 (diff) | |
| download | skqp-cbcff385c1742a57e99bf1e03687dfe2d3e4d52f.tar.gz | |
Have pathkit use libpathkit.a for faster builds
Of note, it is very important for the -DSK_RELEASE/-DSK_DEBUG
to match between libskia.a and the WASM bindings, otherwise
things like SKDEBUGCODE are sometimes compiled in and sometimes
not, which can cause headaches like sizeof() mismatching between
.cpp files and .h files.
Bug: skia:
Change-Id: Id6ef58c44a7c10014a243b36708e0891514f6008
Reviewed-on: https://skia-review.googlesource.com/158341
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkDashPathEffect.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkTrimPathEffect.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index 8c4abdd2e5..7f45037ac5 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -374,7 +374,7 @@ void SkDashImpl::flatten(SkWriteBuffer& buffer) const { } sk_sp<SkFlattenable> SkDashImpl::CreateProc(SkReadBuffer& buffer) { -#ifdef WEB_ASSEMBLY +#ifdef SK_DISABLE_READBUFFER // Should not be reachable by PathKit WebAssembly Code. SkASSERT(false); return nullptr; diff --git a/src/effects/SkTrimPathEffect.cpp b/src/effects/SkTrimPathEffect.cpp index 3ca70b506c..621055dcab 100644 --- a/src/effects/SkTrimPathEffect.cpp +++ b/src/effects/SkTrimPathEffect.cpp @@ -89,8 +89,8 @@ void SkTrimPE::flatten(SkWriteBuffer& buffer) const { } sk_sp<SkFlattenable> SkTrimPE::CreateProc(SkReadBuffer& buffer) { -#ifdef WEB_ASSEMBLY - // Should not be reachable by WebAssembly Code. +#ifdef SK_DISABLE_READBUFFER + // Should not be reachable by PathKit WebAssembly Code. SkASSERT(false); return nullptr; #else |