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 728866 - pt 2 - implement canonical composition callbacks for harfbuzz. r=smontagu

Browse Source
This commit is contained in:
Jonathan Kew 2012-02-20 20:39:59 +00:00
parent 87b77ed3d6
commit c1d5f83c82
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gfx/thebes/gfxHarfBuzzShaper.cpp
View File

@ -50,13 +50,13 @@
#include "gfxHarfBuzzShaper.h"
#include "gfxFontUtils.h"
#include "gfxUnicodeProperties.h"
#include "nsUnicodeNormalizer.h"
#include "harfbuzz/hb-unicode.h"
#include "harfbuzz/hb-ot.h"
#include "cairo.h"
#include "nsUnicodeRange.h"
#include "nsCRT.h"
#if defined(XP_WIN)
@ -700,6 +700,26 @@ HBGetEastAsianWidth(hb_unicode_funcs_t *ufuncs, hb_codepoint_t aCh, void *user_d
return gfxUnicodeProperties::GetEastAsianWidth(aCh);
}
static hb_bool_t
HBUnicodeCompose(hb_unicode_funcs_t *ufuncs,
hb_codepoint_t a,
hb_codepoint_t b,
hb_codepoint_t *ab,
void *user_data)
{
return nsUnicodeNormalizer::Compose(a, b, ab);
}
static hb_bool_t
HBUnicodeDecompose(hb_unicode_funcs_t *ufuncs,
hb_codepoint_t ab,
hb_codepoint_t *a,
hb_codepoint_t *b,
void *user_data)
{
return nsUnicodeNormalizer::DecomposeNonRecursively(ab, a, b);
}
/*
* gfxFontShaper override to initialize the text run using HarfBuzz
*/
@ -753,6 +773,12 @@ gfxHarfBuzzShaper::ShapeWord(gfxContext *aContext,
hb_unicode_funcs_set_eastasian_width_func(sHBUnicodeFuncs,
HBGetEastAsianWidth,
nsnull, nsnull);
hb_unicode_funcs_set_compose_func(sHBUnicodeFuncs,
HBUnicodeCompose,
nsnull, nsnull);
hb_unicode_funcs_set_decompose_func(sHBUnicodeFuncs,
HBUnicodeDecompose,
nsnull, nsnull);
}
mHBFace = hb_face_create_for_tables(HBGetTable, this, nsnull);