From bad016c45ae5e7c7f6c20c0389991cdc58799eb2 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Mon, 6 Apr 2015 18:39:11 -0400
Subject: [PATCH] Bug 1150282 - Apply APZ prefs meant for desktop to all
 desktop platforms, not just OS X. r=kats

--HG--
extra : transplant_source : %87%22ln0vR%A4%EC%ED.t%86H%87%08%C2Q%E0S
---
 modules/libpref/init/all.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 7c65b26a1dd1..de23acb3f7cc 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -544,13 +544,15 @@ pref("apz.x_stationary_size_multiplier", "3.0");
 pref("apz.y_stationary_size_multiplier", "3.5");
 pref("apz.zoom_animation_duration_ms", 250);
 
-#ifdef XP_MACOSX
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+// Desktop prefs
 pref("apz.fling_repaint_interval", 16);
 pref("apz.smooth_scroll_repaint_interval", 16);
 pref("apz.pan_repaint_interval", 16);
 pref("apz.x_skate_size_multiplier", "2.5");
 pref("apz.y_skate_size_multiplier", "3.5");
 #else
+// Mobile prefs
 pref("apz.fling_repaint_interval", 75);
 pref("apz.smooth_scroll_repaint_interval", 75);
 pref("apz.pan_repaint_interval", 250);