Move the remaining uses of font_id from PangoCairoATSUIFont to

2007-06-26  Richard Hult  <richard@imendio.com>

	* pango/pangoatsui.c: (_pango_atsui_font_set_atsu_font_id):
	* pango/pangocairo-atsuifont.c:
	(pango_cairo_atsui_font_create_metrics_for_context),
	(_pango_cairo_atsui_font_new): Move the remaining uses of font_id
	from PangoCairoATSUIFont to PangoATSUIFont.

svn path=/trunk/; revision=2367

3 files changed, 25 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index ede7d8f5..e77fc85a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-26  Richard Hult  <richard@imendio.com>
+
+	* pango/pangoatsui.c: (_pango_atsui_font_set_atsu_font_id):
+	* pango/pangocairo-atsuifont.c:
+	(pango_cairo_atsui_font_create_metrics_for_context),
+	(_pango_cairo_atsui_font_new): Move the remaining uses of font_id
+	from PangoCairoATSUIFont to PangoATSUIFont.
+
 2007-06-24  Richard Hult  <richard@imendio.com>
 
 	Bug 449543 - Ship pangoatsui.h
diff --git a/pango/pangoatsui.c b/pango/pangoatsui.c
index ecea7868..2d5ee7fc 100644
--- a/pango/pangoatsui.c
+++ b/pango/pangoatsui.c
@@ -182,6 +182,16 @@ _pango_atsui_font_set_atsu_font_id (PangoATSUIFont *font,
   priv->font_id = font_id;
 }
 
+/**
+ * pango_atsui_font_get_atsu_font_id:
+ * @font: A #PangoATSUIFont
+ *
+ * Returns the ATSUFontID of a font.
+ *
+ * Return value: the ATSUFontID associated to @font.
+ *
+ * Since: 1.18
+ */
 ATSUFontID
 pango_atsui_font_get_atsu_font_id (PangoATSUIFont *font)
 {
diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c
index 7c1042b3..ef7a4b46 100644
--- a/pango/pangocairo-atsuifont.c
+++ b/pango/pangocairo-atsuifont.c
@@ -35,8 +35,6 @@ struct _PangoCairoATSUIFont
   PangoATSUIFont font;
   PangoCairoFontPrivate cf_priv;
 
-  ATSUFontID font_id;
-
   double size;
   int absolute_size;
 };
@@ -52,23 +50,6 @@ static cairo_font_face_t *pango_cairo_atsui_font_create_font_face           (Pan
 static PangoFontMetrics  *pango_cairo_atsui_font_create_metrics_for_context (PangoCairoFont *font,
                                                                             PangoContext    *context);
 
-
-/**
- * pango_cairo_atsui_font_get_atsu_font_id:
- * @cafont: A #PangoCairoATSUIFont
- *
- * Returns the ATSUFontID of a font.
- *
- * Return value: the ATSUFontID associated to @cafont.
- *
- * Since: 1.12
- */
-ATSUFontID
-pango_cairo_atsui_font_get_atsu_font_id (PangoCairoATSUIFont *cafont)
-{
-  return cafont->font_id;
-}
-
 static void
 cairo_font_iface_init (PangoCairoFontIface *iface)
 {
@@ -100,9 +81,11 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont      *font,
 static cairo_font_face_t *
 pango_cairo_atsui_font_create_font_face (PangoCairoFont *font)
 {
-  PangoCairoATSUIFont *cafont = (PangoCairoATSUIFont *) (font);
+  PangoATSUIFont *afont = (PangoATSUIFont *) (font);
+  ATSUFontID font_id;
 
-  return cairo_atsui_font_face_create_for_atsu_font_id (cafont->font_id);
+  font_id = pango_atsui_font_get_atsu_font_id (afont);
+  return cairo_atsui_font_face_create_for_atsu_font_id (font_id);
 }
 
 static int
@@ -134,6 +117,7 @@ pango_cairo_atsui_font_create_metrics_for_context (PangoCairoFont *font,
                                                    PangoContext   *context)
 {
   PangoCairoATSUIFont *cafont = (PangoCairoATSUIFont *) font;
+  PangoATSUIFont *afont = (PangoATSUIFont *) font;
   ATSFontRef ats_font;
   ATSFontMetrics ats_metrics;
   PangoFontMetrics *metrics;
@@ -143,7 +127,7 @@ pango_cairo_atsui_font_create_metrics_for_context (PangoCairoFont *font,
   PangoLanguage *language = pango_context_get_language (context);
   const char *sample_str = pango_language_get_sample_string (language);
 
-  ats_font = FMGetATSFontRefFromFont (cafont->font_id);
+  ats_font = FMGetATSFontRefFromFont (pango_atsui_font_get_atsu_font_id (afont));
 
   ATSFontGetHorizontalMetrics (ats_font, kATSOptionFlagsDefault, &ats_metrics);
 
@@ -278,7 +262,7 @@ _pango_cairo_atsui_font_new (PangoCairoATSUIFontMap     *cafontmap,
   _pango_atsui_font_set_face (afont, face);
 
   size = (double) pango_font_description_get_size (desc) / PANGO_SCALE;
-  cafont->font_id = font_id;
+  _pango_atsui_font_set_atsu_font_id (afont, font_id);
 
   if (context)
     {