Backed out changeset e749fcac8cb3 (bug 1279785) for build bustage CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Wed, 20 Jul 2016 10:59:58 -0700
changeset 330993 903eba9d0ef1cdb6e19de89cc824738447262ab3
parent 330992 f4f17f746d1013fc179b8eefa7360e9838e93a60
child 330994 62a913298af663d18fee43be84f755599a92090e
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1279785
milestone50.0a1
backs oute749fcac8cb38b6b1189cba8e29cd3d9f4e52474
Backed out changeset e749fcac8cb3 (bug 1279785) for build bustage CLOSED TREE
gfx/thebes/gfxFcPlatformFontList.cpp
--- a/gfx/thebes/gfxFcPlatformFontList.cpp
+++ b/gfx/thebes/gfxFcPlatformFontList.cpp
@@ -27,20 +27,16 @@
 
 #include <fontconfig/fcfreetype.h>
 
 #ifdef MOZ_WIDGET_GTK
 #include <gdk/gdk.h>
 #include "gfxPlatformGtk.h"
 #endif
 
-#ifdef MOZ_X11
-#include "mozilla/X11Util.h"
-#endif
-
 using namespace mozilla;
 using namespace mozilla::unicode;
 
 #ifndef FC_POSTSCRIPT_NAME
 #define FC_POSTSCRIPT_NAME  "postscriptname"      /* String */
 #endif
 
 #define PRINTING_FC_PROPERTY "gfx.printing"
@@ -716,39 +712,16 @@ gfxFontconfigFontEntry::CreateScaledFont
     return scaledFont;
 }
 
 #ifdef MOZ_WIDGET_GTK
 // defintion included below
 static void ApplyGdkScreenFontOptions(FcPattern *aPattern);
 #endif
 
-#ifdef MOZ_X11
-static bool
-GetXftInt(Display* aDisplay, const char* aName, int* aResult)
-{
-    if (!aDisplay) {
-        return false;
-    }
-    char* value = XGetDefault(aDisplay, "Xft", aName);
-    if (!value) {
-        return false;
-    }
-    if (FcNameConstant(ToFcChar8Ptr(value), aResult)) {
-        return true;
-    }
-    char* end;
-    *aResult = strtol(value, &end, 0);
-    if (end != value) {
-        return true;
-    }
-    return false;
-}
-#endif
-
 static void
 PreparePattern(FcPattern* aPattern, bool aIsPrinterFont)
 {
     FcConfigSubstitute(nullptr, aPattern, FcMatchPattern);
 
     // This gets cairo_font_options_t for the Screen.  We should have
     // different font options for printing (no hinting) but we are not told
     // what we are measuring for.
@@ -767,26 +740,16 @@ PreparePattern(FcPattern* aPattern, bool
        cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_GRAY);
        cairo_ft_font_options_substitute(options, aPattern);
        cairo_font_options_destroy(options);
        FcPatternAddBool(aPattern, PRINTING_FC_PROPERTY, FcTrue);
     } else {
 #ifdef MOZ_WIDGET_GTK
        ApplyGdkScreenFontOptions(aPattern);
 #endif
-
-#ifdef MOZ_X11
-        FcValue value;
-        int lcdfilter;
-        if (FcPatternGet(aPattern, FC_LCD_FILTER, 0, &value)
-                == FcResultNoMatch &&
-            GetXftInt(DefaultXDisplay(), "lcdfilter", &lcdfilter)) {
-            FcPatternAddInteger(aPattern, FC_LCD_FILTER, lcdfilter);
-        }
-#endif
     }
 
     FcDefaultSubstitute(aPattern);
 }
 
 gfxFont*
 gfxFontconfigFontEntry::CreateFontInstance(const gfxFontStyle *aFontStyle,
                                            bool aNeedsBold)