+2009-01-09 Behdad Esfahbod <behdad@gnome.org>
+
+ * pango/pangocairo-atsuifont.c (_pango_cairo_atsui_font_new):
+ * pango/pangocairo-fcfont.c (_pango_cairo_fc_font_new):
+ * pango/pangocairo-font.c (_pango_cairo_font_private_initialize):
+ * pango/pangocairo-private.h:
+ * pango/pangocairo-win32font.c (_pango_cairo_win32_font_new):
+ Remove context argument from _pango_cairo_font_private_initialize().
+ Replace it with pango_ctm and font_options, the only things from
+ context we actually needed. This is in preparation for lazy loading
+ of fonts in the pangofc fontmap.
+
2009-01-20 Johan Dahlin <jdahlin@async.com.br>
Bug 567934 – Add introspection support inside pango
_pango_cairo_font_private_initialize (&cafont->cf_priv,
(PangoCairoFont *) cafont,
- context,
desc,
+ _pango_cairo_context_get_merged_font_options (context),
+ pango_context_get_matrix (context),
&font_matrix);
return afont;
_pango_cairo_font_private_initialize (&cffont->cf_priv,
(PangoCairoFont *) cffont,
- context,
desc,
+ _pango_cairo_context_get_merged_font_options (context),
+ pango_context_get_matrix (context),
&font_matrix);
((PangoFcFont *)(cffont))->is_hinted = _pango_cairo_font_private_is_metrics_hinted (&cffont->cf_priv);
void
_pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv,
PangoCairoFont *cfont,
- PangoContext *context,
const PangoFontDescription *desc,
+ const cairo_font_options_t *font_options,
+ const PangoMatrix *pango_ctm,
const cairo_matrix_t *font_matrix)
{
- const cairo_font_options_t *font_options;
cairo_matrix_t gravity_matrix;
- const PangoMatrix *pango_ctm;
cf_priv->cfont = cfont;
cf_priv->gravity = pango_font_description_get_gravity (desc);
font_matrix,
&gravity_matrix);
- pango_ctm = pango_context_get_matrix (context);
if (pango_ctm)
cairo_matrix_init (&cf_priv->data->ctm,
pango_ctm->xx,
else
cairo_matrix_init_identity (&cf_priv->data->ctm);
- font_options = _pango_cairo_context_get_merged_font_options (context);
cf_priv->data->options = cairo_font_options_copy (font_options);
cf_priv->is_hinted = cairo_font_options_get_hint_metrics (font_options) != CAIRO_HINT_METRICS_OFF;
void _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv,
PangoCairoFont *font,
- PangoContext *context,
const PangoFontDescription *desc,
+ const cairo_font_options_t *font_options,
+ const PangoMatrix *pango_ctm,
const cairo_matrix_t *font_matrix);
void _pango_cairo_font_private_finalize (PangoCairoFontPrivate *cf_priv);
cairo_scaled_font_t *_pango_cairo_font_private_get_scaled_font (PangoCairoFontPrivate *cf_priv);
_pango_cairo_font_private_initialize (&cwfont->cf_priv,
(PangoCairoFont *) cwfont,
- context,
desc,
+ _pango_cairo_context_get_merged_font_options (context),
+ pango_context_get_matrix (context),
&font_matrix);
return PANGO_FONT (cwfont);