pango r2801 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Wed Jan 28 22:07:13 2009
New Revision: 2801
URL: http://svn.gnome.org/viewvc/pango?rev=2801&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/pango/pangocairo-atsuifont.c
   trunk/pango/pangocairo-fcfont.c
   trunk/pango/pangocairo-font.c
   trunk/pango/pangocairo-private.h
   trunk/pango/pangocairo-win32font.c

Modified: trunk/pango/pangocairo-atsuifont.c
==============================================================================
--- trunk/pango/pangocairo-atsuifont.c	(original)
+++ trunk/pango/pangocairo-atsuifont.c	Wed Jan 28 22:07:13 2009
@@ -308,8 +308,9 @@
 
   _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;

Modified: trunk/pango/pangocairo-fcfont.c
==============================================================================
--- trunk/pango/pangocairo-fcfont.c	(original)
+++ trunk/pango/pangocairo-fcfont.c	Wed Jan 28 22:07:13 2009
@@ -244,8 +244,9 @@
 
   _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);

Modified: trunk/pango/pangocairo-font.c
==============================================================================
--- trunk/pango/pangocairo-font.c	(original)
+++ trunk/pango/pangocairo-font.c	Wed Jan 28 22:07:13 2009
@@ -515,13 +515,12 @@
 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);
@@ -538,7 +537,6 @@
 			 font_matrix,
 			 &gravity_matrix);
 
-  pango_ctm = pango_context_get_matrix (context);
   if (pango_ctm)
     cairo_matrix_init (&cf_priv->data->ctm,
 		       pango_ctm->xx,
@@ -549,7 +547,6 @@
   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;
 

Modified: trunk/pango/pangocairo-private.h
==============================================================================
--- trunk/pango/pangocairo-private.h	(original)
+++ trunk/pango/pangocairo-private.h	Wed Jan 28 22:07:13 2009
@@ -109,8 +109,9 @@
 
 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);

Modified: trunk/pango/pangocairo-win32font.c
==============================================================================
--- trunk/pango/pangocairo-win32font.c	(original)
+++ trunk/pango/pangocairo-win32font.c	Wed Jan 28 22:07:13 2009
@@ -318,8 +318,9 @@
 
   _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);