0066adefa9
This reverts commit 3a79f33eca
.
Reason for revert: MSAN issues
Uninitialized value was stored to memory at
#0 0x2cd74de in SkFontPriv::GetFontBounds(SkFont const&) /mnt/pd0/s/w/ir/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-MSAN/Release/../../../../../../skia/src/core/SkFont.cpp:400:34
#1 0x31115ad in SkTextBlobBuilder::ConservativeRunBounds(SkTextBlob::RunRecord const&) /mnt/pd0/s/w/ir/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-MSAN/Release/../../../../../../skia/src/core/SkTextBlob.cpp:307:31
#2 0x31104d2 in SkTextBlobBuilder::updateDeferredBounds() /mnt/pd0/s/w/ir/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-MSAN/Release/../../../../../../skia/src/core/SkTextBlob.cpp:374:47
#3 0x31104d2 in SkTextBlobBuilder::make() /mnt/pd0/s/w/ir/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-MSAN/Release/../../../../../../skia/src/core/SkTextBlob.cpp:605:11
#4 0x31175c1 in SkTextBlob::MakeFromText(void const*, unsigned long, SkFont const&, SkTextEncoding) /mnt/pd0/s/w/ir/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-MSAN/Release/../../../../../../skia/src/core/SkTextBlob.cpp:782:20
#5 0x1920415 in UserFontGM::onOnceBeforeDraw() /mnt/pd0/s/w/ir/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-MSAN/Release/../../../../../../skia/gm/userfont.cpp:65:17
Original change's description:
> custom typeface
>
> - only paths implemented at the moment
>
> Seems if we want to serialize/deserialize these, we will need to
> register a factory with skia, so it can sniff the beginning of the
> font "file", to know how to recreate it.
>
> Lots of follow-on things to explore:
> - do we need to even store/know advance widths?
> - should we also (optionally) support a CMAP? names? others?
>
> Change-Id: If9fa99b7b8f6e265f06eb3ba2ca4fcb073275250
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/287157
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=bungeman@google.com,fmalita@chromium.org,reed@google.com
Change-Id: Iee93db8d0f94d706f0b97566d2d15e2ad2407601
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/288463
Reviewed-by: Mike Reed <reed@google.com>
104 lines
3.3 KiB
Plaintext
104 lines
3.3 KiB
Plaintext
# Copyright 2016 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
# Things are easiest for everyone if these source paths are absolute.
|
|
_src = get_path_info("../src", "abspath")
|
|
_include = get_path_info("../include", "abspath")
|
|
|
|
skia_utils_public = [
|
|
"$_include/utils/SkAnimCodecPlayer.h",
|
|
"$_include/utils/SkBase64.h",
|
|
"$_include/utils/SkCamera.h",
|
|
"$_include/utils/SkCanvasStateUtils.h",
|
|
"$_include/utils/SkEventTracer.h",
|
|
"$_include/utils/SkInterpolator.h",
|
|
"$_include/utils/SkNWayCanvas.h",
|
|
"$_include/utils/SkNoDrawCanvas.h",
|
|
"$_include/utils/SkNullCanvas.h",
|
|
"$_include/utils/SkPaintFilterCanvas.h",
|
|
"$_include/utils/SkParse.h",
|
|
"$_include/utils/SkParsePath.h",
|
|
"$_include/utils/SkRandom.h",
|
|
"$_include/utils/SkShadowUtils.h",
|
|
|
|
#mac
|
|
"$_include/utils/mac/SkCGUtils.h",
|
|
]
|
|
|
|
skia_utils_sources = [
|
|
"$_src/utils/SkAnimCodecPlayer.cpp",
|
|
"$_src/utils/SkBase64.cpp",
|
|
"$_src/utils/SkBitSet.h",
|
|
"$_src/utils/SkCallableTraits.h",
|
|
"$_src/utils/SkCamera.cpp",
|
|
"$_src/utils/SkCanvasStack.cpp",
|
|
"$_src/utils/SkCanvasStack.h",
|
|
"$_src/utils/SkCanvasStateUtils.cpp",
|
|
"$_src/utils/SkCharToGlyphCache.cpp",
|
|
"$_src/utils/SkCharToGlyphCache.h",
|
|
"$_src/utils/SkClipStackUtils.cpp",
|
|
"$_src/utils/SkClipStackUtils.h",
|
|
"$_src/utils/SkDashPath.cpp",
|
|
"$_src/utils/SkDashPathPriv.h",
|
|
"$_src/utils/SkEventTracer.cpp",
|
|
"$_src/utils/SkFloatToDecimal.cpp",
|
|
"$_src/utils/SkFloatToDecimal.h",
|
|
"$_src/utils/SkFloatUtils.h",
|
|
"$_src/utils/SkInterpolator.cpp",
|
|
"$_src/utils/SkJSON.cpp",
|
|
"$_src/utils/SkJSON.h",
|
|
"$_src/utils/SkJSONWriter.cpp",
|
|
"$_src/utils/SkJSONWriter.h",
|
|
"$_src/utils/SkMatrix22.cpp",
|
|
"$_src/utils/SkMatrix22.h",
|
|
"$_src/utils/SkMultiPictureDocument.cpp",
|
|
"$_src/utils/SkNWayCanvas.cpp",
|
|
"$_src/utils/SkNullCanvas.cpp",
|
|
"$_src/utils/SkOSPath.cpp",
|
|
"$_src/utils/SkOSPath.h",
|
|
"$_src/utils/SkPaintFilterCanvas.cpp",
|
|
"$_src/utils/SkParse.cpp",
|
|
"$_src/utils/SkParseColor.cpp",
|
|
"$_src/utils/SkParsePath.cpp",
|
|
"$_src/utils/SkPatchUtils.cpp",
|
|
"$_src/utils/SkPatchUtils.h",
|
|
"$_src/utils/SkPolyUtils.cpp",
|
|
"$_src/utils/SkPolyUtils.h",
|
|
"$_src/utils/SkShadowTessellator.cpp",
|
|
"$_src/utils/SkShadowTessellator.h",
|
|
"$_src/utils/SkShadowUtils.cpp",
|
|
"$_src/utils/SkShaperJSONWriter.cpp",
|
|
"$_src/utils/SkShaperJSONWriter.h",
|
|
"$_src/utils/SkTextUtils.cpp",
|
|
"$_src/utils/SkThreadUtils_pthread.cpp",
|
|
"$_src/utils/SkThreadUtils_win.cpp",
|
|
"$_src/utils/SkUTF.cpp",
|
|
"$_src/utils/SkUTF.h",
|
|
"$_src/utils/SkWhitelistTypefaces.cpp",
|
|
|
|
#mac
|
|
"$_src/utils/mac/SkCreateCGImageRef.cpp",
|
|
"$_src/utils/mac/SkUniqueCFRef.h",
|
|
|
|
#windows
|
|
"$_src/utils/win/SkAutoCoInitialize.cpp",
|
|
"$_src/utils/win/SkAutoCoInitialize.h",
|
|
"$_src/utils/win/SkDWrite.cpp",
|
|
"$_src/utils/win/SkDWrite.h",
|
|
"$_src/utils/win/SkDWriteFontFileStream.cpp",
|
|
"$_src/utils/win/SkDWriteFontFileStream.h",
|
|
"$_src/utils/win/SkDWriteGeometrySink.cpp",
|
|
"$_src/utils/win/SkDWriteGeometrySink.h",
|
|
"$_src/utils/win/SkDWriteNTDDI_VERSION.h",
|
|
"$_src/utils/win/SkHRESULT.cpp",
|
|
"$_src/utils/win/SkHRESULT.h",
|
|
"$_src/utils/win/SkIStream.cpp",
|
|
"$_src/utils/win/SkIStream.h",
|
|
"$_src/utils/win/SkObjBase.h",
|
|
"$_src/utils/win/SkTScopedComPtr.h",
|
|
"$_src/utils/win/SkWGL.h",
|
|
"$_src/utils/win/SkWGL_win.cpp",
|
|
]
|