diff options
| author |  Mike Reed <reed@google.com> | 2017-02-17 17:06:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-17 22:49:59 +0000 |
| commit | f67c45994dedc96eb979e331ab156649847071a4 (patch) | |
| tree | 2fe1634895566c3340e62aeaec74170ca36cd7c8 /src | |
| parent | e005edd3a5deb602beec59f59cdc8b14d3764d58 (diff) | |
add ViaSVG to dm
BUG=skia:
Change-Id: I52892a0dd466bee6e3abcaa89a373b93493d201f
Reviewed-on: https://skia-review.googlesource.com/8682
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/fonts/SkTestScalerContext.cpp | 2 | ||||
| -rw-r--r-- | src/svg/SkSVGDevice.cpp | 13 | ||||
| -rw-r--r-- | src/xml/SkDOM.cpp | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp index 5067dfee0d..2af8c88d2f 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/src/fonts/SkTestScalerContext.cpp @@ -188,7 +188,7 @@ void SkTestTypeface::onGetFamilyName(SkString* familyName) const { SkTypeface::LocalizedStrings* SkTestTypeface::onCreateFamilyNameIterator() const { SkString familyName(fTestFont->fName); SkString language("und"); //undetermined -SkASSERT(0); // incomplete +//SkASSERT(0); // incomplete return nullptr; // return new SkOTUtils::LocalizedStrings_SingleName(familyName, language); } diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index 261ad22d6d..360bb07d44 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -563,14 +563,15 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) { sk_sp<SkTypeface::LocalizedStrings> familyNameIter(tface->createFamilyNameIterator()); SkTypeface::LocalizedString familyString; - while (familyNameIter->next(&familyString)) { - if (familySet.contains(familyString.fString)) { - continue; + if (familyNameIter) { + while (familyNameIter->next(&familyString)) { + if (familySet.contains(familyString.fString)) { + continue; + } + familySet.add(familyString.fString); + familyName.appendf((familyName.isEmpty() ? "%s" : ", %s"), familyString.fString.c_str()); } - familySet.add(familyString.fString); - familyName.appendf((familyName.isEmpty() ? "%s" : ", %s"), familyString.fString.c_str()); } - if (!familyName.isEmpty()) { this->addAttribute("font-family", familyName); } diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp index 37b230b949..2e37dd7807 100644 --- a/src/xml/SkDOM.cpp +++ b/src/xml/SkDOM.cpp @@ -64,7 +64,7 @@ struct SkDOMNode { ///////////////////////////////////////////////////////////////////////// -#define kMinChunkSize 512 +#define kMinChunkSize 4096 SkDOM::SkDOM() : fAlloc(kMinChunkSize), fRoot(nullptr) {} |