Fix the scaled_glyph_init color glyph logic

and split _cairo_user_scaled_glyph_init() into multiple functions.

Update user-font test to test changing foreground text color.

14 files changed, 58 insertions, 13 deletions

diff --git a/test/reference/user-font.base.argb32.ref.png b/test/reference/user-font.base.argb32.ref.png
deleted file mode 100644
index 896dbab25..000000000
--- a/test/reference/user-font.base.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.base.rgb24.ref.png b/test/reference/user-font.base.rgb24.ref.png
deleted file mode 100644
index 896dbab25..000000000
--- a/test/reference/user-font.base.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.image16.ref.png b/test/reference/user-font.image16.ref.png
deleted file mode 100644
index fcdfb5793..000000000
--- a/test/reference/user-font.image16.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.mask.argb32.ref.png b/test/reference/user-font.mask.argb32.ref.png
deleted file mode 100644
index b234a8801..000000000
--- a/test/reference/user-font.mask.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.mask.rgb24.ref.png b/test/reference/user-font.mask.rgb24.ref.png
deleted file mode 100644
index b234a8801..000000000
--- a/test/reference/user-font.mask.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.pdf.ref.png b/test/reference/user-font.pdf.ref.png
deleted file mode 100644
index 5dc028eb3..000000000
--- a/test/reference/user-font.pdf.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.ps.ref.png b/test/reference/user-font.ps.ref.png
deleted file mode 100644
index 3a674c30a..000000000
--- a/test/reference/user-font.ps.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.quartz.ref.png b/test/reference/user-font.quartz.ref.png
index dfb2e0a15..f1a8d5752 100644
--- a/test/reference/user-font.quartz.ref.png
+++ b/test/reference/user-font.quartz.ref.png
diff --git a/test/reference/user-font.recording.ref.png b/test/reference/user-font.recording.ref.png
new file mode 100644
index 000000000..aefe4c9fe
--- /dev/null
+++ b/test/reference/user-font.recording.ref.png
diff --git a/test/reference/user-font.ref.png b/test/reference/user-font.ref.png
index 4cff7e996..87a3f68e3 100644
--- a/test/reference/user-font.ref.png
+++ b/test/reference/user-font.ref.png
diff --git a/test/reference/user-font.svg.ref.png b/test/reference/user-font.svg.ref.png
deleted file mode 100644
index b89e92d20..000000000
--- a/test/reference/user-font.svg.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.traps.argb32.ref.png b/test/reference/user-font.traps.argb32.ref.png
deleted file mode 100644
index 896dbab25..000000000
--- a/test/reference/user-font.traps.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/user-font.traps.rgb24.ref.png b/test/reference/user-font.traps.rgb24.ref.png
deleted file mode 100644
index 896dbab25..000000000
--- a/test/reference/user-font.traps.rgb24.ref.png
+++ /dev/null
diff --git a/test/user-font.c b/test/user-font.c
index 435d5616f..d02a90f4d 100644
--- a/test/user-font.c
+++ b/test/user-font.c
@@ -36,11 +36,13 @@
 #define TEXT_SIZE 64
 #define WIDTH  (TEXT_SIZE * 15 + 2*BORDER)
 #ifndef ROTATED
- #define HEIGHT ((TEXT_SIZE + 2*BORDER)*2)
+ #define HEIGHT ((TEXT_SIZE + 2*BORDER)*3)
 #else
  #define HEIGHT WIDTH
 #endif
-#define TEXT   "geez... cairo user-font"
+
+#define TEXT1   "cairo user-font."
+#define TEXT2   " zg."
 
 #define END_GLYPH 0
 #define STROKE 126
@@ -136,8 +138,14 @@ test_scaled_font_render_glyph (cairo_scaled_font_t  *scaled_font,
     return CAIRO_STATUS_SUCCESS;
 }
 
+
+/* If color_render is TRUE, use the render_color_glyph callback
+ * instead of the render_glyph callbac. The output should be identical
+ * in this test since the render function does not alter the cairo_t
+ * source.
+ */
 static cairo_status_t
