Fixed show_glyphs build error according to latest cairo 1.6.4 update
authorOleg Romashin <romaxa@gmail.com>
Mon, 04 Aug 2008 02:30:08 +0300
changeset 16956 1f6895511812d11f0b4518467ff9101d71852e41
parent 16955 59e2b662dac461cb858f901e289aedc156b00b1e
child 16957 34a26361557b0c9651b76650c557771123aeb8b0
push id1298
push userpavlov@mozilla.com
push dateSun, 17 Aug 2008 05:03:09 +0000
treeherderautoland@4a506fa751d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a2pre
Fixed show_glyphs build error according to latest cairo 1.6.4 update
gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
--- a/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
+++ b/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
@@ -1308,17 +1308,18 @@ static cairo_int_status_t
 }
 
 static cairo_int_status_t
 _cairo_qpainter_surface_show_glyphs (void *abstract_surface,
                                      cairo_operator_t op,
                                      cairo_pattern_t *source,
                                      cairo_glyph_t *glyphs,
                                      int num_glyphs,
-                                     cairo_scaled_font_t *scaled_font)
+                                     cairo_scaled_font_t *scaled_font,
+                                     int *remaining_glyphs)
 {
     cairo_qpainter_surface_t *qs = (cairo_qpainter_surface_t *) abstract_surface;
 
 #if defined(Q_WS_X11) && defined(CAIRO_HAS_XLIB_XRENDER_SURFACE)
     /* If we have an equivalent X surface, let the xlib surface handle this
      * until we figure out how to do this natively with Qt.
      */
     if (qs->xlib_equiv) {
@@ -1351,17 +1352,17 @@ static cairo_int_status_t
 		_cairo_region_fini (&region);
 	    }
 
 	    qs->xlib_has_clipping = qs->has_clipping;
 	    qs->xlib_clip_bounds = qs->clip_bounds;
 	}
 
         return (cairo_int_status_t)
-               _cairo_surface_show_glyphs (qs->xlib_equiv, op, source, glyphs, num_glyphs, scaled_font);
+               _cairo_surface_show_text_glyphs (qs->xlib_equiv, op, source, NULL, 0, glyphs, num_glyphs, NULL, 0, FALSE, scaled_font);
     }
 #endif
 
     return CAIRO_INT_STATUS_UNSUPPORTED;
 }
 
 static cairo_int_status_t
 _cairo_qpainter_surface_mask (void *abstract_surface,