wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 780409 - updates to thebes harfbuzz integration for hb api changes. r=jdaggett

Browse Source
This commit is contained in:
Jonathan Kew 2012-08-06 11:42:20 +01:00
parent 7ce84e4f41
commit 9cd6a760f2
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/harfbuzz/README-mozilla Normal file
View File

@ -0,0 +1,23 @@
gfx/harfbuzz status as of 2012-08-06:
This directory contains the "harfbuzz-ng" source from the 'master' branch of
git://anongit.freedesktop.org/git/harfbuzz.
UPDATING:
Note that hb-ot-shape-complex-indic-machine.hh and gfx/harfbuzz/src/hb-version.h
are not present in the upstream Git repository. These are created at build time
by the harfbuzz build system; but as we don't use that build system in mozilla,
it is necessary to refresh these files when updating harfbuzz, and check them in
to the mozilla tree. (This avoids adding the ragel processor to mozilla's build
prerequisites.)
The normal approach to updating harfbuzz, therefore, is to pull the latest HB
source into a scratch directory and do a local build; then copy the original
sources AND the generated headers mentioned above from the build directory into
the mozilla tree.
In addition, the src/Makefile.in file here is NOT from upstream, nor is it
generated from src/Makefile.am (the original harfbuzz version); it is a mozilla-
specific makefile that is maintained by hand. It should only need updating when
new source files or exported headers are added in harfbuzz.

2
gfx/thebes/gfxFont.h
View File

@ -46,7 +46,7 @@ class gfxShapedWord;
class nsILanguageAtomService;
typedef struct _hb_blob_t hb_blob_t;
typedef struct hb_blob_t hb_blob_t;
#define FONT_MAX_SIZE 2000.0

19
gfx/thebes/gfxHarfBuzzShaper.cpp
View File

@ -645,13 +645,15 @@ HBGetHKerning(hb_font_t *font, void *font_data,
*/
static hb_codepoint_t
HBGetMirroring(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
HBGetMirroring(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
void *user_data)
{
return GetMirroredChar(aCh);
}
static hb_unicode_general_category_t
HBGetGeneralCategory(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
HBGetGeneralCategory(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
void *user_data)
{
return hb_unicode_general_category_t(GetGeneralCategory(aCh));
}
@ -659,18 +661,19 @@ HBGetGeneralCategory(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_
static hb_script_t
HBGetScript(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
{
return hb_script_t(GetScriptTagForCode
(GetScriptCode(aCh)));
return hb_script_t(GetScriptTagForCode(GetScriptCode(aCh)));
}
static unsigned int
HBGetCombiningClass(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
static hb_unicode_combining_class_t
HBGetCombiningClass(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
void *user_data)
{
return GetCombiningClass(aCh);
return hb_unicode_combining_class_t(GetCombiningClass(aCh));
}
static unsigned int
HBGetEastAsianWidth(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_data)
HBGetEastAsianWidth(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh,
void *user_data)
{
return GetEastAsianWidth(aCh);
}