merge fx-team to mozilla-central

addon-sdk/source/lib/sdk/content/content.js

@@ -4,10 +4,16 @@
 "use strict";
 
 module.metadata = {
-  "stability": "unstable"
+  "stability": "deprecated"
 };
 
-exports.Loader = require('./loader').Loader;
-exports.Symbiont = require('../deprecated/symbiont').Symbiont;
-exports.Worker = require('./worker').Worker;
+const { deprecateFunction } = require('../util/deprecate');
+
+exports.Loader = deprecateFunction(require('./loader').Loader,
+  '`sdk/content/content` is deprecated. Please use `sdk/content/loader` directly.');
+exports.Symbiont = deprecateFunction(require('../deprecated/symbiont').Symbiont,
+  'Both `sdk/content/content` and `sdk/deprecated/symbiont` are deprecated. ' +
+  '`sdk/core/heritage` supersedes Symbiont for inheritance.');
+exports.Worker = deprecateFunction(require('./worker').Worker,
+  '`sdk/content/content` is deprecated. Please use `sdk/content/worker` directly.');
 

addon-sdk/source/lib/sdk/widget.js

@@ -45,7 +45,8 @@ const panels = require("./panel");
 const { EventEmitter, EventEmitterTrait } = require("./deprecated/events");
 const { Trait } = require("./deprecated/traits");
 const LightTrait = require('./deprecated/light-traits').Trait;
-const { Loader, Symbiont } = require("./content/content");
+const { Loader } = require("./content/loader");
+const { Symbiont } = require("./deprecated/symbiont");
 const { Cortex } = require('./deprecated/cortex');
 const windowsAPI = require("./windows");
 const { WindowTracker } = require("./deprecated/window-utils");

addon-sdk/source/python-lib/cuddlefish/runner.py

