[Fontations] Remove FreeType dependency from local font indexing
Local font indexing has moved to Fontations since M129. Now that this ran for one stable release cycle, remove the previous FreeType implementation and the respective flag. Bug: chromium:349952802 Change-Id: Id4ba883204e24bb5142bc1112e41d32c5d366815 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5952467 Commit-Queue: Dominik Röttsches <drott@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Cr-Commit-Position: refs/heads/main@{#1372803}
This commit is contained in:
Dominik Röttsches
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
f81d35fca3
commit
96ea8fee51
content
@ -3254,7 +3254,6 @@ source_set("browser") {
|
||||
deps += [
|
||||
":fontations_name_table_ffi",
|
||||
":reflection_jni_headers",
|
||||
"//build/config/freetype",
|
||||
"//cc/slim",
|
||||
"//components/tracing:graphics_provider",
|
||||
"//content/public/android:browser_jni",
|
||||
|
||||
@ -33,14 +33,6 @@
|
||||
#include "third_party/icu/source/common/unicode/unistr.h"
|
||||
#include "third_party/rust/cxx/v1/cxx.h"
|
||||
|
||||
// clang-format off
|
||||
#include <ft2build.h>
|
||||
#include FT_SYSTEM_H
|
||||
#include FT_TRUETYPE_TABLES_H
|
||||
#include FT_SFNT_NAMES_H
|
||||
#include FT_TRUETYPE_IDS_H
|
||||
// clang-format on
|
||||
|
||||
static_assert(BUILDFLAG(IS_ANDROID), "This implementation only works safely "
|
||||
"on Android due to the way it assumes font files to be "
|
||||
"read-only and unmodifiable.");
|
||||
@ -59,159 +51,10 @@ const char kProtobufFilename[] = "font_unique_name_table.pb";
|
||||
static const char* const kAndroidFontPaths[] = {
|
||||
"/system/fonts", "/vendor/fonts", "/product/fonts"};
|
||||
|
||||
bool IsRelevantNameRecord(const FT_SfntName& sfnt_name) {
|
||||
if (sfnt_name.name_id != TT_NAME_ID_FULL_NAME &&
|
||||
sfnt_name.name_id != TT_NAME_ID_PS_NAME)
|
||||
return false;
|
||||
|
||||
// From the CSS Fonts spec chapter 4.3. Font reference: the src descriptor
|
||||
// "For OpenType fonts with multiple localizations of the full font name,
|
||||
// the US English version is used (language ID = 0x409 for Windows and
|
||||
// language ID = 0 for Macintosh) or the first localization when a US
|
||||
// English full font name is not available (the OpenType specification
|
||||
// recommends that all fonts minimally include US English names)."
|
||||
// Since we can assume Android system fonts contain an English name,
|
||||
// continue here.
|
||||
if (sfnt_name.platform_id == TT_PLATFORM_MICROSOFT)
|
||||
return sfnt_name.language_id == TT_MS_LANGID_ENGLISH_UNITED_STATES;
|
||||
|
||||
if (sfnt_name.platform_id == TT_PLATFORM_MACINTOSH)
|
||||
return sfnt_name.language_id == TT_MAC_LANGID_ENGLISH;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// Scoped wrapper for a FreeType library object in order to ensure
|
||||
// initialization and tear down. Used during scanning font files.
|
||||
class ScopedFtLibrary {
|
||||
public:
|
||||
ScopedFtLibrary() { FT_Init_FreeType(&ft_library_); }
|
||||
|
||||
~ScopedFtLibrary() { FT_Done_FreeType(ft_library_); }
|
||||
|
||||
FT_Library get() { return ft_library_; }
|
||||
|
||||
private:
|
||||
FT_Library ft_library_;
|
||||
};
|
||||
|
||||
// Convenience scoped wrapper for FT_Face instances. Takes care of handling
|
||||
// FreeType memory by calling FT_Done_Face on destruction.
|
||||
class ScopedFtFace {
|
||||
public:
|
||||
// Create a new FT_Face instance that will be wrapped by this object.
|
||||
// Call IsValid() after construction to check for errors.
|
||||
// |library| is the parent FT_Library instance, |font_path| the input font
|
||||
// file path, and |ttc_index| the font file index (for TrueType collections).
|
||||
ScopedFtFace(FT_Library library,
|
||||
base::cstring_view font_path,
|
||||
int32_t ttc_index)
|
||||
: ft_face_(nullptr),
|
||||
ft_error_(
|
||||
FT_New_Face(library, font_path.c_str(), ttc_index, &ft_face_)) {}
|
||||
|
||||
// Destructor will destroy the FT_Face instance automatically.
|
||||
~ScopedFtFace() {
|
||||
if (IsValid()) {
|
||||
FT_Done_Face(ft_face_);
|
||||
}
|
||||
}
|
||||
|
||||
// Returns true iff instance is valid, i.e. construction did not fail.
|
||||
bool IsValid() const { return ft_error_ == FT_Err_Ok; }
|
||||
|
||||
// Return FreeType error code from construction.
|
||||
FT_Error error() const { return ft_error_; }
|
||||
|
||||
// Returns FT_Face value.
|
||||
FT_Face get() const { return ft_face_; }
|
||||
|
||||
private:
|
||||
FT_Face ft_face_ = nullptr;
|
||||
FT_Error ft_error_ = FT_Err_Ok;
|
||||
};
|
||||
|
||||
void IndexFileFreeType(FT_Library ft_library,
|
||||
blink::FontUniqueNameTable& font_table,
|
||||
base::cstring_view font_file_path,
|
||||
uint32_t ttc_index) {
|
||||
ScopedFtFace face(ft_library, font_file_path, ttc_index);
|
||||
|
||||
if (!face.IsValid() || !FT_Get_Sfnt_Name_Count(face.get()))
|
||||
return;
|
||||
|
||||
blink::FontUniqueNameTable_UniqueFont* added_unique_font =
|
||||
font_table.add_fonts();
|
||||
added_unique_font->set_file_path(std::string(font_file_path));
|
||||
added_unique_font->set_ttc_index(ttc_index);
|
||||
|
||||
int added_font_index = font_table.fonts_size() - 1;
|
||||
|
||||
for (size_t i = 0; i < FT_Get_Sfnt_Name_Count(face.get()); ++i) {
|
||||
FT_SfntName sfnt_name;
|
||||
if (FT_Get_Sfnt_Name(face.get(), i, &sfnt_name) != 0)
|
||||
return;
|
||||
|
||||
if (!IsRelevantNameRecord(sfnt_name))
|
||||
continue;
|
||||
|
||||
std::string sfnt_name_string;
|
||||
std::string codepage_name;
|
||||
// Codepage names from http://demo.icu-project.org/icu-bin/convexp
|
||||
if (sfnt_name.platform_id == TT_PLATFORM_MICROSOFT &&
|
||||
sfnt_name.encoding_id == TT_MS_ID_UNICODE_CS) {
|
||||
codepage_name = "UTF16-BE";
|
||||
} else if (sfnt_name.platform_id == TT_PLATFORM_MACINTOSH &&
|
||||
sfnt_name.encoding_id == TT_MAC_ID_ROMAN) {
|
||||
codepage_name = "macintosh";
|
||||
}
|
||||
icu::UnicodeString sfnt_name_unicode(
|
||||
reinterpret_cast<char*>(sfnt_name.string), sfnt_name.string_len,
|
||||
codepage_name.c_str());
|
||||
if (sfnt_name_unicode.isBogus())
|
||||
return;
|
||||
|
||||
// Firefox performs case insensitive matching for src: local().
|
||||
sfnt_name_unicode.foldCase();
|
||||
sfnt_name_unicode.toUTF8String(sfnt_name_string);
|
||||
|
||||
blink::FontUniqueNameTable_UniqueNameToFontMapping* name_mapping =
|
||||
font_table.add_name_map();
|
||||
name_mapping->set_font_name(blink::IcuFoldCase(sfnt_name_string));
|
||||
name_mapping->set_font_index(added_font_index);
|
||||
}
|
||||
}
|
||||
|
||||
int32_t NumberOfFacesInFontFileFreeType(FT_Library ft_library,
|
||||
base::cstring_view font_filename) {
|
||||
// According to FreeType documentation calling FT_Open_Face with a negative
|
||||
// index value allows us to probe how many fonts can be found in a font file
|
||||
// (which can be a single font ttf or a TrueType collection (.ttc)).
|
||||
ScopedFtFace probe_face(ft_library, font_filename, -1);
|
||||
if (!probe_face.IsValid())
|
||||
return 0;
|
||||
return probe_face.get()->num_faces;
|
||||
}
|
||||
|
||||
void IndexFilesFreeType(const base::span<base::FilePath> fonts_to_index,
|
||||
blink::FontUniqueNameTable& font_table) {
|
||||
ScopedFtLibrary ft_library;
|
||||
for (const auto& font_file_name : fonts_to_index) {
|
||||
int32_t number_of_faces = NumberOfFacesInFontFileFreeType(
|
||||
ft_library.get(), font_file_name.value());
|
||||
for (int32_t i = 0; i < number_of_faces; ++i) {
|
||||
TRACE_EVENT0("fonts",
|
||||
"FontUniqueNameLookup::UpdateTable - IndexFileFreeType");
|
||||
IndexFileFreeType(ft_library.get(), font_table, font_file_name.value(),
|
||||
i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void IndexFileFontations(blink::FontUniqueNameTable& font_table,
|
||||
std::string_view font_file_path,
|
||||
const rust::Slice<const uint8_t>& mapped_bytes,
|
||||
uint32_t ttc_index) {
|
||||
void IndexFile(blink::FontUniqueNameTable& font_table,
|
||||
std::string_view font_file_path,
|
||||
const rust::Slice<const uint8_t>& mapped_bytes,
|
||||
uint32_t ttc_index) {
|
||||
rust::Vec<rust::String> english_unique_font_names =
|
||||
name_table_access::english_unique_font_names(mapped_bytes, ttc_index);
|
||||
|
||||
@ -234,8 +77,8 @@ void IndexFileFontations(blink::FontUniqueNameTable& font_table,
|
||||
}
|
||||
}
|
||||
|
||||
void IndexFilesFontations(base::span<base::FilePath> fonts_to_index,
|
||||
blink::FontUniqueNameTable& font_table) {
|
||||
void IndexFiles(base::span<base::FilePath> fonts_to_index,
|
||||
blink::FontUniqueNameTable& font_table) {
|
||||
for (const auto& font_file_path : fonts_to_index) {
|
||||
base::MemoryMappedFile mapped_font_file;
|
||||
// Files from kAndroidFontPaths are read-only, protected files on Android,
|
||||
@ -251,10 +94,8 @@ void IndexFilesFontations(base::span<base::FilePath> fonts_to_index,
|
||||
int32_t number_of_faces =
|
||||
name_table_access::indexable_num_fonts(mapped_bytes);
|
||||
for (int32_t ttc_index = 0; ttc_index < number_of_faces; ++ttc_index) {
|
||||
TRACE_EVENT0("fonts",
|
||||
"FontUniqueNameLookup::UpdateTable - IndexFileFontations");
|
||||
IndexFileFontations(font_table, font_file_path.value(), mapped_bytes,
|
||||
ttc_index);
|
||||
TRACE_EVENT0("fonts", "FontUniqueNameLookup::UpdateTable - IndexFile");
|
||||
IndexFile(font_table, font_file_path.value(), mapped_bytes, ttc_index);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -338,11 +179,7 @@ bool FontUniqueNameLookup::UpdateTable() {
|
||||
font_table.set_stored_for_platform_version_identifier(
|
||||
GetAndroidBuildFingerprint());
|
||||
|
||||
if (base::FeatureList::IsEnabled(features::kFontIndexingFontations)) {
|
||||
IndexFilesFontations(font_files_to_index, font_table);
|
||||
} else {
|
||||
IndexFilesFreeType(font_files_to_index, font_table);
|
||||
}
|
||||
IndexFiles(font_files_to_index, font_table);
|
||||
|
||||
blink::FontTableMatcher::SortUniqueNameTableForSearch(&font_table);
|
||||
|
||||
|
||||
@ -260,16 +260,6 @@ BASE_FEATURE(kFontSrcLocalMatching,
|
||||
"FontSrcLocalMatching",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
// Controls whether building a database of unique font names is performed
|
||||
// using the Fontations library. If off, FreeType is used instead.
|
||||
// Used as a kill switch, expected to be removed after one stable cycle
|
||||
// of using Fontations. See https://crbug.com/349952802
|
||||
BASE_FEATURE(kFontIndexingFontations,
|
||||
"FontIndexingFontations",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
#endif
|
||||
|
||||
// Feature controlling whether or not memory pressure signals will be forwarded
|
||||
// to the GPU process.
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@ -67,9 +67,6 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(
|
||||
kFocusRenderWidgetHostViewAndroidOnActionDown);
|
||||
#endif
|
||||
CONTENT_EXPORT BASE_DECLARE_FEATURE(kFontSrcLocalMatching);
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
CONTENT_EXPORT BASE_DECLARE_FEATURE(kFontIndexingFontations);
|
||||
#endif
|
||||
#if !BUILDFLAG(IS_ANDROID)
|
||||
CONTENT_EXPORT BASE_DECLARE_FEATURE(kForwardMemoryPressureEventsToGpuProcess);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user