Bug 1231504 - Consolidate apz prefs that are MOZ_WIDGET_GONK into all.js so they get applied to Fennec as well. r=botond

This commit is contained in:
Kartikaya Gupta 2015-12-10 10:22:04 -05:00
parent 1a651312c3
commit 14c998a81c
3 changed files with 2 additions and 10 deletions

View File

@ -1007,11 +1007,6 @@ pref("security.exthelperapp.disable_background_handling", true);
// Inactivity time in milliseconds after which we shut down the OS.File worker.
pref("osfile.reset_worker_delay", 5000);
// APZC preferences.
#ifdef MOZ_WIDGET_GONK
pref("apz.allow_zooming", true);
#endif
// APZ physics settings, tuned by UX designers
pref("apz.fling_curve_function_x1", "0.41");
pref("apz.fling_curve_function_y1", "0.0");
@ -1022,10 +1017,6 @@ pref("apz.fling_friction", "0.0019");
pref("apz.max_velocity_inches_per_ms", "0.07");
pref("apz.touch_start_tolerance", "0.1");
#ifdef MOZ_WIDGET_GONK
pref("apz.touch_move_tolerance", "0.03");
#endif
// Tweak default displayport values to reduce the risk of running out of
// memory when zooming in
pref("apz.x_skate_size_multiplier", "1.25");

View File

@ -561,7 +561,6 @@ pref("layers.async-pan-zoom.enabled", true);
pref("apz.axis_lock.mode", 1);
pref("apz.fling_stop_on_tap_threshold", "0.08");
#endif
pref("apz.allow_zooming", true);
pref("layers.progressive-paint", true);
pref("layers.low-precision-buffer", true);
pref("layers.low-precision-resolution", "0.25");

View File

@ -609,8 +609,10 @@ pref("apz.zoom_animation_duration_ms", 250);
#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
// Mobile prefs
pref("apz.allow_zooming", true);
pref("apz.fling_repaint_interval", 75);
pref("apz.smooth_scroll_repaint_interval", 75);
pref("apz.touch_move_tolerance", "0.03");
pref("apz.x_skate_size_multiplier", "1.25");
pref("apz.y_skate_size_multiplier", "1.5");
pref("apz.x_stationary_size_multiplier", "1.5");