@@ -757,6 +757,11 @@ def run_app(harness_root_dir, manifest_rdf, harness_options,
         raise
     else:
         runner.wait(10)
+        # double kill - hack for bugs 942111, 1006043..
+        try:
+            runner.stop()
+        except:
+            pass
     finally:
         outf.close()
         if profile:

addon-sdk/source/test/addons/private-browsing-supported/test-windows.js

@@ -94,7 +94,7 @@ exports.testSettingActiveWindowDoesNotIgnorePrivateWindow = function(assert, don
     // PWPB case
     if (isWindowPBSupported) {
       assert.ok(isPrivate(window), "window is private");
-      assert.notDeepEqual(winUtils.activeBrowserWindow, browserWindow);
+      assert.notStrictEqual(winUtils.activeBrowserWindow, browserWindow);
     }
     // Global case
     else {
@@ -131,19 +131,19 @@ exports.testSettingActiveWindowDoesNotIgnorePrivateWindow = function(assert, don
         continueAfterFocus(winUtils.activeWindow = window);
       },
       function() {
-        assert.deepEqual(winUtils.activeBrowserWindow, window,
-                         "Correct active browser window [3]");
-        assert.deepEqual(winUtils.activeWindow, window,
-                         "Correct active window [3]");
+        assert.strictEqual(winUtils.activeBrowserWindow, window,
+                          "Correct active browser window [3]");
+        assert.strictEqual(winUtils.activeWindow, window,
+                          "Correct active window [3]");
 
         // just to get back to original state
         continueAfterFocus(winUtils.activeWindow = browserWindow);
       },
       function() {
-        assert.deepEqual(winUtils.activeBrowserWindow, browserWindow,
-                         "Correct active browser window when pb mode is supported [4]");
-        assert.deepEqual(winUtils.activeWindow, browserWindow,
-                         "Correct active window when pb mode is supported [4]");
+        assert.strictEqual(winUtils.activeBrowserWindow, browserWindow,
+                          "Correct active browser window when pb mode is supported [4]");
+        assert.strictEqual(winUtils.activeWindow, browserWindow,
+                          "Correct active window when pb mode is supported [4]");
 
         close(window).then(done).then(null, assert.fail);
       }

addon-sdk/source/test/test-window-utils-private-browsing.js

@@ -95,7 +95,7 @@ exports.testSettingActiveWindowDoesNotIgnorePrivateWindow = function(assert, don
     // PWPB case
     if (isWindowPBSupported) {
       assert.ok(isPrivate(window), "window is private");
-      assert.notDeepEqual(windowUtils.activeBrowserWindow, browserWindow);
+      assert.notStrictEqual(windowUtils.activeBrowserWindow, browserWindow);
     }
     // Global case
     else {
@@ -127,18 +127,18 @@ exports.testSettingActiveWindowDoesNotIgnorePrivateWindow = function(assert, don
       // test setting a private window
       return onFocus(windowUtils.activeWindow = window);
     }).then(function() {
-      assert.deepEqual(windowUtils.activeBrowserWindow, window,
-                       "Correct active browser window [3]");
-      assert.deepEqual(windowUtils.activeWindow, window,
-                       "Correct active window [3]");
+      assert.strictEqual(windowUtils.activeBrowserWindow, window,
+                         "Correct active browser window [3]");
+      assert.strictEqual(windowUtils.activeWindow, window,
+                         "Correct active window [3]");
 
       // just to get back to original state
       return onFocus(windowUtils.activeWindow = browserWindow);
     }).then(_ => {
-      assert.deepEqual(windowUtils.activeBrowserWindow, browserWindow,
-                       "Correct active browser window when pb mode is supported [4]");
-      assert.deepEqual(windowUtils.activeWindow, browserWindow,
-                       "Correct active window when pb mode is supported [4]");
+      assert.strictEqual(windowUtils.activeBrowserWindow, browserWindow,
+                         "Correct active browser window when pb mode is supported [4]");
+      assert.strictEqual(windowUtils.activeWindow, browserWindow,
+                         "Correct active window when pb mode is supported [4]");
 
       return close(window);
     })

browser/base/content/browser-syncui.js

@@ -13,6 +13,7 @@ let gSyncUI = {
          "weave:service:login:finish",
          "weave:service:logout:finish",
          "weave:service:start-over",
+         "weave:service:start-over:finish",
          "weave:ui:login:error",
          "weave:ui:sync:error",
          "weave:ui:sync:finish",
@@ -506,6 +507,9 @@ let gSyncUI = {
       case "weave:service:start-over":
         this.onStartOver();
         break;
+      case "weave:service:start-over:finish":
+        this.updateUI();
+        break;
       case "weave:service:ready":
         this.initUI();
         break;

browser/base/content/content.js

@@ -3,9 +3,7 @@
  * 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/. */
 
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
+let {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -453,8 +451,11 @@ let TranslationHandler = {
 
   /* nsIWebProgressListener implementation */
   onStateChange: function(aWebProgress, aRequest, aStateFlags, aStatus) {
+    // Don't bother if we're not a toplevel document, if this isn't the 'stop'
+    // notification, or if the content document has gone away
     if (!aWebProgress.isTopLevel ||
-        !(aStateFlags & Ci.nsIWebProgressListener.STATE_STOP))
+        !(aStateFlags & Ci.nsIWebProgressListener.STATE_STOP) ||
+        !content)
       return;
 
     let url = aRequest.name;

browser/base/content/test/general/browser_urlbar_search_healthreport.js

@@ -42,23 +42,49 @@ function test() {
       let tab = gBrowser.addTab();
       gBrowser.selectedTab = tab;
 
-      gURLBar.value = "firefox health report";
+      let searchStr = "firefox health report";
+      let expectedURL = Services.search.currentEngine.
+                        getSubmission(searchStr, "", "keyword").uri.spec;
+
+      // Expect the search URL to load but stop it as soon as it starts.
+      let loadPromise = waitForDocLoadAndStopIt(expectedURL);
+
+      // Meanwhile, poll for the new measurement.
+      let count = 0;
+      let measurementDeferred = Promise.defer();
+      function getNewMeasurement() {
+        if (count++ >= 10) {
+          ok(false, "Timed out waiting for new measurement");
+          measurementDeferred.resolve();
+          return;
+        }
+        m.getValues().then(function onData(data) {
+          if (data.days.hasDay(now)) {
+            let day = data.days.getDay(now);
+            if (day.has(field)) {
+              let newCount = day.get(field);
+              if (newCount > oldCount) {
+                is(newCount, oldCount + 1,
+                   "Exactly one search has been recorded.");
+                measurementDeferred.resolve();
+                return;
+              }
+            }
+          }
+          executeSoon(getNewMeasurement);
+        });
+      }
+      executeSoon(getNewMeasurement);
+
+      // Trigger the search.
+      gURLBar.value = searchStr;
       gURLBar.handleCommand();
 
-      executeSoon(() => executeSoon(() => {
+      // Wait for the page load and new measurement.
+      Promise.all([loadPromise, measurementDeferred.promise]).then(() => {
         gBrowser.removeTab(tab);
-
-        m.getValues().then(function onData(data) {
-          ok(data.days.hasDay(now), "FHR has data for today.");
-          let day = data.days.getDay(now);
-          ok(day.has(field), "FHR has url bar count for today.");
-
-          let newCount = day.get(field);
-
-          is(newCount, oldCount + 1, "Exactly one search has been recorded.");
-          finish();
-        });
-      }));
+        finish();
+      });
     });
   });
 }

browser/devtools/debugger/debugger-panes.js

@@ -944,7 +944,9 @@ SourcesView.prototype = Heritage.extend(WidgetMethods, {
    */
   _onCmdAddBreakpoint: function(e) {
     let url = DebuggerView.Sources.selectedValue;
-    let line = DebuggerView.editor.getCursor().line + 1;
+    let line = (e && e.sourceEvent.target.tagName == 'menuitem' ?
+                DebuggerView.clickedLine + 1 :
+                DebuggerView.editor.getCursor().line + 1);
     let location = { url: url, line: line };
     let breakpointItem = this.getBreakpoint(location);
 
@@ -961,9 +963,11 @@ SourcesView.prototype = Heritage.extend(WidgetMethods, {
   /**
    * Called when the add conditional breakpoint key sequence was pressed.
    */
-  _onCmdAddConditionalBreakpoint: function() {
+  _onCmdAddConditionalBreakpoint: function(e) {
     let url =  DebuggerView.Sources.selectedValue;
-    let line = DebuggerView.editor.getCursor().line + 1;
+    let line = (e && e.sourceEvent.target.tagName == 'menuitem' ?
+                DebuggerView.clickedLine + 1 :
+                DebuggerView.editor.getCursor().line + 1);
     let location = { url: url, line: line };
     let breakpointItem = this.getBreakpoint(location);
 

browser/devtools/debugger/debugger-view.js

@@ -236,11 +236,18 @@ let DebuggerView = {
       this._onEditorLoad(aCallback);
     });
 
-    this.editor.on("gutterClick", (ev, line) => {
-      if (this.editor.hasBreakpoint(line)) {
-        this.editor.removeBreakpoint(line);
-      } else {
-        this.editor.addBreakpoint(line);
+    this.editor.on("gutterClick", (ev, line, button) => {
+      // A right-click shouldn't do anything but keep track of where
+      // it was clicked.
+      if(button == 2) {
+        this.clickedLine = line;
+      }
+      else {
+        if (this.editor.hasBreakpoint(line)) {
+          this.editor.removeBreakpoint(line);
+        } else {
+          this.editor.addBreakpoint(line);
+        }
       }
     });
   },

browser/devtools/debugger/debugger.xul

@@ -67,9 +67,9 @@
     <command id="variablesFocusCommand"
              oncommand="DebuggerView.Filtering._doVariablesFocus()"/>
     <command id="addBreakpointCommand"
-             oncommand="DebuggerView.Sources._onCmdAddBreakpoint()"/>
+             oncommand="DebuggerView.Sources._onCmdAddBreakpoint(event)"/>
     <command id="addConditionalBreakpointCommand"
-             oncommand="DebuggerView.Sources._onCmdAddConditionalBreakpoint()"/>
+             oncommand="DebuggerView.Sources._onCmdAddConditionalBreakpoint(event)"/>
     <command id="addWatchExpressionCommand"
              oncommand="DebuggerView.WatchExpressions._onCmdAddExpression()"/>
     <command id="removeAllWatchExpressionsCommand"

browser/devtools/debugger/test/browser.ini

@@ -115,6 +115,7 @@ support-files =
 [browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js]
 [browser_dbg_breakpoints-button-01.js]
 [browser_dbg_breakpoints-button-02.js]
+[browser_dbg_breakpoints-contextmenu-add.js]
 [browser_dbg_breakpoints-contextmenu.js]
 [browser_dbg_breakpoints-disabled-reload.js]
 [browser_dbg_breakpoints-editor.js]

browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu-add.js

@@ -0,0 +1,96 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test adding breakpoints from the source editor context menu
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
+
+function test() {
+  let gTab, gDebuggee, gPanel, gDebugger;
+  let gEditor, gSources, gContextMenu, gBreakpoints, gBreakpointsAdded;
+
+  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+    gTab = aTab;
+    gDebuggee = aDebuggee;
+    gPanel = aPanel;
+    gDebugger = gPanel.panelWin;
+    gEditor = gDebugger.DebuggerView.editor;
+    gSources = gDebugger.DebuggerView.Sources;
+    gBreakpoints = gDebugger.DebuggerController.Breakpoints;
+    gBreakpointsAdded = gBreakpoints._added;
+    gContextMenu = gDebugger.document.getElementById("sourceEditorContextMenu");
+
+    waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1)
+      .then(performTest)
+      .then(() => resumeDebuggerThenCloseAndFinish(gPanel))
+      .then(null, aError => {
+        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
+      });
+
+    gDebuggee.firstCall();
+  });
+
+  function performTest() {
+    is(gDebugger.gThreadClient.state, "paused",
+       "Should only be getting stack frames while paused.");
+    is(gSources.itemCount, 2,
+       "Found the expected number of sources.");
+    isnot(gEditor.getText().indexOf("debugger"), -1,
+       "The correct source was loaded initially.");
+    is(gSources.selectedValue, gSources.values[1],
+       "The correct source is selected.");
+
+    ok(gContextMenu,
+       "The source editor's context menupopup is available.");
+
+    gEditor.focus();
+    gEditor.setSelection({ line: 1, ch: 0 }, { line: 1, ch: 10 });
+
+    return testAddBreakpoint().then(testAddConditionalBreakpoint);
+  }
+
+  function testAddBreakpoint() {
+    gContextMenu.openPopup(gEditor.container, "overlap", 0, 0, true, false);
+    gEditor.emit("gutterClick", 6, 2);
+
+    return once(gContextMenu, "popupshown").then(() => {
+      is(gBreakpointsAdded.size, 0, "no breakpoints added");
+
+      let cmd = gContextMenu.querySelector('menuitem[command=addBreakpointCommand]');
+      let bpShown = waitForDebuggerEvents(gPanel, gDebugger.EVENTS.BREAKPOINT_SHOWN);
+      EventUtils.synthesizeMouseAtCenter(cmd, {}, gDebugger);
+      return bpShown;
+    }).then(() => {
+      is(gBreakpointsAdded.size, 1,
+         "1 breakpoint correctly added");
+      is(gEditor.getBreakpoints().length, 1,
+         "1 breakpoint currently shown in the editor.");
+      ok(gBreakpoints._getAdded({ url: gSources.values[1], line: 7 }),
+         "Breakpoint on line 7 exists");
+    });
+  }
+
+  function testAddConditionalBreakpoint() {
+    gContextMenu.openPopup(gEditor.container, "overlap", 0, 0, true, false);
+    gEditor.emit("gutterClick", 7, 2);
+
+    return once(gContextMenu, "popupshown").then(() => {
+      is(gBreakpointsAdded.size, 1,
+         "1 breakpoint correctly added");
+
+      let cmd = gContextMenu.querySelector('menuitem[command=addConditionalBreakpointCommand]');
+      let bpShown = waitForDebuggerEvents(gPanel, gDebugger.EVENTS.CONDITIONAL_BREAKPOINT_POPUP_SHOWING);
+      EventUtils.synthesizeMouseAtCenter(cmd, {}, gDebugger);
+      return bpShown;
+    }).then(() => {
+      is(gBreakpointsAdded.size, 2,
+         "2 breakpoints correctly added");
+      is(gEditor.getBreakpoints().length, 2,
+         "2 breakpoints currently shown in the editor.");
+      ok(gBreakpoints._getAdded({ url: gSources.values[1], line: 8 }),
+         "Breakpoint on line 8 exists");
+    });
+  }
+}

browser/devtools/sourceeditor/editor.js

@@ -303,7 +303,7 @@ Editor.prototype = {
           return;
         }
 
-        this.emit("gutterClick", line);
+        this.emit("gutterClick", line, ev.button);
       });
 
       win.CodeMirror.defineExtension("l10n", (name) => {

browser/devtools/webaudioeditor/test/browser_wa_graph-click.js

@@ -6,10 +6,13 @@
  * the correct node in the InspectorView
  */
 
+let EVENTS = null;
+
 function spawnTest() {
   let [target, debuggee, panel] = yield initWebAudioEditor(COMPLEX_CONTEXT_URL);
   let panelWin = panel.panelWin;
-  let { gFront, $, $$, EVENTS, WebAudioInspectorView } = panelWin;
+  let { gFront, $, $$, WebAudioInspectorView } = panelWin;
+  EVENTS = panelWin.EVENTS;
 
   let started = once(gFront, "start-context");
 
@@ -24,30 +27,46 @@ function spawnTest() {
 
   ok(!WebAudioInspectorView.isVisible(), "InspectorView hidden on start.");
 
-  click(panel.panelWin, findGraphNode(panelWin, nodeIds[1]));
-  yield once(panelWin, EVENTS.UI_INSPECTOR_TOGGLED);
+  yield clickGraphNode(panelWin, nodeIds[1], true);
 
   ok(WebAudioInspectorView.isVisible(), "InspectorView visible after selecting a node.");
   is(WebAudioInspectorView.getCurrentNode().id, nodeIds[1], "InspectorView has correct node set.");
 
-  click(panel.panelWin, findGraphNode(panelWin, nodeIds[2]));
+  yield clickGraphNode(panelWin, nodeIds[2]);
+
   ok(WebAudioInspectorView.isVisible(), "InspectorView still visible after selecting another node.");
   is(WebAudioInspectorView.getCurrentNode().id, nodeIds[2], "InspectorView has correct node set on second node.");
 
-  click(panel.panelWin, findGraphNode(panelWin, nodeIds[2]));
+  yield clickGraphNode(panelWin, nodeIds[2]);
   is(WebAudioInspectorView.getCurrentNode().id, nodeIds[2], "Clicking the same node again works (idempotent).");
 
-  click(panel.panelWin, $("rect", findGraphNode(panelWin, nodeIds[3])));
+  yield clickGraphNode(panelWin, $("rect", findGraphNode(panelWin, nodeIds[3])));
   is(WebAudioInspectorView.getCurrentNode().id, nodeIds[3], "Clicking on a <rect> works as expected.");
 
-  click(panel.panelWin, $("tspan", findGraphNode(panelWin, nodeIds[4])));
+  yield clickGraphNode(panelWin, $("tspan", findGraphNode(panelWin, nodeIds[4])));
   is(WebAudioInspectorView.getCurrentNode().id, nodeIds[4], "Clicking on a <tspan> works as expected.");
 
+  ok(WebAudioInspectorView.isVisible(),
+    "InspectorView still visible after several nodes have been clicked.");
+
   yield teardown(panel);
   finish();
 }
 
-function isExpanded (view, index) {
-  let scope = view.getScopeAtIndex(index);
-  return scope.expanded;
+function clickGraphNode (panelWin, el, waitForToggle = false) {
+  let { promise, resolve } = Promise.defer();
+  let promises = [
+    once(panelWin, EVENTS.UI_INSPECTOR_NODE_SET)
+  ];
+
+  if (waitForToggle) {
+    promises.push(once(panelWin, EVENTS.UI_INSPECTOR_TOGGLED));
+  }
+
+  // Use `el` as the element if it is one, otherwise
+  // assume it's an ID and find the related graph node
+  let element = el.tagName ? el : findGraphNode(panelWin, el);
+  click(panelWin, element);
+
+  return Promise.all(promises);
 }

browser/devtools/webaudioeditor/webaudioeditor-view.js

@@ -232,7 +232,7 @@ let WebAudioGraphView = {
     if (!node)
       return;
 
-    window.emit(EVENTS.UI_SELECT_NODE, node.getAttribute('data-id'));
+    window.emit(EVENTS.UI_SELECT_NODE, node.getAttribute("data-id"));
   }
 };
 
@@ -256,7 +256,7 @@ let WebAudioInspectorView = {
 
     // Hide inspector view on startup
     this._inspectorPane.setAttribute("width", INSPECTOR_WIDTH);
-    this.toggleInspector(false);
+    this.toggleInspector({ visible: false, delayed: false, animated: false });
 
     this._onEval = this._onEval.bind(this);
     this._onNodeSelect = this._onNodeSelect.bind(this);
@@ -284,19 +284,23 @@ let WebAudioInspectorView = {
   /**
    * Toggles the visibility of the AudioNode Inspector.
    *
-   * @param boolean visible
-   *        A flag indicating whether or not the AudioNode Inspector should be shown.
+   * @param object visible
+   *        - visible: boolean indicating whether the panel should be shown or not
+   *        - animated: boolean indiciating whether the pane should be animated
+   *        - delayed: boolean indicating whether the pane's opening should wait
+   *                   a few cycles or not
+   *        - index: the index of the tab to be selected inside the inspector
    * @param number index
    *        Index of the tab that should be selected when shown.
    */
-  toggleInspector: function (visible, index) {
+  toggleInspector: function ({ visible, animated, delayed, index }) {
     let pane = this._inspectorPane;
     let button = this._inspectorPaneToggleButton;
 
     let flags = {
       visible: visible,
-      animated: true,
-      delayed: true,
+      animated: animated != null ? animated : true,
+      delayed: delayed != null ? delayed : true,
       callback: () => window.emit(EVENTS.UI_INSPECTOR_TOGGLED, visible)
     };
 
@@ -362,6 +366,9 @@ let WebAudioInspectorView = {
     this._propsView.empty();
     // Set current node to empty to load empty view
     this.setCurrentAudioNode();
+
+    // Reset AudioNode inspector and hide
+    this.toggleInspector({ visible: false, animated: false, delayed: false });
   },
 
   /**
@@ -457,14 +464,14 @@ let WebAudioInspectorView = {
     this.setCurrentAudioNode(getViewNodeById(id));
 
     // Ensure inspector is visible when selecting a new node
-    this.toggleInspector(true);
+    this.toggleInspector({ visible: true });
   },
 
   /**
    * Called when clicking on the toggling the inspector into view.
    */
   _onTogglePaneClick: function () {
-    this.toggleInspector(!this.isVisible());
+    this.toggleInspector({ visible: !this.isVisible() });
   },
 
   /**

browser/themes/linux/jar.mn

@@ -190,6 +190,7 @@ browser.jar:
   skin/classic/browser/devtools/controls@2x.png       (../shared/devtools/images/controls@2x.png)
 * skin/classic/browser/devtools/widgets.css           (devtools/widgets.css)
   skin/classic/browser/devtools/commandline-icon.png  (../shared/devtools/images/commandline-icon.png)
+  skin/classic/browser/devtools/commandline-icon@2x.png  (../shared/devtools/images/commandline-icon@2x.png)
   skin/classic/browser/devtools/command-paintflashing.png     (../shared/devtools/images/command-paintflashing.png)
   skin/classic/browser/devtools/command-paintflashing@2x.png  (../shared/devtools/images/command-paintflashing@2x.png)
   skin/classic/browser/devtools/command-responsivemode.png    (../shared/devtools/images/command-responsivemode.png)
@@ -210,6 +211,7 @@ browser.jar:
 * skin/classic/browser/devtools/webconsole.css                  (devtools/webconsole.css)
   skin/classic/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
   skin/classic/browser/devtools/webconsole.png                  (../shared/devtools/images/webconsole.png)
+  skin/classic/browser/devtools/webconsole@2x.png               (../shared/devtools/images/webconsole@2x.png)
   skin/classic/browser/devtools/commandline.css              (devtools/commandline.css)
   skin/classic/browser/devtools/markup-view.css       (../shared/devtools/markup-view.css)
   skin/classic/browser/devtools/editor-error.png       (../shared/devtools/images/editor-error.png)

browser/themes/linux/preferences/in-content/preferences.css

@@ -28,13 +28,6 @@ checkbox {
   -moz-box-align: center;
 }
 
-checkbox:hover::before,
-checkbox[checked]::before {
-  -moz-margin-end: -19px;
-  -moz-margin-start: 4px;
-  background-repeat: no-repeat;
-}
-
 radio {
   -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
   -moz-box-align: center;
@@ -45,12 +38,6 @@ radio {
   -moz-appearance: none;
 }
 
-radio:hover::before,
-radio[selected]::before {
-  -moz-margin-end: -17px;
-  -moz-margin-start: 6px;
-}
-
 .numberbox-input-box {
   -moz-appearance: none;
   border-width: 0;

browser/themes/osx/jar.mn

@@ -311,6 +311,7 @@ browser.jar:
   skin/classic/browser/devtools/controls@2x.png             (../shared/devtools/images/controls@2x.png)
 * skin/classic/browser/devtools/widgets.css                 (devtools/widgets.css)
   skin/classic/browser/devtools/commandline-icon.png        (../shared/devtools/images/commandline-icon.png)
+  skin/classic/browser/devtools/commandline-icon@2x.png     (../shared/devtools/images/commandline-icon@2x.png)
   skin/classic/browser/devtools/command-paintflashing.png     (../shared/devtools/images/command-paintflashing.png)
   skin/classic/browser/devtools/command-paintflashing@2x.png  (../shared/devtools/images/command-paintflashing@2x.png)
   skin/classic/browser/devtools/command-responsivemode.png    (../shared/devtools/images/command-responsivemode.png)
@@ -336,6 +337,7 @@ browser.jar:
 * skin/classic/browser/devtools/webconsole.css                  (devtools/webconsole.css)
   skin/classic/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
   skin/classic/browser/devtools/webconsole.png                  (../shared/devtools/images/webconsole.png)
+  skin/classic/browser/devtools/webconsole@2x.png               (../shared/devtools/images/webconsole@2x.png)
   skin/classic/browser/devtools/breadcrumbs-divider@2x.png      (../shared/devtools/images/breadcrumbs-divider@2x.png)
   skin/classic/browser/devtools/breadcrumbs-scrollbutton.png    (../shared/devtools/images/breadcrumbs-scrollbutton.png)
   skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)

browser/themes/osx/preferences/in-content/preferences.css

@@ -14,18 +14,6 @@ menulist:not([editable="true"]) > .menulist-dropmarker {
   -moz-margin-start: 0;
 }
 
-checkbox:hover::before,
-checkbox[checked]::before {
-  -moz-margin-end: -20px;
-  -moz-margin-start: 5px;
-}
-
-radio:hover::before,
-radio[selected]::before {
-  -moz-margin-end: -18px;
-  -moz-margin-start: 7px;
-}
-
 .numberbox-input-box {
   -moz-appearance: none;
   border-width: 0;

browser/themes/shared/devtools/webconsole.inc.css

@@ -34,16 +34,30 @@ a {
 }
 
 .message > .icon {
-  background: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 0, 1, 0, 0) no-repeat;
-  background-position: center;
   flex: 0 0 auto;
   margin: 3px 6px 0 0;
   padding: 0 4px;
-  width: 8px;
   height: 1em;
   align-self: flex-start;
 }
 
+.message > .icon::before {
+  content: "";
+  background-image: url(chrome://browser/skin/devtools/webconsole.png);
+  background-position: 8px 8px;
+  background-repeat: no-repeat;
+  background-size: 48px 40px;
+  width: 8px;
+  height: 8px;
+  display: inline-block;
+}
+
+@media (min-resolution: 2dppx) {
+  .message > .icon::before {
+    background-image: url(chrome://browser/skin/devtools/webconsole@2x.png);
+  }
+}
+
 .message > .message-body-wrapper {
   flex: 1 1 100%;
   margin: 3px;
@@ -209,8 +223,8 @@ a {
   -moz-border-end: solid #000 6px;
 }
 
-.message[category=network][severity=error] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 0, 16, 8, 8);
+.message[category=network][severity=error] > .icon::before {
+  background-position: -8px 0;
 }
 
 .message[category=network] > .message-body {
@@ -255,12 +269,12 @@ a {
   -moz-border-end: solid #00b6f0 6px;
 }
 
-.message[category=cssparser][severity=error] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 8, 16, 16, 8);
+.message[category=cssparser][severity=error] > .icon::before {
+  background-position: -8px -8px;
 }
 
-.message[category=cssparser][severity=warn] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 8, 24, 16, 16);
+.message[category=cssparser][severity=warn] > .icon::before {
+  background-position: -16px -8px;
 }
 
 /* JS styles */
@@ -273,12 +287,12 @@ a {
   -moz-border-end: solid #fb9500 6px;
 }
 
-.message[category=exception][severity=error] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 16, 16, 24, 8);
+.message[category=exception][severity=error] > .icon::before {
+  background-position: -8px -16px;
 }
 
-.message[category=exception][severity=warn] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 16, 24, 24, 16);
+.message[category=exception][severity=warn] > .icon::before {
+  background-position: -16px -16px;
 }
 
 /* Web Developer styles */
@@ -291,17 +305,17 @@ a {
   -moz-border-end: solid #cbcbcb 6px;
 }
 
-.message[category=console][severity=error] > .icon,
-.message[category=output][severity=error] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 24, 16, 32, 8);
+.message[category=console][severity=error] > .icon::before,
+.message[category=output][severity=error] > .icon::before {
+  background-position: -8px -24px;
 }
 
-.message[category=console][severity=warn] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 24, 24, 32, 16);
+.message[category=console][severity=warn] > .icon::before {
+  background-position: -16px -24px;
 }
 
-.message[category=console][severity=info] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 24, 32, 32, 24);
+.message[category=console][severity=info] > .icon::before {
+  background-position: -24px -24px;
 }
 
 /* Input and output styles */
@@ -310,12 +324,12 @@ a {
   -moz-border-end: solid #808080 6px;
 }
 
-.message[category=input] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 24, 40, 32, 32);
+.message[category=input] > .icon::before {
+  background-position: -32px -24px;
 }
 
-.message[category=output] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 24, 48, 32, 40);
+.message[category=output] > .icon::before {
+  background-position: -40px -24px;
 }
 
 /* JSTerm Styles */
@@ -328,7 +342,15 @@ a {
 }
 
 .jsterm-input-node {
-  background: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16) no-repeat;
+  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
+  background-repeat: no-repeat;
+  background-size: 16px 16px;
+}
+
+@media (min-resolution: 2dppx) {
+  .jsterm-input-node {
+    background-image: -moz-image-rect(url('chrome://browser/skin/devtools/commandline-icon@2x.png'), 0, 64, 32, 32);
+  }
 }
 
 :-moz-any(.jsterm-input-node,
@@ -370,12 +392,12 @@ a {
   border-color: #D12C2C;
 }
 
-.message[category=security][severity=error] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 32, 16, 40, 8);
+.message[category=security][severity=error] > .icon::before {
+  background-position: -8px -32px;
 }
 
-.message[category=security][severity=warn] > .icon {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/webconsole.png), 32, 24, 40, 16);
+.message[category=security][severity=warn] > .icon::before {
+  background-position: -16px -32px;
 }
 
 .navigation-marker {

browser/themes/shared/incontentprefs/preferences.css

@@ -398,7 +398,6 @@ html|a.inline-link {
 
 checkbox {
   -moz-margin-start: 0;
-  position: relative;
 }
 
 .checkbox-check {
@@ -409,42 +408,45 @@ checkbox {
   border: 1px solid rgba(23,50,77,0.40);
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
-  background-image: linear-gradient(#ffffff 0%, rgba(255,255,255,0.80) 100%);
+  background-image: linear-gradient(#ffffff, rgba(255,255,255,0.8));
+  background-position: center center;
+  background-repeat: no-repeat;
   box-shadow: 0 1px 1px 0 #ffffff, inset 0 2px 0 0 rgba(0,0,0,0.03);
 }
 
+checkbox:not([disabled="true"]):not([checked]):hover .checkbox-check {
+  background-image: -moz-image-rect(url("chrome://browser/skin/preferences/in-content/check.png"), 0, 15, 10, 0),
+                    linear-gradient(#ffffff, rgba(255,255,255,0.8));
+}
+
 .checkbox-check[checked] {
   border-color: #0096dc;
+  background-image: -moz-image-rect(url("chrome://browser/skin/preferences/in-content/check.png"), 0, 30, 10, 15),
+                    /* !important needed to override toolkit !important rule */
+                    linear-gradient(#ffffff, rgba(255,255,255,0.8)) !important;
   box-shadow: 0 0 2px 2px rgba(0,150,220,0.35), inset 0 0 2px 0 #0096dc;
 }
 
+checkbox[disabled="true"] .checkbox-check {
+  opacity: 0.5;
+}
+
 .checkbox-label-box {
   -moz-margin-start: -1px; /* negative margin for the transparent border */
   -moz-padding-start: 0;
 }
 
-checkbox:hover::before,
-checkbox[checked]::before {
-  position: absolute;
-  content: "";
-  width: 15px;
-  height: 10px;
-  background-image: url("chrome://browser/skin/preferences/in-content/check.png");
-}
-
-checkbox[checked]::before {
-  background-position: -15px 0;
-}
-
 @media (min-resolution: 2dppx) {
-  checkbox:hover::before {
-    background-size: cover;
-    background-image: -moz-image-rect(url("chrome://browser/skin/preferences/in-content/check@2x.png"), 0, 30, 30, 0);
+  checkbox:not([checked]):hover .checkbox-check {
+    background-size: 15px 10px, auto;
+    background-image: -moz-image-rect(url("chrome://browser/skin/preferences/in-content/check@2x.png"), 0, 30, 20, 0),
+                      linear-gradient(#ffffff, rgba(255,255,255,0.8));
   }
 
-  checkbox[checked]::before {
-    background-size: cover;
-    background-image: -moz-image-rect(url("chrome://browser/skin/preferences/in-content/check@2x.png"), 0, 60, 30, 30);
+  .checkbox-check[checked] {
+    background-size: 15px 10px, auto;
+    background-image: -moz-image-rect(url("chrome://browser/skin/preferences/in-content/check@2x.png"), 0, 60, 20, 30),
+                      linear-gradient(#ffffff, rgba(255,255,255,0.8)) !important;
   }
 }
 
@@ -456,39 +458,36 @@ checkbox[checked]::before {
   border-radius: 50%;
   -moz-margin-end: 10px;
   background-color: #f1f1f1;
-  background-image: linear-gradient(#ffffff 0%, rgba(255,255,255,0.80) 100%);
+  background-image: linear-gradient(#ffffff, rgba(255,255,255,0.80));
   box-shadow: 0 1px 1px 0 #ffffff, inset 0 2px 0 0 rgba(0,0,0,0.03);
 }
 
+radio:not([selected]):hover .radio-check {
+  background-image: radial-gradient(circle, rgba(23,146,229,0.25),
+                    rgba(76,177,255,0.25) 5.5px, rgba(76,177,255,0.05) 6px,
+                    transparent 6px),
+                    linear-gradient(#ffffff, rgba(255,255,255,0.8));
+}
+
 .radio-check[selected] {
   border-color: #0096dc;
+  background-image: radial-gradient(circle, rgb(23,146,229),
+                    rgb(76,177,255) 5.5px, rgba(76,177,255,0.2) 6px,
+                    transparent 6px),
+                    linear-gradient(rgb(255,255,255), rgba(255,255,255,0.8));
   box-shadow: 0 0 2px 2px rgba(0,150,220,0.35), inset 0 0 2px 0 #0096dc;
 }
 
+radio[disabled="true"] .radio-check {
+  opacity: 0.5;
+}
+
 .radio-label-box {
   -moz-margin-start: -1px; /* negative margin for the transparent border */
   -moz-margin-end: 10px;
   -moz-padding-start: 0;
 }
 
-radio {
-  position: relative;
-}
-
-radio:hover::before,
-radio[selected]::before {
-  position: absolute;
-  content: "";
-  width: 11px;
-  height: 11px;
-  border-radius: 50%;
-  background-image: linear-gradient(rgba(76,177,255,0.25) 0%, rgba(23,146,229,0.25) 100%);
-}
-
-radio[selected]::before {
-  background-image: linear-gradient(#4cb1ff 0%, #1792e5 100%);
-}
-
 /* Category List */
 
 #categories {

browser/themes/windows/jar.mn

@@ -227,6 +227,7 @@ browser.jar:
         skin/classic/browser/devtools/controls@2x.png               (../shared/devtools/images/controls@2x.png)
 *       skin/classic/browser/devtools/widgets.css                   (devtools/widgets.css)
         skin/classic/browser/devtools/commandline-icon.png          (../shared/devtools/images/commandline-icon.png)
+        skin/classic/browser/devtools/commandline-icon@2x.png          (../shared/devtools/images/commandline-icon@2x.png)
         skin/classic/browser/devtools/alerticon-warning.png         (../shared/devtools/images/alerticon-warning.png)
         skin/classic/browser/devtools/alerticon-warning@2x.png      (../shared/devtools/images/alerticon-warning@2x.png)
 *       skin/classic/browser/devtools/ruleview.css                  (../shared/devtools/ruleview.css)
@@ -252,6 +253,7 @@ browser.jar:
 *       skin/classic/browser/devtools/webconsole.css                (devtools/webconsole.css)
         skin/classic/browser/devtools/webconsole_networkpanel.css   (devtools/webconsole_networkpanel.css)
         skin/classic/browser/devtools/webconsole.png                (../shared/devtools/images/webconsole.png)
+        skin/classic/browser/devtools/webconsole@2x.png             (../shared/devtools/images/webconsole@2x.png)
         skin/classic/browser/devtools/breadcrumbs-divider@2x.png    (../shared/devtools/images/breadcrumbs-divider@2x.png)
         skin/classic/browser/devtools/breadcrumbs-scrollbutton.png  (../shared/devtools/images/breadcrumbs-scrollbutton.png)
         skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
@@ -600,6 +602,7 @@ browser.jar:
         skin/classic/aero/browser/devtools/controls@2x.png           (../shared/devtools/images/controls@2x.png)
 *       skin/classic/aero/browser/devtools/widgets.css               (devtools/widgets.css)
         skin/classic/aero/browser/devtools/commandline-icon.png      (../shared/devtools/images/commandline-icon.png)
+        skin/classic/aero/browser/devtools/commandline-icon@2x.png      (../shared/devtools/images/commandline-icon@2x.png)
         skin/classic/aero/browser/devtools/command-paintflashing.png    (../shared/devtools/images/command-paintflashing.png)
         skin/classic/aero/browser/devtools/command-paintflashing@2x.png (../shared/devtools/images/command-paintflashing@2x.png)
         skin/classic/aero/browser/devtools/command-responsivemode.png    (../shared/devtools/images/command-responsivemode.png)
@@ -625,6 +628,7 @@ browser.jar:
 *       skin/classic/aero/browser/devtools/webconsole.css                  (devtools/webconsole.css)
         skin/classic/aero/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
         skin/classic/aero/browser/devtools/webconsole.png                  (../shared/devtools/images/webconsole.png)
+        skin/classic/aero/browser/devtools/webconsole@2x.png                  (../shared/devtools/images/webconsole@2x.png)
         skin/classic/aero/browser/devtools/breadcrumbs-divider@2x.png      (../shared/devtools/images/breadcrumbs-divider@2x.png)
         skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png    (../shared/devtools/images/breadcrumbs-scrollbutton.png)
         skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)

browser/themes/windows/preferences/in-content/preferences.css

@@ -9,23 +9,11 @@ menulist:not([editable="true"]) > .menulist-dropmarker {
   margin-bottom: 1px;
 }
 
-checkbox:hover::before,
-checkbox[checked]::before {
-  -moz-margin-end: -19px;
-  -moz-margin-start: 4px;
-}
-
 radio {
   -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
   -moz-margin-start: 0;
 }
 
-radio:hover::before,
-radio[selected]::before {
-  -moz-margin-end: -17px;
-  -moz-margin-start: 6px;
-}
-
 .actionsMenu > .menulist-label-box > .menulist-icon {
   -moz-margin-end: 9px;
 }

mobile/android/base/toolbar/ToolbarEditText.java

@@ -109,8 +109,10 @@ public class ToolbarEditText extends CustomEditText
             return;
         }
 
-        InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager)
+                mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
         try {
+            imm.restartInput(this);
             imm.hideSoftInputFromWindow(getWindowToken(), 0);
         } catch (NullPointerException e) {
             Log.e(LOGTAG, "InputMethodManagerService, why are you throwing"

toolkit/components/places/BookmarkHTMLUtils.jsm

@@ -179,9 +179,9 @@ this.BookmarkHTMLUtils = Object.freeze({
     return Task.spawn(function* () {
       notifyObservers(PlacesUtils.TOPIC_BOOKMARKS_RESTORE_BEGIN, aInitialImport);
       try {
-        if (!(yield OS.File.exists(aFilePath)))
-          throw new Error("Cannot import from nonexisting html file");
-
+        if (!(yield OS.File.exists(aFilePath))) {
+          throw new Error("Cannot import from nonexisting html file: " + aFilePath);
+        }
         let importer = new BookmarkImporter(aInitialImport);
         yield importer.importFromURL(OS.Path.toFileURI(aFilePath));
 

toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js

@@ -91,7 +91,7 @@ var tests = [
     folderId:   null,
     run:        function () {
       this.file = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-      this.file.append("this file doesn't exist because nobody created it");
+      this.file.append("this file doesn't exist because nobody created it 1");
       Task.spawn(function() {
         try {
           yield BookmarkJSONUtils.importFromFile(this.file, true);
@@ -152,16 +152,15 @@ var tests = [
     finalTopic: NSIOBSERVER_TOPIC_FAILED,
     data:       NSIOBSERVER_DATA_HTML,
     folderId:   null,
-    run:        function () {
+    run:        Task.async(function* () {
       this.file = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-      this.file.append("this file doesn't exist because nobody created it");
+      this.file.append("this file doesn't exist because nobody created it 2");
       try {
-        BookmarkHTMLUtils.importFromFile(this.file, false)
-                         .then(function onSuccess() do_throw("Should fail!"),
-                               null);
+        yield BookmarkHTMLUtils.importFromFile(this.file, false);
+        do_throw("Should fail!");
       }
       catch (e) {}
-    }
+    }.bind(this))
   },
 
   {
@@ -213,16 +212,15 @@ var tests = [
     finalTopic: NSIOBSERVER_TOPIC_FAILED,
     data:       NSIOBSERVER_DATA_HTML_INIT,
     folderId:   null,
-    run:        function () {
+    run:        Task.async(function* () {
       this.file = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-      this.file.append("this file doesn't exist because nobody created it");
+      this.file.append("this file doesn't exist because nobody created it 3");
       try {
-        BookmarkHTMLUtils.importFromFile(this.file, true)
-                         .then(function onSuccess() do_throw("Should fail!"),
-                               null);
+        yield BookmarkHTMLUtils.importFromFile(this.file, true);
+        do_throw("Should fail!");
       }
       catch (e) {}
-    }
+    }.bind(this))
   }
 ];
 

toolkit/devtools/server/actors/framerate.js

@@ -0,0 +1,119 @@
+/* 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";
+
+const {Cc, Ci, Cu, Cr} = require("chrome");
+const Services = require("Services");
+const events = require("sdk/event/core");
+const protocol = require("devtools/server/protocol");
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils.js");
+
+const {on, once, off, emit} = events;
+const {method, custom, Arg, Option, RetVal} = protocol;
+
+exports.register = function(handle) {
+  handle.addTabActor(FramerateActor, "framerateActor");
+};
+
+exports.unregister = function(handle) {
+  handle.removeTabActor(FramerateActor);
+};
+
+/**
+ * A very simple utility for monitoring framerate.
+ */
+let FramerateActor = exports.FramerateActor = protocol.ActorClass({
+  typeName: "framerate",
+  initialize: function(conn, tabActor) {
+    protocol.Actor.prototype.initialize.call(this, conn);
+    this.tabActor = tabActor;
+    this._contentWin = tabActor.window;
+    this._onRefreshDriverTick = this._onRefreshDriverTick.bind(this);
+  },
+  destroy: function(conn) {
+    protocol.Actor.prototype.destroy.call(this, conn);
+    this.finalize();
+  },
+
+  /**
+   * Starts monitoring framerate, storing the frames per second.
+   */
+  startRecording: method(function() {
+    if (this._recording) {
+      return;
+    }
+    this._recording = true;
+    this._ticks = [];
+
+    this._startTime = this._contentWin.performance.now();
+    this._contentWin.requestAnimationFrame(this._onRefreshDriverTick);
+  }, {
+  }),
+
+  /**
+   * Stops monitoring framerate, returning the recorded values at an
+   * interval defined by the specified resolution, in milliseconds.
+   */
+  stopRecording: method(function(resolution = 100) {
+    if (!this._recording) {
+      return {};
+    }
+    this._recording = false;
+
+    let timeline = {};
+    let ticks = this._ticks;
+    let totalTicks = ticks.length;
+
+    // We don't need to store the ticks array for future use, release it.
+    this._ticks = null;
+
+    // If the refresh driver didn't get a chance to tick before the
+    // recording was stopped, assume framerate was 0.
+    if (totalTicks == 0) {
+      timeline[resolution] = 0;
+      return timeline;
+    }
+
+    let pivotTick = 0;
+    let lastTick = ticks[totalTicks - 1];
+
+    for (let bucketTime = resolution; bucketTime < lastTick; bucketTime += resolution) {
+      let frameCount = 0;
+      while (ticks[pivotTick++] < bucketTime) frameCount++;
+
+      let framerate = 1000 / (bucketTime / frameCount);
+      timeline[bucketTime] = framerate;
+    }
+
+    return timeline;
+  }, {
+    request: { resolution: Arg(0, "nullable:number") },
+    response: { timeline: RetVal("json") }
+  }),
+
+  /**
+   * Function invoked along with the refresh driver.
+   */
+  _onRefreshDriverTick: function() {
+    if (!this._recording) {
+      return;
+    }
+    this._contentWin.requestAnimationFrame(this._onRefreshDriverTick);
+
+    // Store the amount of time passed since the recording started.
+    let currentTime = this._contentWin.performance.now();
+    let elapsedTime = currentTime - this._startTime;
+    this._ticks.push(elapsedTime);
+  }
+});
+
+/**
+ * The corresponding Front object for the FramerateActor.
+ */
+let FramerateFront = exports.FramerateFront = protocol.FrontClass(FramerateActor, {
+  initialize: function(client, { framerateActor }) {
+    protocol.Front.prototype.initialize.call(this, client, { actor: framerateActor });
+    this.manage(this);
+  }
+});

toolkit/devtools/server/main.js

@@ -401,6 +401,7 @@ var DebuggerServer = {
     this.registerModule("devtools/server/actors/gcli");
     this.registerModule("devtools/server/actors/tracer");
     this.registerModule("devtools/server/actors/memory");
+    this.registerModule("devtools/server/actors/framerate");
     this.registerModule("devtools/server/actors/eventlooplag");
     this.registerModule("devtools/server/actors/layout");
     if ("nsIProfiler" in Ci) {

toolkit/devtools/server/tests/mochitest/chrome.ini

@@ -19,6 +19,8 @@ support-files =
 [test_connection-manager.html]
 [test_css-logic.html]
 [test_device.html]
+[test_framerate_01.html]
+[test_framerate_02.html]
 [test_inspector-changeattrs.html]
 [test_inspector-changevalue.html]
 [test_inspector-hide.html]

toolkit/devtools/server/tests/mochitest/test_framerate_01.html

@@ -0,0 +1,87 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+Bug 1007200 - Create a framerate actor
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Framerate actor test</title>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
+</head>
+<body>
+<pre id="test">
+<script>
+
+window.onload = function() {
+  var Cu = Components.utils;
+  var Cc = Components.classes;
+  var Ci = Components.interfaces;
+
+  Cu.import("resource://gre/modules/Services.jsm");
+
+  // Always log packets when running tests.
+  Services.prefs.setBoolPref("devtools.debugger.log", true);
+  SimpleTest.registerCleanupFunction(function() {
+    Services.prefs.clearUserPref("devtools.debugger.log");
+  });
+
+  Cu.import("resource://gre/modules/devtools/Loader.jsm");
+  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
+
+  SimpleTest.waitForExplicitFinish();
+
+  var {FramerateFront} = devtools.require("devtools/server/actors/framerate");
+
+  DebuggerServer.init(function () { return true; });
+  DebuggerServer.addBrowserActors();
+
+  var client = new DebuggerClient(DebuggerServer.connectPipe());
+  client.connect(function onConnect() {
+    client.listTabs(function onListTabs(aResponse) {
+      var form = aResponse.tabs[aResponse.selected];
+      var front = FramerateFront(client, form);
+
+      window.setTimeout(() => {
+        front.startRecording().then(() => {
+          window.setTimeout(() => {
+            front.stopRecording().then(timeline => {
+              onRecordingStopped(timeline);
+            });
+          }, 1000);
+        });
+      }, 1000);
+    });
+  });
+
+  function onRecordingStopped(timeline) {
+    ok(timeline, "There should be a recording available.");
+
+    var ticks = Object.keys(timeline);
+    var values = ticks.map(e => timeline[e]);
+
+    ok(ticks.length >= 1,
+      "There should be at least one measurement available.");
+    is(ticks[0], 100,
+      "The first measurement should be performed when exactly 100ms passed.");
+
+    for (var tick of ticks) {
+      info("Testing tick: " + tick);
+      is(tick % 100, 0, "All ticks should be divisible by the resolution.");
+    }
+    for (var value of values) {
+      info("Testing value: " + value);
+      is(typeof value, "number", "All values should be integers.");
+    }
+
+    client.close(() => {
+      DebuggerServer.destroy();
+      SimpleTest.finish()
+    });
+  }
+}
+</script>
+</pre>
+</body>
+</html>

toolkit/devtools/server/tests/mochitest/test_framerate_02.html

@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+Bug 1007200 - Create a framerate actor
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Framerate actor test</title>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
+</head>
+<body>
+<pre id="test">
+<script>
+
+window.onload = function() {
+  var Cu = Components.utils;
+  var Cc = Components.classes;
+  var Ci = Components.interfaces;
+
+  Cu.import("resource://gre/modules/Services.jsm");
+
+  // Always log packets when running tests.
+  Services.prefs.setBoolPref("devtools.debugger.log", true);
+  SimpleTest.registerCleanupFunction(function() {
+    Services.prefs.clearUserPref("devtools.debugger.log");
+  });
+
+  Cu.import("resource://gre/modules/devtools/Loader.jsm");
+  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
+
+  SimpleTest.waitForExplicitFinish();
+
+  var {FramerateFront} = devtools.require("devtools/server/actors/framerate");
+
+  DebuggerServer.init(function () { return true; });
+  DebuggerServer.addBrowserActors();
+
+  var client = new DebuggerClient(DebuggerServer.connectPipe());
+  client.connect(function onConnect() {
+    client.listTabs(function onListTabs(aResponse) {
+      var form = aResponse.tabs[aResponse.selected];
+      var front = FramerateFront(client, form);
+
+      front.stopRecording().then(timeline => {
+        ok(timeline, "There should be a recording available.");
+        is(Object.keys(timeline).length, 0, "...but it should be empty.");
+
+        client.close(() => {
+          DebuggerServer.destroy();
+          SimpleTest.finish()
+        });
+      });
+    });
+  });
+}
+</script>
+</pre>
+</body>
+</html>