Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(862)

Unified Diff: src/ports/SkFontHost_FreeType.cpp

Issue 1027373002: Font variations. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Slightly more palatable. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/ports/SkFontHost_FreeType.cpp
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 5a4b75579bf4ef7b5b3d0264d39a9d1901c02be5..f982b5faa1de946daf5ba60c8f6f394a36b4d2a8 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -11,6 +11,7 @@
#include "SkColorPriv.h"
#include "SkDescriptor.h"
#include "SkFDot6.h"
+#include "SkFontDescriptor.h"
#include "SkFontHost_FreeType_common.h"
#include "SkGlyph.h"
#include "SkMask.h"
@@ -33,6 +34,7 @@
#include FT_FREETYPE_H
#include FT_LCD_FILTER_H
#include FT_MODULE_H
+#include FT_MULTIPLE_MASTERS_H
#include FT_OUTLINE_H
#include FT_SIZES_H
#include FT_SYSTEM_H
@@ -273,6 +275,36 @@ SkFaceRec::SkFaceRec(SkStreamAsset* stream, uint32_t fontID)
fFTStream.close = sk_ft_stream_close;
}
+static void ft_face_setup_axes(FT_Face face, const SkFontData& data) {
+ if (!(face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) {
+ return;
+ }
+ SkDEBUGF(("INFO: font is mm!\n"));
+
+ FT_MM_Var* variations = NULL;
+ FT_Error err = FT_Get_MM_Var(face, &variations);
+ if (err) {
+ SkDEBUGF(("INFO: font is mm, but has no variations!\n"));
+ return;
+ }
+ SkAutoFree autoFreeVariations(variations);
+
+ if (static_cast<FT_UInt>(data.getAxisCount()) != variations->num_axis) {
+ SkDEBUGF(("INFO: font is mm, but has different number of variations!\n"));
+ return;
+ }
+
+ SkAutoSTMalloc<16, FT_Fixed> coords(variations->num_axis);
+ for (FT_UInt i = 0; i < variations->num_axis; ++i) {
+ coords[i] = data.getAxis()[i];
+ }
+ err = FT_Set_Var_Design_Coordinates(face, variations->num_axis, coords.get());
+ if (err) {
+ SkDEBUGF(("INFO: font is mm, but has no variations!\n"));
+ return;
+ }
+}
+
// Will return 0 on failure
// Caller must lock gFTMutex before calling this function.
static SkFaceRec* ref_ft_face(const SkTypeface* typeface) {
@@ -289,34 +321,36 @@ static SkFaceRec* ref_ft_face(const SkTypeface* typeface) {
rec = rec->fNext;
}
- int face_index;
- SkStreamAsset* stream = typeface->openStream(&face_index);
- if (NULL == stream) {
+ SkFontData* data = typeface->createFontData();
+ if (NULL == data || !data->hasStream()) {
return NULL;
}
// this passes ownership of stream to the rec
- rec = SkNEW_ARGS(SkFaceRec, (stream, fontID));
+ rec = SkNEW_ARGS(SkFaceRec, (data->transferStream(), fontID));
FT_Open_Args args;
memset(&args, 0, sizeof(args));
- const void* memoryBase = stream->getMemoryBase();
+ const void* memoryBase = rec->fSkStream->getMemoryBase();
if (memoryBase) {
args.flags = FT_OPEN_MEMORY;
args.memory_base = (const FT_Byte*)memoryBase;
- args.memory_size = stream->getLength();
+ args.memory_size = rec->fSkStream->getLength();
} else {
args.flags = FT_OPEN_STREAM;
args.stream = &rec->fFTStream;
}
- FT_Error err = FT_Open_Face(gFTLibrary->library(), &args, face_index, &rec->fFace);
+ FT_Error err = FT_Open_Face(gFTLibrary->library(), &args, data->getIndex(), &rec->fFace);
if (err) { // bad filename, try the default font
SkDEBUGF(("ERROR: unable to open font '%x'\n", fontID));
SkDELETE(rec);
return NULL;
}
SkASSERT(rec->fFace);
+
+ ft_face_setup_axes(rec->fFace, *data);
+
rec->fNext = gFaceRecHead;
gFaceRecHead = rec;
return rec;

Powered by Google App Engine
This is Rietveld 408576698