Merge m-c to b2ginbound, a=merge

This commit is contained in:
Wes Kocher 2015-06-03 17:11:24 -07:00
commit d4b9b428b1

View File

@ -4435,24 +4435,15 @@ pref("dom.mozPermissionSettings.enabled", false);
pref("dom.w3c_touch_events.enabled", 2);
#endif
#ifdef NIGHTLY_BUILD
#if defined(XP_WIN) || defined(XP_LINUX) || defined(XP_MACOSX)
// W3C draft pointer events
pref("dom.w3c_pointer_events.enabled", true);
// W3C touch-action css property (related to touch and pointer events)
pref("layout.css.touch_action.enabled", true);
#else
pref("dom.w3c_pointer_events.enabled", false);
pref("layout.css.touch_action.enabled", false);
#endif
#else
pref("dom.w3c_pointer_events.enabled", false);
pref("layout.css.touch_action.enabled", false);
#endif
// W3C draft ImageCapture API
pref("dom.imagecapture.enabled", false);
// W3C touch-action css property (related to touch and pointer events)
pref("layout.css.touch_action.enabled", false);
// Enables some assertions in nsStyleContext that are too expensive
// for general use, but might be useful to enable for specific tests.
// This only has an effect in DEBUG-builds.