Bug 838146 part 10. Turn on WebIDL bindings for Navigator. r=smaug

dom/base/Navigator.cpp

@@ -111,6 +111,7 @@ Navigator::Navigator(nsPIDOMWindow* aWindow)
 {
   NS_ASSERTION(aWindow->IsInnerWindow(),
                "Navigator must get an inner window!");
+  SetIsDOMBinding();
 }
 
 Navigator::~Navigator()
@@ -2169,6 +2170,12 @@ Navigator::DoNewResolve(JSContext* aCx, JS::Handle<JSObject*> aObject,
   return true;
 }
 
+JSObject*
+Navigator::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
+{
+  return NavigatorBinding::Wrap(cx, scope, this);
+}
+
 /* static */
 bool
 Navigator::HasBatterySupport(JSContext* /* unused*/, JSObject* /*unused */)

dom/base/Navigator.h

@@ -395,6 +395,9 @@ public:
     return GetWindow();
   }
 
+  virtual JSObject* WrapObject(JSContext* cx,
+                               JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
+
 private:
   bool CheckPermission(const char* type);
   static bool CheckPermission(nsPIDOMWindow* aWindow, const char* aType);

dom/bindings/Bindings.conf

@@ -711,10 +711,6 @@ DOMInterfaces = {
                            'previousSibling', 'nextSibling' ]
 },
 