-_user_font_face_create (cairo_font_face_t **out)
+_user_font_face_create (cairo_font_face_t **out, cairo_bool_t color_render)
 {
     /* Simple glyph definition: 1 - 15 means lineto (or moveto for first
      * point) for one of the points on this grid:
@@ -174,8 +182,12 @@ _user_font_face_create (cairo_font_face_t **out)
     cairo_status_t status;
 
     user_font_face = cairo_user_font_face_create ();
-    cairo_user_font_face_set_init_func             (user_font_face, test_scaled_font_init);
-    cairo_user_font_face_set_render_glyph_func     (user_font_face, test_scaled_font_render_glyph);
+    cairo_user_font_face_set_init_func (user_font_face, test_scaled_font_init);
+    if (color_render)
+        cairo_user_font_face_set_render_color_glyph_func (user_font_face, test_scaled_font_render_glyph);
+    else
+        cairo_user_font_face_set_render_glyph_func (user_font_face, test_scaled_font_render_glyph);
+
     cairo_user_font_face_set_unicode_to_glyph_func (user_font_face, test_scaled_font_unicode_to_glyph);
 
     status = cairo_font_face_set_user_data (user_font_face,
@@ -194,11 +206,15 @@ static cairo_test_status_t
 draw (cairo_t *cr, int width, int height)
 {
     cairo_font_face_t *font_face;
-    const char text[] = TEXT;
+    char full_text[100];
     cairo_font_extents_t font_extents;
     cairo_text_extents_t extents;
     cairo_status_t status;
 
+    strcpy(full_text, TEXT1);
+    strcat(full_text, TEXT2);
+    strcat(full_text, TEXT2);
+
     cairo_set_source_rgb (cr, 1, 1, 1);
     cairo_paint (cr);
 
@@ -207,7 +223,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_rotate (cr, .6);
 #endif
 
-    status = _user_font_face_create (&font_face);
+    status = _user_font_face_create (&font_face, FALSE);
     if (status) {
 	return cairo_test_status_from_status (cairo_test_get_context (cr),
 					      status);
@@ -219,7 +235,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_set_font_size (cr, TEXT_SIZE);
 
     cairo_font_extents (cr, &font_extents);
-    cairo_text_extents (cr, text, &extents);
+    cairo_text_extents (cr, full_text, &extents);
 
     /* logical boundaries in red */
     cairo_move_to (cr, 0, BORDER);
@@ -244,16 +260,45 @@ draw (cairo_t *cr, int width, int height)
     cairo_set_line_width (cr, 2);
     cairo_stroke (cr);
 
-    /* text in black */
+    /* First line. Text in black, except first "zg." in green */
     cairo_set_source_rgb (cr, 0, 0, 0);
     cairo_move_to (cr, BORDER, BORDER + font_extents.ascent);
-    cairo_show_text (cr, text);
+    cairo_show_text (cr, TEXT1);
+    cairo_set_source_rgb (cr, 0, 1, 0);
+    cairo_show_text (cr, TEXT2);
+    cairo_set_source_rgb (cr, 0, 0, 0);
+    cairo_show_text (cr, TEXT2);
+
+    /* Now draw the second line using the render_color_glyph callback. The
+     * output should be the same because same render function is used
+     * and the render function does not set a color. This exercises
+     * the paint color glyph with foreground color code path and
+     * ensures cairo updates the glyph image when the foreground color
+     * changes.
+     */
+    status = _user_font_face_create (&font_face, TRUE);
+    if (status) {
+	return cairo_test_status_from_status (cairo_test_get_context (cr),
+					      status);
+    }
 
+    cairo_set_font_face (cr, font_face);
+    cairo_font_face_destroy (font_face);
 
-    /* filled version of text in blue */
-    cairo_set_source_rgb (cr, 0, 0, 1);
+    cairo_set_font_size (cr, TEXT_SIZE);
+
+    /* text in black, except first "zg." in green */
     cairo_move_to (cr, BORDER, BORDER + font_extents.height + 2*BORDER + font_extents.ascent);
-    cairo_text_path (cr, text);
+    cairo_show_text (cr, TEXT1);
+    cairo_set_source_rgb (cr, 0, 1, 0);
+    cairo_show_text (cr, TEXT2);
+    cairo_set_source_rgb (cr, 0, 0, 0);
+    cairo_show_text (cr, TEXT2);
+
+    /* Third line. Filled version of text in blue */
+    cairo_set_source_rgb (cr, 0, 0, 1);
+    cairo_move_to (cr, BORDER, BORDER + font_extents.height + 4*BORDER + 2*font_extents.ascent);
+    cairo_text_path (cr, full_text);
     cairo_fill (cr);
 
     return CAIRO_TEST_SUCCESS;