diff options
| author | bashi@chromium.org <bashi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 01:06:56 +0000 |
|---|---|---|
| committer | bashi@chromium.org <bashi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 01:06:56 +0000 |
| commit | d6b94838c9c7cfe13933e819bebb99b08f13d08b (patch) | |
| tree | 3331a6d31e40f40db8dcfd66d51e8a38168d1024 /third_party/harfbuzz/src/harfbuzz-gdef.h | |
| parent | e3791ce9ce5f0682b59593839cabd3a56b327249 (diff) | |
| download | chromium_src-d6b94838c9c7cfe13933e819bebb99b08f13d08b.zip chromium_src-d6b94838c9c7cfe13933e819bebb99b08f13d08b.tar.gz chromium_src-d6b94838c9c7cfe13933e819bebb99b08f13d08b.tar.bz2 | |
Update (old) harfbuzz to ToT
This CL is made by:
- Got harfbuzz ToT (revision d10a264823e81631336bab37f08a52cc243d3654)
- Applied third_party/harfbuzz/chromium.patch to harfbuzz ToT.
- Applied the change made by http://codereview.chromium.org/543067/
(chromium.patch doesn't include this change)
- Copied revised files to third_party/harfbuzz
- Updated README.chromium and chromium.patch
BUG=91789
TEST=ran WebKit layout tests.
Review URL: http://codereview.chromium.org/7595001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/harfbuzz/src/harfbuzz-gdef.h')
| -rw-r--r-- | third_party/harfbuzz/src/harfbuzz-gdef.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/third_party/harfbuzz/src/harfbuzz-gdef.h b/third_party/harfbuzz/src/harfbuzz-gdef.h index b6dcadc..f9a03dd 100644 --- a/third_party/harfbuzz/src/harfbuzz-gdef.h +++ b/third_party/harfbuzz/src/harfbuzz-gdef.h @@ -31,6 +31,10 @@ HB_BEGIN_HEADER +#ifdef HB_USE_PACKED_STRUCTS +#pragma pack(push, 1) +#endif + /* GDEF glyph properties. Note that HB_GDEF_COMPONENT has no corresponding * flag in the LookupFlag field. */ #define HB_GDEF_BASE_GLYPH 0x0002 @@ -44,12 +48,11 @@ typedef struct HB_AttachPoint_ HB_AttachPoint; struct HB_AttachList_ { - HB_Bool loaded; - + HB_AttachPoint* AttachPoint; /* array of AttachPoint tables */ HB_Coverage Coverage; /* Coverage table */ HB_UShort GlyphCount; /* number of glyphs with attachments */ - HB_AttachPoint* AttachPoint; /* array of AttachPoint tables */ + HB_Bool loaded; }; typedef struct HB_AttachList_ HB_AttachList; @@ -58,11 +61,10 @@ typedef struct HB_LigGlyph_ HB_LigGlyph; struct HB_LigCaretList_ { - HB_Bool loaded; - + HB_LigGlyph* LigGlyph; /* array of LigGlyph tables */ HB_Coverage Coverage; /* Coverage table */ HB_UShort LigGlyphCount; /* number of ligature glyphs */ - HB_LigGlyph* LigGlyph; /* array of LigGlyph tables */ + HB_Bool loaded; }; typedef struct HB_LigCaretList_ HB_LigCaretList; @@ -91,18 +93,18 @@ typedef struct HB_LigCaretList_ HB_LigCaretList; struct HB_GDEFHeader_ { + HB_UShort** NewGlyphClasses; HB_UInt offset; + HB_UInt MarkAttachClassDef_offset; HB_16Dot16 Version; HB_ClassDefinition GlyphClassDef; HB_AttachList AttachList; HB_LigCaretList LigCaretList; - HB_UInt MarkAttachClassDef_offset; HB_ClassDefinition MarkAttachClassDef; /* new in OT 1.2 */ HB_UShort LastGlyph; - HB_UShort** NewGlyphClasses; }; typedef struct HB_GDEFHeader_ HB_GDEFHeader; @@ -129,6 +131,9 @@ HB_Error HB_GDEF_Build_ClassDefinition( HB_GDEFHeader* gdef, HB_UShort* glyph_array, HB_UShort* class_array ); +#ifdef HB_USE_PACKED_STRUCTS +#pragma pack(pop) +#endif HB_END_HEADER |