85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Jonathan Kew <jkew@mozilla.com>
|
||
|
|
# Date 1452675061 0
|
||
|
|
# Wed Jan 13 08:51:01 2016 +0000
|
||
|
|
# Node ID cf699e95e98829b465b64a7e0281d95ec851ce8c
|
||
|
|
# Parent 3c9f357598e86c2f593e9895d5725bf3498f8f5a
|
||
|
|
Bug 1228540 - pt 2 - Remove our HBGetGlyphHOrigin callback, as the default behavior is sufficient.
|
||
|
|
|
||
|
|
diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
|
||
|
|
--- a/gfx/thebes/gfxHarfBuzzShaper.cpp
|
||
|
|
+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
|
||
|
|
@@ -349,27 +349,16 @@ gfxHarfBuzzShaper::HBGetGlyphVAdvance(hb
|
||
|
|
static_cast<const gfxHarfBuzzShaper::FontCallbackData*>(font_data);
|
||
|
|
// Currently, we don't offer gfxFont subclasses a method to override this
|
||
|
|
// and provide hinted platform-specific vertical advances (analogous to the
|
||
|
|
// GetGlyphWidth method for horizontal advances). If that proves necessary,
|
||
|
|
// we'll add a new gfxFont method and call it from here.
|
||
|
|
return fcd->mShaper->GetGlyphVAdvance(glyph);
|
||
|
|
}
|
||
|
|
|
||
|
|
-/* static */
|
||
|
|
-hb_bool_t
|
||
|
|
-gfxHarfBuzzShaper::HBGetGlyphHOrigin(hb_font_t *font, void *font_data,
|
||
|
|
- hb_codepoint_t glyph,
|
||
|
|
- hb_position_t *x, hb_position_t *y,
|
||
|
|
- void *user_data)
|
||
|
|
-{
|
||
|
|
- // We work in horizontal coordinates, so no origin adjustment needed here.
|
||
|
|
- return true;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
struct VORG {
|
||
|
|
AutoSwap_PRUint16 majorVersion;
|
||
|
|
AutoSwap_PRUint16 minorVersion;
|
||
|
|
AutoSwap_PRInt16 defaultVertOriginY;
|
||
|
|
AutoSwap_PRUint16 numVertOriginYMetrics;
|
||
|
|
};
|
||
|
|
|
||
|
|
struct VORGrec {
|
||
|
|
@@ -1262,19 +1251,16 @@ gfxHarfBuzzShaper::Initialize()
|
||
|
|
hb_font_funcs_set_glyph_func(sHBFontFuncs, HBGetGlyph,
|
||
|
|
nullptr, nullptr);
|
||
|
|
hb_font_funcs_set_glyph_h_advance_func(sHBFontFuncs,
|
||
|
|
HBGetGlyphHAdvance,
|
||
|
|
nullptr, nullptr);
|
||
|
|
hb_font_funcs_set_glyph_v_advance_func(sHBFontFuncs,
|
||
|
|
HBGetGlyphVAdvance,
|
||
|
|
nullptr, nullptr);
|
||
|
|
- hb_font_funcs_set_glyph_h_origin_func(sHBFontFuncs,
|
||
|
|
- HBGetGlyphHOrigin,
|
||
|
|
- nullptr, nullptr);
|
||
|
|
hb_font_funcs_set_glyph_v_origin_func(sHBFontFuncs,
|
||
|
|
HBGetGlyphVOrigin,
|
||
|
|
nullptr, nullptr);
|
||
|
|
hb_font_funcs_set_glyph_extents_func(sHBFontFuncs,
|
||
|
|
HBGetGlyphExtents,
|
||
|
|
nullptr, nullptr);
|
||
|
|
hb_font_funcs_set_glyph_contour_point_func(sHBFontFuncs,
|
||
|
|
HBGetContourPoint,
|
||
|
|
diff --git a/gfx/thebes/gfxHarfBuzzShaper.h b/gfx/thebes/gfxHarfBuzzShaper.h
|
||
|
|
--- a/gfx/thebes/gfxHarfBuzzShaper.h
|
||
|
|
+++ b/gfx/thebes/gfxHarfBuzzShaper.h
|
||
|
|
@@ -56,21 +56,16 @@ public:
|
||
|
|
hb_codepoint_t glyph, void *user_data);
|
||
|
|
|
||
|
|
// get harfbuzz vertical advance in 16.16 fixed point format.
|
||
|
|
static hb_position_t
|
||
|
|
HBGetGlyphVAdvance(hb_font_t *font, void *font_data,
|
||
|
|
hb_codepoint_t glyph, void *user_data);
|
||
|
|
|
||
|
|
static hb_bool_t
|
||
|
|
- HBGetGlyphHOrigin(hb_font_t *font, void *font_data,
|
||
|
|
- hb_codepoint_t glyph,
|
||
|
|
- hb_position_t *x, hb_position_t *y,
|
||
|
|
- void *user_data);
|
||
|
|
- static hb_bool_t
|
||
|
|
HBGetGlyphVOrigin(hb_font_t *font, void *font_data,
|
||
|
|
hb_codepoint_t glyph,
|
||
|
|
hb_position_t *x, hb_position_t *y,
|
||
|
|
void *user_data);
|
||
|
|
|
||
|
|
hb_position_t GetHKerning(uint16_t aFirstGlyph,
|
||
|
|
uint16_t aSecondGlyph) const;
|
||
|
|
|