Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit c66cd98

Browse files
committed
Reland "Revert "custom typeface""
This reverts commit 61642b3. Reason for revert: ../../src/utils/SkCustomTypeface.cpp(179,20): error: cannot decompose this type; 'std::tuple_size<const SkPoint>::value' is not a valid integral constant expression Original change's description: > Revert "Revert "custom typeface"" > > Fix: implement onComputeBounds() and generateFontMetrics() > > This reverts commit 0066ade. > > Change-Id: Idb59336a3d201bb97e494ee0e0bb189e0a7186f1 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/288536 > Commit-Queue: Mike Reed <[email protected]> > Reviewed-by: Ben Wagner <[email protected]> [email protected],[email protected] # Not skipping CQ checks because this is a reland. Change-Id: I6845bb96a00a0c9ee54704a4c299556cc32e6438 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/288557 Reviewed-by: Brian Osman <[email protected]> Commit-Queue: Brian Osman <[email protected]>
1 parent 1fc1bd3 commit c66cd98

File tree

7 files changed

+0
-518
lines changed

7 files changed

+0
-518
lines changed

gm/userfont.cpp

Lines changed: 0 additions & 89 deletions
This file was deleted.

gn/gm.gni

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@ gm_sources = [
378378
"$_gm/trickycubicstrokes.cpp",
379379
"$_gm/typeface.cpp",
380380
"$_gm/unpremul.cpp",
381-
"$_gm/userfont.cpp",
382381
"$_gm/variedtext.cpp",
383382
"$_gm/verifiers/gmverifier.cpp",
384383
"$_gm/vertices.cpp",

gn/utils.gni

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ skia_utils_public = [
1212
"$_include/utils/SkBase64.h",
1313
"$_include/utils/SkCamera.h",
1414
"$_include/utils/SkCanvasStateUtils.h",
15-
"$_include/utils/SkCustomTypeface.h",
1615
"$_include/utils/SkEventTracer.h",
1716
"$_include/utils/SkInterpolator.h",
1817
"$_include/utils/SkNWayCanvas.h",
@@ -41,7 +40,6 @@ skia_utils_sources = [
4140
"$_src/utils/SkCharToGlyphCache.h",
4241
"$_src/utils/SkClipStackUtils.cpp",
4342
"$_src/utils/SkClipStackUtils.h",
44-
"$_src/utils/SkCustomTypeface.cpp",
4543
"$_src/utils/SkDashPath.cpp",
4644
"$_src/utils/SkDashPathPriv.h",
4745
"$_src/utils/SkEventTracer.cpp",

include/utils/SkCustomTypeface.h

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/core/SkGlyph.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ class SkGlyph {
296296
friend class SkStrikeServer;
297297
friend class SkTestScalerContext;
298298
friend class SkTestSVGScalerContext;
299-
friend class SkUserScalerContext;
300299
friend class TestSVGTypeface;
301300
friend class TestTypeface;
302301

src/core/SkTypeface.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "include/core/SkTypeface.h"
1212
#include "include/private/SkMutex.h"
1313
#include "include/private/SkOnce.h"
14-
#include "include/utils/SkCustomTypeface.h"
1514
#include "src/core/SkAdvancedTypefaceMetrics.h"
1615
#include "src/core/SkEndian.h"
1716
#include "src/core/SkFontDescriptor.h"
@@ -162,12 +161,6 @@ sk_sp<SkTypeface> SkTypeface::MakeFromData(sk_sp<SkData> data, int index) {
162161
}
163162

164163
sk_sp<SkTypeface> SkTypeface::MakeFromFontData(std::unique_ptr<SkFontData> data) {
165-
if (data->hasStream()) {
166-
if (auto tf = SkCustomTypefaceBuilder::Deserialize(data->getStream())) {
167-
return tf;
168-
}
169-
}
170-
171164
return SkFontMgr::RefDefault()->makeFromFontData(std::move(data));
172165
}
173166

0 commit comments

Comments
 (0)