Bug 993137 - Trivial fixes. f=ochameau, r=glandium
authorJan Keromnes <janx@linux.com>
Wed, 23 Apr 2014 10:50:00 +0200
changeset 179934 30138717a075b2f538e0e173b5ed23b958f98898
parent 179933 51dbd71f00a51ad1b616ccc84834db276aee9b19
child 179935 ac10d2fcb25da489d0def5703c558a84704f868c
push id26649
push userryanvm@gmail.com
push dateThu, 24 Apr 2014 17:20:01 +0000
treeherdermozilla-central@7fdae4f893df [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs993137
milestone31.0a1
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 993137 - Trivial fixes. f=ochameau, r=glandium
configure.in
modules/libpref/src/init/all.js
--- a/configure.in
+++ b/configure.in
@@ -8904,19 +8904,17 @@ if test "$MOZ_X11"; then
 
 fi # MOZ_X11
 
 fi # COMPILE_ENVIRONMENT
 
 dnl Set various defines and substitutions
 dnl ========================================================
 
-if test "$OS_ARCH" = "Darwin"; then
-  AC_DEFINE(XP_UNIX)
-elif test "$OS_ARCH" != "WINNT"; then
+if test "$OS_ARCH" != "WINNT"; then
   AC_DEFINE(XP_UNIX)
 fi
 
 if test "$MOZ_DEBUG"; then
     AC_DEFINE(MOZ_REFLOW_PERF)
     AC_DEFINE(MOZ_REFLOW_PERF_DSP)
 fi
 
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -373,22 +373,21 @@ pref("gfx.downloadable_fonts.fallback_de
 #ifdef ANDROID
 pref("gfx.bundled_fonts.enabled", true);
 pref("gfx.bundled_fonts.force-enabled", false);
 #endif
 
 pref("gfx.filter.nearest.force-enabled", false);
 
 // prefs controlling the font (name/cmap) loader that runs shortly after startup
+pref("gfx.font_loader.families_per_slice", 3); // read in info 3 families at a time
 #ifdef XP_WIN
-pref("gfx.font_loader.families_per_slice", 3); // read in info 3 families at a time
 pref("gfx.font_loader.delay", 120000);         // 2 minutes after startup
 pref("gfx.font_loader.interval", 1000);        // every 1 second until complete
 #else
-pref("gfx.font_loader.families_per_slice", 3); // read in info 3 families at a time
 pref("gfx.font_loader.delay", 8000);           // 8 secs after startup
 pref("gfx.font_loader.interval", 50);          // run every 50 ms
 #endif
 
 // whether to always search all font cmaps during system font fallback
 pref("gfx.font_rendering.fallback.always_use_cmaps", false);
 
 // cache shaped word results
@@ -2678,17 +2677,17 @@ pref("ui.trackpoint_hack.enabled", -1);
 // some trackpad drivers behave better.
 pref("ui.window_class_override", "");
 
 // Enables or disables the Elantech gesture hacks.  -1 is autodetect, 0 is off,
 // and 1 is on.  Set this to 1 if three-finger swipe gestures do not cause
 // page back/forward actions, or if pinch-to-zoom does not work.
 pref("ui.elantech_gesture_hacks.enabled", -1);
 
-# WINNT
+# XP_WIN
 #endif
 
 #ifdef XP_MACOSX
 // Mac specific preference defaults
 pref("browser.drag_out_of_frame_style", 1);
 pref("ui.key.saveLink.shift", false); // true = shift, false = meta
 
 // default fonts (in UTF8 and using canonical names)