You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
2.1 KiB
35 lines
2.1 KiB
diff --git a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
|
|
index ba5391708..f5fad4148 100644
|
|
--- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
|
|
+++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
|
|
@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
|
|
hb_set_t* glyphs =
|
|
hb_subset_input_glyph_set(input.get()); // Owned by |input|.
|
|
usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
|
|
- hb_subset_input_set_retain_gids(input.get(), true);
|
|
+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
|
|
|
|
- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
|
|
+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
|
|
HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
|
|
if (!subset_blob)
|
|
return nullptr;
|
|
diff --git a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
|
|
index 81c37eef3..1581fb8a9 100644
|
|
--- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
|
|
+++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
|
|
@@ -71,11 +71,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
|
|
hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
|
|
glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
|
|
|
|
- hb_subset_input_set_retain_gids(input.get(), true);
|
|
// TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
|
|
// If it isn't known if a font is 'tricky', retain the hints.
|
|
- hb_subset_input_set_drop_hints(input.get(), false);
|
|
- HBFace subset(hb_subset(face.get(), input.get()));
|
|
+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS | HB_SUBSET_FLAGS_NO_HINTING);
|
|
+ HBFace subset(hb_subset_or_fail(face.get(), input.get()));
|
|
HBBlob result(hb_face_reference_blob(subset.get()));
|
|
return to_data(std::move(result));
|
|
}
|