From da575565b14131aef194b6581d785b19c19d73d6 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Fri, 21 Aug 2015 20:35:02 +0300
Subject: [PATCH] Backout Bug 1166347 (pointer events on nightlies) because of
 crashes (see Bug 1181564), r=khuey

---
 b2g/app/b2g.js                                   |  5 -----
 b2g/dev/app/mulet.js                             |  5 -----
 browser/app/profile/firefox.js                   | 11 ++---------
 dom/tests/mochitest/general/test_interfaces.html |  2 +-
 modules/libpref/init/all.js                      |  5 +++--
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 8c23d4cd125..9c06756c087 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -352,11 +352,6 @@ pref("dom.w3c_touch_events.enabled", 1);
 pref("dom.w3c_touch_events.safetyX", 0); // escape borders in units of 1/240"
 pref("dom.w3c_touch_events.safetyY", 120); // escape borders in units of 1/240"
 
-// W3C draft pointer events
-pref("dom.w3c_pointer_events.enabled", false);
-// W3C touch-action css property (related to touch and pointer events)
-pref("layout.css.touch_action.enabled", false);
-
 #ifdef MOZ_SAFE_BROWSING
 // Safe browsing does nothing unless this pref is set
 pref("browser.safebrowsing.enabled", false);
diff --git a/b2g/dev/app/mulet.js b/b2g/dev/app/mulet.js
index 5d59c1e1876..7be51985524 100644
--- a/b2g/dev/app/mulet.js
+++ b/b2g/dev/app/mulet.js
@@ -18,8 +18,3 @@ pref("devtools.toolbox.sidebar.width", 800);
 pref("browser.tabs.remote.autostart", false);
 pref("browser.tabs.remote.autostart.1", false);
 pref("browser.tabs.remote.autostart.2", false);
-
-// W3C draft pointer events
-pref("dom.w3c_pointer_events.enabled", false);
-// W3C touch-action css property (related to touch and pointer events)
-pref("layout.css.touch_action.enabled", false);
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 9bf0bcc1dea..fd70598c1fd 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -489,17 +489,10 @@ pref("dom.disable_window_move_resize",            false);
 // prevent JS from monkeying with window focus, etc
 pref("dom.disable_window_flip",                   true);
 
-// Disable touch events on Desktop Firefox by default
-// until they are properly supported (bug 736048)
+// Disable touch events on Desktop Firefox by default until they are properly
+// supported (bug 736048)
 pref("dom.w3c_touch_events.enabled",        0);
 
-#ifdef NIGHTLY_BUILD
-// 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);
-#endif
-
 // popups.policy 1=allow,2=reject
 pref("privacy.popups.policy",               1);
 pref("privacy.popups.usecustom",            true);
diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html
index 352265c038c..7aa79b57425 100644
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -910,7 +910,7 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "PluginArray",
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "PointerEvent", nightly: true, desktop: true},
+    {name: "PointerEvent", nightly: true, desktop: true, disabled: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "PopStateEvent",
 // IMPORTANT: Do not change this list without review from a DOM peer!
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index e430afda053..6992ca0e7dc 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4525,12 +4525,13 @@ pref("dom.w3c_touch_events.enabled", 2);
 
 // W3C draft pointer events
 pref("dom.w3c_pointer_events.enabled", false);
-// W3C touch-action css property (related to touch and pointer events)
-pref("layout.css.touch_action.enabled", false);
 
 // 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.