| Index: third_party/ots/src/layout.h
|
| diff --git a/third_party/ots/src/layout.h b/third_party/ots/src/layout.h
|
| index 3b94589e16d07606ab94f99ecdbb67e8d68f97b9..d195646d41904d3bb884aa67fe5ae019ef696a03 100644
|
| --- a/third_party/ots/src/layout.h
|
| +++ b/third_party/ots/src/layout.h
|
| @@ -16,57 +16,57 @@ namespace ots {
|
| struct LookupSubtableParser {
|
| struct TypeParser {
|
| uint16_t type;
|
| - bool (*parse)(const OpenTypeFile *file, const uint8_t *data,
|
| + bool (*parse)(const Font *font, const uint8_t *data,
|
| const size_t length);
|
| };
|
| size_t num_types;
|
| uint16_t extension_type;
|
| const TypeParser *parsers;
|
|
|
| - bool Parse(const OpenTypeFile *file, const uint8_t *data,
|
| + bool Parse(const Font *font, const uint8_t *data,
|
| const size_t length, const uint16_t lookup_type) const;
|
| };
|
|
|
| -bool ParseScriptListTable(const ots::OpenTypeFile *file,
|
| +bool ParseScriptListTable(const ots::Font *font,
|
| const uint8_t *data, const size_t length,
|
| const uint16_t num_features);
|
|
|
| -bool ParseFeatureListTable(const ots::OpenTypeFile *file,
|
| +bool ParseFeatureListTable(const ots::Font *font,
|
| const uint8_t *data, const size_t length,
|
| const uint16_t num_lookups,
|
| uint16_t *num_features);
|
|
|
| -bool ParseLookupListTable(OpenTypeFile *file, const uint8_t *data,
|
| +bool ParseLookupListTable(Font *font, const uint8_t *data,
|
| const size_t length,
|
| const LookupSubtableParser* parser,
|
| uint16_t* num_lookups);
|
|
|
| -bool ParseClassDefTable(const ots::OpenTypeFile *file,
|
| +bool ParseClassDefTable(const ots::Font *font,
|
| const uint8_t *data, size_t length,
|
| const uint16_t num_glyphs,
|
| const uint16_t num_classes);
|
|
|
| -bool ParseCoverageTable(const ots::OpenTypeFile *file,
|
| +bool ParseCoverageTable(const ots::Font *font,
|
| const uint8_t *data, size_t length,
|
| const uint16_t num_glyphs,
|
| const uint16_t expected_num_glyphs = 0);
|
|
|
| -bool ParseDeviceTable(const ots::OpenTypeFile *file,
|
| +bool ParseDeviceTable(const ots::Font *font,
|
| const uint8_t *data, size_t length);
|
|
|
| // Parser for 'Contextual' subtable shared by GSUB/GPOS tables.
|
| -bool ParseContextSubtable(const ots::OpenTypeFile *file,
|
| +bool ParseContextSubtable(const ots::Font *font,
|
| const uint8_t *data, const size_t length,
|
| const uint16_t num_glyphs,
|
| const uint16_t num_lookups);
|
|
|
| // Parser for 'Chaining Contextual' subtable shared by GSUB/GPOS tables.
|
| -bool ParseChainingContextSubtable(const ots::OpenTypeFile *file,
|
| +bool ParseChainingContextSubtable(const ots::Font *font,
|
| const uint8_t *data, const size_t length,
|
| const uint16_t num_glyphs,
|
| const uint16_t num_lookups);
|
|
|
| -bool ParseExtensionSubtable(const OpenTypeFile *file,
|
| +bool ParseExtensionSubtable(const Font *font,
|
| const uint8_t *data, const size_t length,
|
| const LookupSubtableParser* parser);
|
|
|
|
|