-'Navigator': {
-    'register': False,
-},
-
 'Node': {
     'nativeType': 'nsINode',
     'concrete': False,

dom/icc/tests/marionette/test_icc_card_state.js

@@ -6,13 +6,28 @@ MARIONETTE_TIMEOUT = 30000;
 SpecialPowers.addPermission("mobileconnection", true, document);
 SpecialPowers.addPermission("settings-write", true, document);
 
-let icc = navigator.mozIccManager;
-ok(icc instanceof MozIccManager, "icc is instanceof " + icc.constructor);
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let icc;
+ifr.onload = function() {
+  icc = ifr.contentWindow.navigator.mozIccManager;
 
-is(icc.cardState, "ready");
+  ok(icc instanceof ifr.contentWindow.MozIccManager,
+     "icc is instanceof " + icc.constructor);
+
+  is(icc.cardState, "ready");
+
+  // Enable Airplane mode, expect got cardstatechange to null
+  testCardStateChange(true, null,
+    // Disable Airplane mode, expect got cardstatechange to 'ready'
+    testCardStateChange.bind(window, false, "ready", cleanUp)
+  );
+};
+document.body.appendChild(ifr);
 
 function setAirplaneModeEnabled(enabled) {
-  let settings = window.navigator.mozSettings;
+  let settings = ifr.contentWindow.navigator.mozSettings;
   let setLock = settings.createLock();
   let obj = {
     "ril.radio.disabled": enabled
@@ -53,9 +68,3 @@ function cleanUp() {
 
   finish();
 }
-
-// Enable Airplane mode, expect got cardstatechange to null
-testCardStateChange(true, null,
-  // Disable Airplane mode, expect got cardstatechange to 'ready'
-  testCardStateChange.bind(this, false, "ready", cleanUp)
-);

dom/icc/tests/marionette/test_icc_info.js

@@ -5,9 +5,42 @@ MARIONETTE_TIMEOUT = 30000;
 
 SpecialPowers.addPermission("mobileconnection", true, document);
 
-let icc = navigator.mozIccManager;
-ok(icc instanceof MozIccManager,
-   "icc is instanceof " + icc.constructor);
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let icc;
+let iccInfo;
+ifr.onload = function() {
+  icc = ifr.contentWindow.navigator.mozIccManager;
+  ok(icc instanceof ifr.contentWindow.MozIccManager,
+     "icc is instanceof " + icc.constructor);
+
+  iccInfo = icc.iccInfo;
+
+  // The emulator's hard coded iccid value.
+  // See it here {B2G_HOME}/external/qemu/telephony/sim_card.c#L299.
+  is(iccInfo.iccid, 89014103211118510720);
+
+  // The emulator's hard coded mcc and mnc codes.
+  // See it here {B2G_HOME}/external/qemu/telephony/android_modem.c#L2465.
+  is(iccInfo.mcc, 310);
+  is(iccInfo.mnc, 260);
+  is(iccInfo.spn, "Android");
+  // Phone number is hardcoded in MSISDN
+  // See {B2G_HOME}/external/qemu/telephony/sim_card.c, in asimcard_io()
+  is(iccInfo.msisdn, "15555215554");
+
+  testDisplayConditionChange(testSPN, [
+    // [MCC, MNC, isDisplayNetworkNameRequired, isDisplaySpnRequired]
+    [123, 456, false, true], // Not in HPLMN.
+    [234, 136,  true, true], // Not in HPLMN, but in PLMN specified in SPDI.
+    [123, 456, false, true], // Not in HPLMN. Triggering iccinfochange
+    [466,  92,  true, true], // Not in HPLMN, but in another PLMN specified in SPDI.
+    [123, 456, false, true], // Not in HPLMN. Triggering iccinfochange
+    [310, 260,  true, true], // inside HPLMN.
+  ], finalize);
+};
+document.body.appendChild(ifr);
 
 let emulatorCmdPendingCount = 0;
 function sendEmulatorCommand(cmd, callback) {
@@ -39,21 +72,6 @@ function finalize() {
   finish();
 }
 
-let iccInfo = icc.iccInfo;
-
-// The emulator's hard coded iccid value.
-// See it here {B2G_HOME}/external/qemu/telephony/sim_card.c#L299.
-is(iccInfo.iccid, 89014103211118510720);
-
-// The emulator's hard coded mcc and mnc codes.
-// See it here {B2G_HOME}/external/qemu/telephony/android_modem.c#L2465.
-is(iccInfo.mcc, 310);
-is(iccInfo.mnc, 260);
-is(iccInfo.spn, "Android");
-// Phone number is hardcoded in MSISDN
-// See {B2G_HOME}/external/qemu/telephony/sim_card.c, in asimcard_io()
-is(iccInfo.msisdn, "15555215554");
-
 // Test display condition change.
 function testDisplayConditionChange(func, caseArray, oncomplete) {
   (function do_call(index) {
@@ -75,13 +93,3 @@ function testSPN(mcc, mnc, expectedIsDisplayNetworkNameRequired,
   });
   setEmulatorMccMnc(mcc, mnc);
 }
-
-testDisplayConditionChange(testSPN, [
-  // [MCC, MNC, isDisplayNetworkNameRequired, isDisplaySpnRequired]
-  [123, 456, false, true], // Not in HPLMN.
-  [234, 136,  true, true], // Not in HPLMN, but in PLMN specified in SPDI.
-  [123, 456, false, true], // Not in HPLMN. Triggering iccinfochange
-  [466,  92,  true, true], // Not in HPLMN, but in another PLMN specified in SPDI.
-  [123, 456, false, true], // Not in HPLMN. Triggering iccinfochange
-  [310, 260,  true, true], // inside HPLMN.
-], finalize);

dom/media/tests/crashtests/802982.html

@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=802982
   function boom()
   {
     for (var j = 0; j < 100; ++j) {
-      navigator.mozGetUserMedia({}, {}, {});
+      navigator.mozGetUserMedia({}, function(){}, function(){});
     }
     finish(); // we're not waiting for success/error callbacks here
   }

dom/media/tests/mochitest/test_getUserMedia_exceptions.html

@@ -26,26 +26,26 @@ var exceptionTests = [
   // Each test here verifies that a caller is required to have all
   // three arguments in order to call mozGetUserMedia
   { params: undefined,
-    error: Cr.NS_ERROR_XPC_NOT_ENOUGH_ARGS,
+    error: "Not enough arguments to Navigator.mozGetUserMedia.",
     message: "no arguments specified" },
   { params: [{video: true, fake: true}],
-    error: Cr.NS_ERROR_XPC_NOT_ENOUGH_ARGS,
+    error: "Not enough arguments to Navigator.mozGetUserMedia.",
     message: "one argument specified" },
   { params: [{video: true, fake: true}, unexpectedCall],
-    error: Cr.NS_ERROR_XPC_NOT_ENOUGH_ARGS,
+    error: "Not enough arguments to Navigator.mozGetUserMedia.",
     message: "two arguments specified" },
 
   // Each test here verifies that providing an incorret object
   // type to any mozGetUserMedia parameter should throw
   // the correct exception specified
   { params: [1, unexpectedCall, unexpectedCall],
-    error: Cr.NS_ERROR_XPC_BAD_CONVERT_JS,
+    error: "Argument 1 of Navigator.mozGetUserMedia is not an object.",
     message: "wrong object type as first parameter" },
   { params: [{video: true, fake: true}, 1, unexpectedCall],
-    error: Cr.NS_ERROR_XPC_BAD_CONVERT_JS,
+    error: "Argument 2 of Navigator.mozGetUserMedia is not an object.",
     message: "wrong object type as second parameter" },
   { params: [{video: true, fake: true}, unexpectedCall, 1],
-    error: Cr.NS_ERROR_XPC_BAD_CONVERT_JS,
+    error: "Argument 3 of Navigator.mozGetUserMedia is not an object.",
     message: "wrong object type as third parameter" }
 ];
 
@@ -71,7 +71,7 @@ runTest(function () {
     try {
       navigator.mozGetUserMedia.apply(navigator, test.params);
     } catch (e) {
-      exception = (e.result === test.error);
+      exception = (e.message === test.error);
     }
     ok(exception, "Exception for " + test.message);
   });

dom/mobilemessage/tests/test_sms_basics.html

@@ -16,8 +16,9 @@
 /** Test for WebSMS **/
 
 function checkSmsDisabled() {
-  ok('mozSms' in frames[0].navigator, "navigator.mozSms should exist");
-  is(frames[0].navigator.mozSms, null, "navigator.mozSms should return null");
+  ok(!('mozSms' in frames[0].navigator), "navigator.mozSms should not exist");
+  ok(frames[0].navigator.mozSms === undefined,
+     "navigator.mozSms should return undefined");
 }
 
 function checkSmsEnabled() {

dom/network/tests/marionette/test_call_barring_get_option.js

@@ -5,9 +5,19 @@ MARIONETTE_TIMEOUT = 60000;
 
 SpecialPowers.addPermission("mobileconnection", true, document);
 
-let connection = navigator.mozMobileConnection;
-ok(connection instanceof MozMobileConnection,
-   "connection is instanceof " + connection.constructor);
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let connection;
+ifr.onload = function() {
+  connection = ifr.contentWindow.navigator.mozMobileConnection;
+
+  ok(connection instanceof ifr.contentWindow.MozMobileConnection,
+     "connection is instanceof " + connection.constructor);
+
+  testGetCallBarringOption();
+};
+document.body.appendChild(ifr);
 
 function testGetCallBarringOption() {
   let option = {'program': 0, 'password': '', 'serviceClass': 0};
@@ -27,5 +37,3 @@ function cleanUp() {
   SpecialPowers.removePermission("mobileconnection", document);
   finish();
 }
-
-testGetCallBarringOption();

dom/network/tests/marionette/test_call_barring_set_error.js

@@ -5,9 +5,19 @@ MARIONETTE_TIMEOUT = 60000;
 
 SpecialPowers.addPermission("mobileconnection", true, document);
 
-let connection = navigator.mozMobileConnection;
-ok(connection instanceof MozMobileConnection,
-   "connection is instanceof " + connection.constructor);
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let connection;
+ifr.onload = function() {
+  connection = ifr.contentWindow.navigator.mozMobileConnection;
+
+  ok(connection instanceof ifr.contentWindow.MozMobileConnection,
+     "connection is instanceof " + connection.constructor);
+
+  nextTest();
+};
+document.body.appendChild(ifr);
 
 let caseId = 0;
 let options = [
@@ -61,5 +71,3 @@ function cleanUp() {
   SpecialPowers.removePermission("mobileconnection", document);
   finish();
 }
-
-nextTest();

dom/network/tests/marionette/test_mobile_data_location.js

@@ -5,7 +5,18 @@ MARIONETTE_TIMEOUT = 20000;
 
 SpecialPowers.addPermission("mobileconnection", true, document);
 
-let mobileConnection = navigator.mozMobileConnection;
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let mobileConnection;
+ifr.onload = function() {
+  mobileConnection = ifr.contentWindow.navigator.mozMobileConnection;
+
+  // Start the test
+  verifyInitialState();
+};
+document.body.appendChild(ifr);
+
 let emulatorStartLac = 0;
 let emulatorStartCid = 0;
 
@@ -114,6 +125,3 @@ function cleanUp() {
   SpecialPowers.removePermission("mobileconnection", document);
   finish();
 }
-
-// Start the test
-verifyInitialState();

dom/network/tests/marionette/test_mobile_data_state.js

@@ -5,7 +5,17 @@ MARIONETTE_TIMEOUT = 30000;
 
 SpecialPowers.addPermission("mobileconnection", true, document);
 
-let mobileConnection = navigator.mozMobileConnection;
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let mobileConnection;
+ifr.onload = function() {
+  mobileConnection = ifr.contentWindow.navigator.mozMobileConnection;
+
+  // Start the test
+  verifyInitialState();
+};
+document.body.appendChild(ifr);
 
 function verifyInitialState() {
   log("Verifying initial state.");
@@ -116,6 +126,3 @@ function cleanUp() {
   SpecialPowers.removePermission("mobileconnection", document);
   finish();
 }
-
-// Start the test
-verifyInitialState();

dom/network/tests/marionette/test_mobile_mmi.js

@@ -5,7 +5,16 @@ MARIONETTE_TIMEOUT = 20000;
 
 SpecialPowers.addPermission("mobileconnection", true, document);
 
-let mobileConnection = navigator.mozMobileConnection;
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let mobileConnection;
+ifr.onload = function() {
+  mobileConnection = ifr.contentWindow.navigator.mozMobileConnection;
+
+  tasks.run();
+};
+document.body.appendChild(ifr);
 
 let tasks = {
   // List of test functions. Each of them should call |tasks.next()| when
@@ -43,7 +52,7 @@ let tasks = {
 tasks.push(function verifyInitialState() {
   log("Verifying initial state.");
 
-  ok(mobileConnection instanceof MozMobileConnection,
+  ok(mobileConnection instanceof ifr.contentWindow.MozMobileConnection,
       "mobileConnection is instanceof " + mobileConnection.constructor);
 
   tasks.next();
@@ -77,5 +86,3 @@ tasks.push(function cleanUp() {
   SpecialPowers.removePermission("mobileconnection", document);
   finish();
 });
-
-tasks.run();

dom/network/tests/marionette/test_mobile_operator_names.js

@@ -8,15 +8,28 @@ SpecialPowers.addPermission("mobileconnection", true, document);
 const OPERATOR_HOME = 0;
 const OPERATOR_ROAMING = 1;
 
-let connection = navigator.mozMobileConnection;
-ok(connection instanceof MozMobileConnection,
-   "connection is instanceof " + connection.constructor);
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let connection;
+let voice;
+let network;
+ifr.onload = function() {
+  connection = ifr.contentWindow.navigator.mozMobileConnection;
+  ok(connection instanceof ifr.contentWindow.MozMobileConnection,
+     "connection is instanceof " + connection.constructor);
 
-let voice = connection.voice;
-ok(voice, "voice connection valid");
+  voice = connection.voice;
+  ok(voice, "voice connection valid");
 
-let network = voice.network;
-ok(network, "voice network info valid");
+  network = voice.network;
+  ok(network, "voice network info valid");
+
+  waitFor(testMobileOperatorNames, function () {
+    return voice.connected;
+  });
+};
+document.body.appendChild(ifr);
 
 let emulatorCmdPendingCount = 0;
 function sendEmulatorCommand(cmd, callback) {
@@ -203,7 +216,3 @@ function cleanUp() {
   SpecialPowers.removePermission("mobileconnection", document);
   finish();
 }
-
-waitFor(testMobileOperatorNames, function () {
-  return voice.connected;
-});

dom/network/tests/marionette/test_mobile_voice_state.js

@@ -5,9 +5,17 @@ MARIONETTE_TIMEOUT = 30000;
 
 SpecialPowers.addPermission("mobileconnection", true, document);
 
-let connection = navigator.mozMobileConnection;
-ok(connection instanceof MozMobileConnection,
-   "connection is instanceof " + connection.constructor);
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let connection;
+ifr.onload = function() {
+  connection = ifr.contentWindow.navigator.mozMobileConnection;
+  ok(connection instanceof ifr.contentWindow.MozMobileConnection,
+     "connection is instanceof " + connection.constructor);
+  testConnectionInfo();
+};
+document.body.appendChild(ifr);
 
 let emulatorCmdPendingCount = 0;
 function setEmulatorVoiceState(state) {
@@ -149,5 +157,3 @@ function cleanUp() {
   SpecialPowers.removePermission("mobileconnection", document);
   finish();
 }
-
-testConnectionInfo();

dom/telephony/test/marionette/test_outgoing_emergency_in_airplane_mode.js

@@ -8,10 +8,19 @@ const KEY = "ril.radio.disabled";
 SpecialPowers.addPermission("telephony", true, document);
 SpecialPowers.addPermission("settings-write", true, document);
 
-let settings = window.navigator.mozSettings;
-let telephony = window.navigator.mozTelephony;
+// Permission changes can't change existing Navigator.prototype
+// objects, so grab our objects from a new Navigator
+let ifr = document.createElement("iframe");
+let settings;
+let telephony;
 let number = "112";
 let outgoing;
+ifr.onload = function() {
+  settings = ifr.contentWindow.navigator.mozSettings;
+  telephony = ifr.contentWindow.navigator.mozTelephony;
+  getExistingCalls();
+};
+document.body.appendChild(ifr);
 
 function getExistingCalls() {
   runEmulatorCmd("gsm list", function(result) {
@@ -155,5 +164,3 @@ function cleanUp() {
   SpecialPowers.removePermission("settings-write", document);
   finish();
 }
-
-getExistingCalls();

dom/tests/mochitest/general/test_idleapi_permissions.html

@@ -17,23 +17,28 @@ var idleObserver = {
   onactive: null
 };
 
+function doAddIdleObserver(obs) {
+  var i = document.createElement("iframe");
+  document.body.appendChild(i);
+  var added = false;
+  try {
+    i.contentWindow.navigator.addIdleObserver(obs);
+    added = true;
+  } catch (e) { }
+  i.remove();
+  return added;
+}
+
 function run_test() {
   // addIdleObserver checks whether time is > 0.
   this.idleObserver.time = 100;
 
-  var added = false;
-  try {
-    navigator.addIdleObserver(this.idleObserver);
-    added = true;
-  } catch (e) { }
+  var added = doAddIdleObserver(this.idleObserver, false);
   ok(!added, "Should not be able to add idle observer without permission");
   
   SpecialPowers.addPermission("idle", true, document);
-  added = false;
-  try {
-    navigator.addIdleObserver(this.idleObserver);
-    added = true;
-  } catch (e) { }
+
+  added = doAddIdleObserver(this.idleObserver, true);
   ok(added, "Should be able to add idle observer with permission.");
   
   SimpleTest.finish();

dom/tests/mochitest/general/test_vibrator.html

@@ -35,12 +35,12 @@ function expectSuccess(param) {
 }
 
 function testFailures() {
-  expectFailure(null);
-  expectFailure(undefined);
+  expectSuccess(null);
+  expectSuccess(undefined);
   expectFailure(-1);
-  expectFailure('a');
+  expectSuccess('a');
   expectFailure([100, -1]);
-  expectFailure([100, 'a']);
+  expectSuccess([100, 'a']);
 
   var maxVibrateMs = SpecialPowers.getIntPref('dom.vibrator.max_vibrate_ms');
   var maxVibrateListLen = SpecialPowers.getIntPref('dom.vibrator.max_vibrate_list_len');

js/xpconnect/tests/chrome/test_weakmaps.xul

@@ -221,13 +221,17 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=668855
 
     let dummy_test_map = new WeakMap;
 
-    let navi_fail = false;
+    let rule_fail = false;
+    let got_rule = false;
     try {
-      dummy_test_map.set(window.navigator, 1);
+      var rule = document.styleSheets[0].cssRules[0];
+      got_rule = true;
+      dummy_test_map.set(rule, 1);
     } catch (e) {
-      navi_fail = true;
+      rule_fail = true;
     }
-    ok(navi_fail, "Using window.navigator as a weak map key should produce an exception because it can't be wrapper preserved.");
+    ok(got_rule, "Got the CSS rule");
+    ok(rule_fail, "Using a CSS rule as a weak map key should produce an exception because it can't be wrapper preserved.");
 
   }
 

js/xpconnect/tests/mochitest/file_crosscompartment_weakmap.html

@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <link rel="stylesheet" href="data:text/css,div {}">
   <title>Test Cross-Compartment DOM WeakMaps</title>
 </head>
 <body>

js/xpconnect/tests/mochitest/test_crosscompartment_weakmap.html

@@ -16,13 +16,13 @@ function setup() {
 
   my_map.set(item, "success_string");
 
-  var navi_fail = false;
+  var rule_fail = false;
   try {
-    my_map.set(window.frames[0].navigator, 1);
+    my_map.set(window.frames[0].document.styleSheets[0].cssRules[0], 1);
   } catch (e) {
-    navi_fail = true;
+    rule_fail = true;
   }
-  ok(navi_fail, "Using window.navigator as a weak map key across compartments should produce an exception because it can't be wrapper preserved.");
+  ok(rule_fail, "Using rule as a weak map key across compartments should produce an exception because it can't be wrapper preserved.");
 }
 
 function runTest() {