From a03fc5e2fd2abada45a6affb1871ac54c51db40f Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 24 Mar 2016 10:03:50 -0400
Subject: [PATCH] Hide nonstandard interface members of standard interfaces
 behind appropriate prefs.

---
 components/script/dom/webidls/BrowserElement.webidl    | 8 ++++----
 components/script/dom/webidls/HTMLIFrameElement.webidl | 2 +-
 components/script/dom/webidls/MouseEvent.webidl        | 1 +
 tests/wpt/mozilla/tests/mozilla/interfaces.html        | 1 -
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/script/dom/webidls/BrowserElement.webidl b/components/script/dom/webidls/BrowserElement.webidl
index a244f9575a7..565a32013b9 100644
--- a/components/script/dom/webidls/BrowserElement.webidl
+++ b/components/script/dom/webidls/BrowserElement.webidl
@@ -137,22 +137,22 @@ interface BrowserElementPrivileged {
   //                    unsigned long modifiers);
 
   [Throws,
-   Pref="dom.mozBrowserFramesEnabled",
+   Pref="dom.mozbrowser.enabled",
    CheckAnyPermissions="browser"]
   void goBack();
 
   [Throws,
-   Pref="dom.mozBrowserFramesEnabled",
+   Pref="dom.mozbrowser.enabled",
    CheckAnyPermissions="browser"]
   void goForward();
 
   [Throws,
-   Pref="dom.mozBrowserFramesEnabled",
+   Pref="dom.mozbrowser.enabled",
    CheckAnyPermissions="browser"]
   void reload(optional boolean hardReload = false);
 
   [Throws,
-   Pref="dom.mozBrowserFramesEnabled",
+   Pref="dom.mozbrowser.enabled",
    CheckAnyPermissions="browser"]
   void stop();
 
diff --git a/components/script/dom/webidls/HTMLIFrameElement.webidl b/components/script/dom/webidls/HTMLIFrameElement.webidl
index 52c11f238ae..20bb563e908 100644
--- a/components/script/dom/webidls/HTMLIFrameElement.webidl
+++ b/components/script/dom/webidls/HTMLIFrameElement.webidl
@@ -32,7 +32,7 @@ partial interface HTMLIFrameElement {
 };
 
 partial interface HTMLIFrameElement {
-  [ChromeOnly,SetterThrows]
+  [ChromeOnly,SetterThrows,Pref="dom.mozbrowser.enabled"]
            attribute boolean mozbrowser;
 };
 
diff --git a/components/script/dom/webidls/MouseEvent.webidl b/components/script/dom/webidls/MouseEvent.webidl
index c156a66629b..ea9e7772a62 100644
--- a/components/script/dom/webidls/MouseEvent.webidl
+++ b/components/script/dom/webidls/MouseEvent.webidl
@@ -19,6 +19,7 @@ interface MouseEvent : UIEvent {
     //readonly    attribute unsigned short buttons;
     //boolean getModifierState (DOMString keyArg);
 
+    [Pref="dom.mouseevent.which.enabled"]
     readonly    attribute long           which;
 };
 
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html
index e8dde3e906c..bd0a58dbe6b 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.html
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html
@@ -23,7 +23,6 @@ var ecmaGlobals = [
   "Float32Array",
   "Float64Array",
   "FocusEvent",
-  "ForceTouchEvent",
   "Function",
   "Infinity",
   "Int16Array",