bug 605043 followup - fix --with-system-cairo build breakage. r=karlt a=bustage
authorJonathan Kew <jfkthame@gmail.com>
Tue, 16 Nov 2010 08:38:44 +0000
changeset 57567 db24505d74e9fcedb413c2bf0f674b00ab8513c5
parent 57566 fedc658ef505386cc09e24e05b15181452ab7bfd
child 57568 ecd854d4b939686100e7d86e86fa4ceddaf29e59
push id16984
push userjkew@mozilla.com
push dateTue, 16 Nov 2010 08:41:03 +0000
treeherdermozilla-central@db24505d74e9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt, bustage
bugs605043
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 605043 followup - fix --with-system-cairo build breakage. r=karlt a=bustage
gfx/thebes/gfxHarfBuzzShaper.cpp
--- a/gfx/thebes/gfxHarfBuzzShaper.cpp
+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
@@ -919,20 +919,22 @@ GetRoundOffsetsToPixels(gfxContext *aCon
         return;
     case CAIRO_HINT_METRICS_DEFAULT:
         // Here we mimic what cairo surface/font backends do.  Printing
         // surfaces have already been handled by hint_metrics.  The
         // fallback show_glyphs implementation composites pixel-aligned
         // glyph surfaces, so we just pick surface/font combinations that
         // override this.
         switch (cairo_scaled_font_get_type(scaled_font)) {
+#if CAIRO_HAS_DWRITE_FONT // dwrite backend is not in std cairo releases yet
         case CAIRO_FONT_TYPE_DWRITE:
             // show_glyphs is implemented on the font and so is used for
             // all surface types.
             return;
+#endif
         case CAIRO_FONT_TYPE_QUARTZ:
             // Quartz surfaces implement show_glyphs for Quartz fonts
             if (cairo_surface_get_type(cairo_get_target(cr)) ==
                 CAIRO_SURFACE_TYPE_QUARTZ) {
                 return;
             }
         default:
             break;