Backed out changesets e8202e140fd8 and b1cd489945f5 (bug 844328) for mochitest-bc orange on a CLOSED TREE.

browser/devtools/shared/Browser.jsm

@@ -20,9 +20,73 @@ this.EXPORTED_SYMBOLS = [ "Node", "HTMLElement", "setTimeout", "clearTimeout" ];
 this.Node = Components.interfaces.nsIDOMNode;
 this.HTMLElement = Components.interfaces.nsIDOMHTMLElement;
 
-/*
- * Import and re-export the timeout functions from Timer.jsm.
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+/**
+ * The next value to be returned by setTimeout
  */
-let Timer = Components.utils.import("resource://gre/modules/Timer.jsm", {});
-this.setTimeout = Timer.setTimeout;
-this.clearTimeout = Timer.clearTimeout;
+let nextID = 1;
+
+/**
+ * The map of outstanding timeouts
+ */
+const timers = {};
+
+/**
+ * Object to be passed to Timer.initWithCallback()
+ */
+function TimerCallback(callback) {
+  this._callback = callback;
+  const interfaces = [ Components.interfaces.nsITimerCallback ];
+  this.QueryInterface = XPCOMUtils.generateQI(interfaces);
+}
+
+TimerCallback.prototype.notify = function(timer) {
+  try {
+    for (let timerID in timers) {
+      if (timers[timerID] === timer) {
+        delete timers[timerID];
+        break;
+      }
+    }
+    this._callback.apply(null, []);
+  }
+  catch (ex) {
+    dump(ex +  '\n');
+  }
+};
+
+/**
+ * Executes a code snippet or a function after specified delay.
+ * This is designed to have the same interface contract as the browser
+ * function.
+ * @param callback is the function you want to execute after the delay.
+ * @param delay is the number of milliseconds that the function call should
+ * be delayed by. Note that the actual delay may be longer, see Notes below.
+ * @return the ID of the timeout, which can be used later with
+ * window.clearTimeout.
+ */
+this.setTimeout = function setTimeout(callback, delay) {
+  const timer = Components.classes["@mozilla.org/timer;1"]
+                        .createInstance(Components.interfaces.nsITimer);
+
+  let timerID = nextID++;
+  timers[timerID] = timer;
+
+  timer.initWithCallback(new TimerCallback(callback), delay, timer.TYPE_ONE_SHOT);
+  return timerID;
+};
+
+/**
+ * Clears the delay set by window.setTimeout() and prevents the callback from
+ * being executed (if it hasn't been executed already)
+ * @param timerID the ID of the timeout you wish to clear, as returned by
+ * window.setTimeout().
+ */
+this.clearTimeout = function clearTimeout(timerID) {
+  let timer = timers[timerID];
+  if (timer) {
+    timer.cancel();
+    delete timers[timerID];
+  }
+};

browser/devtools/shared/test/browser_browser_basic.js

@@ -19,8 +19,19 @@ function test() {
 }
 
 function runTest(browser, tab, document) {
+  let timeout = imported.setTimeout(shouldNotBeCalled, 100);
+  imported.clearTimeout(timeout);
+
   var p = document.getElementById("id");
 
   ok(p instanceof imported.Node, "Node correctly defined");
   ok(p instanceof imported.HTMLElement, "HTMLElement correctly defined");
+
+  let timeout = imported.setTimeout(function() {
+    finish();
+  }, 100);
+}
+
+function shouldNotBeCalled() {
+  ok(false, "Timeout cleared");
 }

browser/metro/base/content/input.js

@@ -219,7 +219,7 @@ var TouchModule = {
     this._targetScrollInterface = targetScrollInterface;
 
     if (!this._targetScrollbox) {
-      return;
+      return false;
     }
 
     // XXX shouldn't dragger always be valid here?

layout/tools/reftest/reftest-content.js

@@ -7,7 +7,40 @@
 const CC = Components.classes;
 const CI = Components.interfaces;
 const CR = Components.results;
-const CU = Components.utils;
+
+/**
+ * FIXME/bug 622224: work around lack of reliable setTimeout available
+ * to frame scripts.
+ */
+// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4
+// days.  Should be fine as a temporary workaround.
+var gNextTimeoutId = 0;
+var gTimeoutTable = { };        // int -> nsITimer
+
+function setTimeout(callbackFn, delayMs) {
+    var id = gNextTimeoutId++;
+    var timer = CC["@mozilla.org/timer;1"].createInstance(CI.nsITimer);
+    timer.initWithCallback({
+        notify: function notify_callback() {
+                    clearTimeout(id);
+                    callbackFn();
+                }
+        },
+        delayMs,
+        timer.TYPE_ONE_SHOT);
+
+    gTimeoutTable[id] = timer;
+
+    return id;
+}
+
+function clearTimeout(id) {
+    var timer = gTimeoutTable[id];
+    if (timer) {
+        timer.cancel();
+        delete gTimeoutTable[id];
+    }
+}
 
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 
@@ -17,8 +50,6 @@ const PRINTSETTINGS_CONTRACTID = "@mozilla.org/gfx/printsettings-service;1";
 // "<!--CLEAR-->"
 const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
-CU.import("resource://gre/modules/Timer.jsm");
-
 var gBrowserIsRemote;
 var gHaveCanvasSnapshot = false;
 // Plugin layers can be updated asynchronously, so to make sure that all

toolkit/modules/Makefile.in

@@ -15,7 +15,6 @@ EXTRA_JS_MODULES := \
   NewTabUtils.jsm \
   Sqlite.jsm \
   TelemetryTimestamps.jsm \
-  Timer.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

toolkit/modules/Timer.jsm

@@ -1,41 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-/**
- * JS module implementation of nsIDOMJSWindow.setTimeout and clearTimeout.
- */
-
-this.EXPORTED_SYMBOLS = ["setTimeout", "clearTimeout"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
-let gNextTimeoutId = 1; // setTimeout must return a positive integer
-
-let gTimeoutTable = new Map(); // int -> nsITimer
-
-function setTimeout(aCallback, aMilliseconds) {
-  let id = gNextTimeoutId++;
-  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-  timer.initWithCallback(function setTimeout_timer() {
-    gTimeoutTable.delete(id);
-    aCallback();
-  }, aMilliseconds, timer.TYPE_ONE_SHOT);
-
-  gTimeoutTable.set(id, timer);
-  return id;
-}
-
-function clearTimeout(aId) {
-  if (gTimeoutTable.has(aId)) {
-    gTimeoutTable.get(aId).cancel();
-    gTimeoutTable.delete(aId);
-  }
-}

toolkit/modules/tests/xpcshell/test_timer.js

@@ -1,28 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Tests exports from Timer.jsm
-
-let imported = {};
-Components.utils.import("resource://gre/modules/Timer.jsm", imported);
-
-function run_test(browser, tab, document) {
-  do_test_pending();
-
-  let timeout1 = imported.setTimeout(function() do_throw("Should not be called"), 100);
-  do_check_eq(typeof timeout1, "number", "setTimeout returns a number");
-  do_check_true(timeout1 > 0, "setTimeout returns a positive number");
-
-  let timeout2 = imported.setTimeout(function() {
-    do_check_true(true, "Should be called");
-    do_test_finished();
-  }, 100);
-
-  do_check_eq(typeof timeout2, "number", "setTimeout returns a number");
-  do_check_true(timeout2 > 0, "setTimeout returns a positive number");
-  do_check_neq(timeout1, timeout2, "Calling setTimeout again returns a different value");
-
-  imported.clearTimeout(timeout1);
-}

toolkit/modules/tests/xpcshell/xpcshell.ini

@@ -5,4 +5,3 @@ tail =
 [test_newtab-migrate-v1.js]
 [test_sqlite.js]
 [test_TelemetryTimestamps.js]
-[test_timer.js]