merge fx-team to mozilla-central a=merge

2024-09-13 09:24:08 -07:00 · 2014-11-18 12:53:37 +01:00 · 2014-11-18 12:53:37 +01:00 · afa04e5049
commit afa04e5049
parent 99f4bf503e 52663059f8
53 changed files with 1519 additions and 582 deletions
--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@ -171,6 +171,7 @@ EXTRA_JS_MODULES.commonjs.diffpatcher.test += [
 ]

 EXTRA_JS_MODULES.commonjs.framescript += [
+    'source/lib/framescript/contextmenu-events.js',
    'source/lib/framescript/FrameScriptManager.jsm',
    'source/lib/framescript/LoaderHelper.jsm',
    'source/lib/framescript/tab-events.js',
@ -235,6 +236,7 @@ EXTRA_JS_MODULES.commonjs.sdk.console += [
 EXTRA_JS_MODULES.commonjs.sdk.content += [
    'source/lib/sdk/content/content-worker.js',
    'source/lib/sdk/content/content.js',
+    'source/lib/sdk/content/context-menu.js',
    'source/lib/sdk/content/events.js',
    'source/lib/sdk/content/loader.js',
    'source/lib/sdk/content/mod.js',
--- a/addon-sdk/source/lib/framescript/FrameScriptManager.jsm
+++ b/addon-sdk/source/lib/framescript/FrameScriptManager.jsm
@ -15,11 +15,21 @@ const PATH = __URI__.replace('FrameScriptManager.jsm', '');
 let loadedTabEvents = false;

 function enableTabEvents() {
-  if (loadedTabEvents) 
+  if (loadedTabEvents)
    return;

  loadedTabEvents = true;
  globalMM.loadFrameScript(PATH + 'tab-events.js', true);
 }

-const EXPORTED_SYMBOLS = ['enableTabEvents'];
+let loadedCMEvents = false;
+
+function enableCMEvents() {
+  if (loadedCMEvents)
+    return;
+
+  loadedCMEvents = true;
+  globalMM.loadFrameScript(PATH + 'contextmenu-events.js', true);
+}
+
+const EXPORTED_SYMBOLS = ['enableTabEvents', 'enableCMEvents'];
--- a/addon-sdk/source/lib/framescript/contextmenu-events.js
+++ b/addon-sdk/source/lib/framescript/contextmenu-events.js
@ -0,0 +1,63 @@
+/* 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 { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
+
+// Holds remote items for this frame.
+let keepAlive = new Map();
+
+// Called to create remote proxies for items. If they already exist we destroy
+// and recreate. This cna happen if the item changes in some way or in odd
+// timing cases where the frame script is create around the same time as the
+// item is created in the main process
+addMessageListener('sdk/contextmenu/createitems', ({ data: { items, addon }}) => {
+  let { loader } = Cu.import(addon.paths[''] + 'framescript/LoaderHelper.jsm', {});
+
+  for (let itemoptions of items) {
+    let { RemoteItem } = loader(addon).require('sdk/content/context-menu');
+    let item = new RemoteItem(itemoptions, this);
+
+    let oldItem = keepAlive.get(item.id);
+    if (oldItem) {
+      oldItem.destroy();
+    }
+
+    keepAlive.set(item.id, item);
+  }
+});
+
+addMessageListener('sdk/contextmenu/destroyitems', ({ data: { items }}) => {
+  for (let id of items) {
+    let item = keepAlive.get(id);
+    item.destroy();
+    keepAlive.delete(id);
+  }
+});
+
+sendAsyncMessage('sdk/contextmenu/requestitems');
+
+Services.obs.addObserver(function(subject, topic, data) {
+  // Many frame scripts run in the same process, check that the context menu
+  // node is in this frame
+  let { event: { target: popupNode }, addonInfo } = subject.wrappedJSObject;
+  if (popupNode.ownerDocument.defaultView.top != content)
+    return;
+
+  for (let item of keepAlive.values()) {
+    item.getContextState(popupNode, addonInfo);
+  }
+}, "content-contextmenu", false);
+
+addMessageListener('sdk/contextmenu/activateitems', ({ data: { items, data }, objects: { popupNode }}) => {
+  for (let id of items) {
+    let item = keepAlive.get(id);
+    if (!item)
+      continue;
+
+    item.activate(popupNode, data);
+  }
+});
--- a/addon-sdk/source/lib/sdk/content/context-menu.js
+++ b/addon-sdk/source/lib/sdk/content/context-menu.js
@ -0,0 +1,354 @@
+/* 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 { Class } = require("../core/heritage");
+const self = require("../self");
+const { WorkerChild } = require("./worker-child");
+const { getInnerId } = require("../window/utils");
+const { Ci } = require("chrome");
+const { Services } = require("resource://gre/modules/Services.jsm");
+
+// These functions are roughly copied from sdk/selection which doesn't work
+// in the content process
+function getElementWithSelection(window) {
+  let element = Services.focus.getFocusedElementForWindow(window, false, {});
+  if (!element)
+    return null;
+
+  try {
+    // Accessing selectionStart and selectionEnd on e.g. a button
+    // results in an exception thrown as per the HTML5 spec.  See
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#textFieldSelection
+
+    let { value, selectionStart, selectionEnd } = element;
+
+    let hasSelection = typeof value === "string" &&
+                      !isNaN(selectionStart) &&
+                      !isNaN(selectionEnd) &&
+                      selectionStart !== selectionEnd;
+
+    return hasSelection ? element : null;
+  }
+  catch (err) {
+    console.exception(err);
+    return null;
+  }
+}
+
+function safeGetRange(selection, rangeNumber) {
+  try {
+    let { rangeCount } = selection;
+    let range = null;
+
+    for (let rangeNumber = 0; rangeNumber < rangeCount; rangeNumber++ ) {
+      range = selection.getRangeAt(rangeNumber);
+
+      if (range && range.toString())
+        break;
+
+      range = null;
+    }
+
+    return range;
+  }
+  catch (e) {
+    return null;
+  }
+}
+
+function getSelection(window) {
+  let selection = window.getSelection();
+  let range = safeGetRange(selection);
+  if (range)
+    return range.toString();
+
+  let node = getElementWithSelection(window);
+  if (!node)
+    return null;
+
+  return node.value.substring(node.selectionStart, node.selectionEnd);
+}
+
+//These are used by PageContext.isCurrent below. If the popupNode or any of
+//its ancestors is one of these, Firefox uses a tailored context menu, and so
+//the page context doesn't apply.
+const NON_PAGE_CONTEXT_ELTS = [
+  Ci.nsIDOMHTMLAnchorElement,
+  Ci.nsIDOMHTMLAppletElement,
+  Ci.nsIDOMHTMLAreaElement,
+  Ci.nsIDOMHTMLButtonElement,
+  Ci.nsIDOMHTMLCanvasElement,
+  Ci.nsIDOMHTMLEmbedElement,
+  Ci.nsIDOMHTMLImageElement,
+  Ci.nsIDOMHTMLInputElement,
+  Ci.nsIDOMHTMLMapElement,
+  Ci.nsIDOMHTMLMediaElement,
+  Ci.nsIDOMHTMLMenuElement,
+  Ci.nsIDOMHTMLObjectElement,
+  Ci.nsIDOMHTMLOptionElement,
+  Ci.nsIDOMHTMLSelectElement,
+  Ci.nsIDOMHTMLTextAreaElement,
+];
+
+// List all editable types of inputs.  Or is it better to have a list
+// of non-editable inputs?
+let editableInputs = {
+  email: true,
+  number: true,
+  password: true,
+  search: true,
+  tel: true,
+  text: true,
+  textarea: true,
+  url: true
+};
+
+let CONTEXTS = {};
+
+let Context = Class({
+  initialize: function(id) {
+    this.id = id;
+  },
+
+  adjustPopupNode: function adjustPopupNode(popupNode) {
+    return popupNode;
+  },
+
+  // Gets state to pass through to the parent process for the node the user
+  // clicked on
+  getState: function(popupNode) {
+    return false;
+  }
+});
+
+// Matches when the context-clicked node doesn't have any of
+// NON_PAGE_CONTEXT_ELTS in its ancestors
+CONTEXTS.PageContext = Class({
+  extends: Context,
+
+  getState: function(popupNode) {
+    // If there is a selection in the window then this context does not match
+    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
+      return false;
+
+    // If the clicked node or any of its ancestors is one of the blacklisted
+    // NON_PAGE_CONTEXT_ELTS then this context does not match
+    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
+      if (NON_PAGE_CONTEXT_ELTS.some(function(type) popupNode instanceof type))
+        return false;
+
+      popupNode = popupNode.parentNode;
+    }
+
+    return true;
+  }
+});
+
+// Matches when there is an active selection in the window
+CONTEXTS.SelectionContext = Class({
+  extends: Context,
+
+  getState: function(popupNode) {
+    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
+      return true;
+
+    try {
+      // The node may be a text box which has selectionStart and selectionEnd
+      // properties. If not this will throw.
+      let { selectionStart, selectionEnd } = popupNode;
+      return !isNaN(selectionStart) && !isNaN(selectionEnd) &&
+             selectionStart !== selectionEnd;
+    }
+    catch (e) {
+      return false;
+    }
+  }
+});
+
+// Matches when the context-clicked node or any of its ancestors matches the
+// selector given
+CONTEXTS.SelectorContext = Class({
+  extends: Context,
+
+  initialize: function initialize(id, selector) {
+    Context.prototype.initialize.call(this, id);
+    this.selector = selector;
+  },
+
+  adjustPopupNode: function adjustPopupNode(popupNode) {
+    let selector = this.selector;
+
+    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
+      if (popupNode.mozMatchesSelector(selector))
+        return popupNode;
+
+      popupNode = popupNode.parentNode;
+    }
+
+    return null;
+  },
+
+  getState: function(popupNode) {
+    return !!this.adjustPopupNode(popupNode);
+  }
+});
+
+// Matches when the page url matches any of the patterns given
+CONTEXTS.URLContext = Class({
+  extends: Context,
+
+  getState: function(popupNode) {
+    return popupNode.ownerDocument.URL;
+  }
+});
+
+// Matches when the user-supplied predicate returns true
+CONTEXTS.PredicateContext = Class({
+  extends: Context,
+
+  getState: function(node) {
+    let window = node.ownerDocument.defaultView;
+    let data = {};
+
+    data.documentType = node.ownerDocument.contentType;
+
+    data.documentURL = node.ownerDocument.location.href;
+    data.targetName = node.nodeName.toLowerCase();
+    data.targetID = node.id || null ;
+
+    if ((data.targetName === 'input' && editableInputs[node.type]) ||
+        data.targetName === 'textarea') {
+      data.isEditable = !node.readOnly && !node.disabled;
+    }
+    else {
+      data.isEditable = node.isContentEditable;
+    }
+
+    data.selectionText = getSelection(window, "TEXT");
+
+    data.srcURL = node.src || null;
+    data.value = node.value || null;
+
+    while (!data.linkURL && node) {
+      data.linkURL = node.href || null;
+      node = node.parentNode;
+    }
+
+    return data;
+  },
+});
+
+function instantiateContext({ id, type, args }) {
+  if (!(type in CONTEXTS)) {
+    console.error("Attempt to use unknown context " + type);
+    return;
+  }
+  return new CONTEXTS[type](id, ...args);
+}
+
+let ContextWorker = Class({
+  implements: [ WorkerChild ],
+
+  // Calls the context workers context listeners and returns the first result
+  // that is either a string or a value that evaluates to true. If all of the
+  // listeners returned false then returns false. If there are no listeners,
+  // returns true (show the menu item by default).
+  getMatchedContext: function getCurrentContexts(popupNode) {
+    let results = this.sandbox.emitSync("context", popupNode);
+    if (!results.length)
+      return true;
+    return results.reduce((val, result) => val || result);
+  },
+
+  // Emits a click event in the worker's port. popupNode is the node that was
+  // context-clicked, and clickedItemData is the data of the item that was
+  // clicked.
+  fireClick: function fireClick(popupNode, clickedItemData) {
+    this.sandbox.emitSync("click", popupNode, clickedItemData);
+  }
+});
+
+// Gets the item's content script worker for a window, creating one if necessary
+// Once created it will be automatically destroyed when the window unloads.
+// If there is not content scripts for the item then null will be returned.
+function getItemWorkerForWindow(item, window) {
+  if (!item.contentScript && !item.contentScriptFile)
+    return null;
+
+  let id = getInnerId(window);
+  let worker = item.workerMap.get(id);
+
+  if (worker)
+    return worker;
+
+  worker = ContextWorker({
+    id: item.id,
+    window: id,
+    manager: item.manager,
+    contentScript: item.contentScript,
+    contentScriptFile: item.contentScriptFile,
+    onDetach: function() {
+      item.workerMap.delete(id);
+    }
+  });
+
+  item.workerMap.set(id, worker);
+
+  return worker;
+}
+
+// A very simple remote proxy for every item. It's job is to provide data for
+// the main process to use to determine visibility state and to call into
+// content scripts when clicked.
+let RemoteItem = Class({
+  initialize: function(options, manager) {
+    this.id = options.id;
+    this.contexts = [instantiateContext(c) for (c of options.contexts)];
+    this.contentScript = options.contentScript;
+    this.contentScriptFile = options.contentScriptFile;
+
+    this.manager = manager;
+
+    this.workerMap = new Map();
+  },
+
+  destroy: function() {
+    for (let worker of this.workerMap.values()) {
+      worker.destroy();
+    }
+  },
+
+  activate: function(popupNode, data) {
+    let worker = getItemWorkerForWindow(this, popupNode.ownerDocument.defaultView);
+    if (!worker)
+      return;
+
+    for (let context of this.contexts)
+      popupNode = context.adjustPopupNode(popupNode);
+
+    worker.fireClick(popupNode, data);
+  },
+
+  // Fills addonInfo with state data to send through to the main process
+  getContextState: function(popupNode, addonInfo) {
+    if (!(self.id in addonInfo))
+      addonInfo[self.id] = {};
+
+    let worker = getItemWorkerForWindow(this, popupNode.ownerDocument.defaultView);
+    let contextStates = {};
+    for (let context of this.contexts)
+      contextStates[context.id] = context.getState(popupNode);
+
+    addonInfo[self.id][this.id] = {
+      // It isn't ideal to create a PageContext for every item but there isn't
+      // a good shared place to do it.
+      pageContext: (new CONTEXTS.PageContext()).getState(popupNode),
+      contextStates,
+      hasWorker: !!worker,
+      workerContext: worker ? worker.getMatchedContext(popupNode) : true
+    }
+  }
+});
+exports.RemoteItem = RemoteItem;
--- a/addon-sdk/source/lib/sdk/context-menu.js
+++ b/addon-sdk/source/lib/sdk/context-menu.js
@ -19,14 +19,20 @@ const { validateOptions, getTypeOf } = require("./deprecated/api-utils");
 const { URL, isValidURI } = require("./url");
 const { WindowTracker, browserWindowIterator } = require("./deprecated/window-utils");
 const { isBrowser, getInnerId } = require("./window/utils");
-const { Ci } = require("chrome");
+const { Ci, Cc, Cu } = require("chrome");
 const { MatchPattern } = require("./util/match-pattern");
 const { Worker } = require("./content/worker");
 const { EventTarget } = require("./event/target");
 const { emit } = require('./event/core');
 const { when } = require('./system/unload');
-const selection = require('./selection');
 const { contract: loaderContract } = require('./content/loader');
+const { omit } = require('./util/object');
+const self = require('./self')
+
+// null-out cycles in .modules to make @loader/options JSONable
+const ADDON = omit(require('@loader/options'), ['modules', 'globals']);
+
+require('../framescript/FrameScriptManager.jsm').enableCMEvents();

 // All user items we add have this class.
 const ITEM_CLASS = "addon-context-menu-item";
@ -59,30 +65,13 @@ const OVERFLOW_MENU_CLASS = "addon-content-menu-overflow-menu";
 // The class of the overflow submenu's xul:menupopup.
 const OVERFLOW_POPUP_CLASS = "addon-content-menu-overflow-popup";

-//These are used by PageContext.isCurrent below. If the popupNode or any of
-//its ancestors is one of these, Firefox uses a tailored context menu, and so
-//the page context doesn't apply.
-const NON_PAGE_CONTEXT_ELTS = [
-  Ci.nsIDOMHTMLAnchorElement,
-  Ci.nsIDOMHTMLAppletElement,
-  Ci.nsIDOMHTMLAreaElement,
-  Ci.nsIDOMHTMLButtonElement,
-  Ci.nsIDOMHTMLCanvasElement,
-  Ci.nsIDOMHTMLEmbedElement,
-  Ci.nsIDOMHTMLImageElement,
-  Ci.nsIDOMHTMLInputElement,
-  Ci.nsIDOMHTMLMapElement,
-  Ci.nsIDOMHTMLMediaElement,
-  Ci.nsIDOMHTMLMenuElement,
-  Ci.nsIDOMHTMLObjectElement,
-  Ci.nsIDOMHTMLOptionElement,
-  Ci.nsIDOMHTMLSelectElement,
-  Ci.nsIDOMHTMLTextAreaElement,
-];
-
 // Holds private properties for API objects
 let internal = ns();

+function uuid() {
+  return require('./util/uuid').uuid().toString();
+}
+
 function getScheme(spec) {
  try {
    return URL(spec).scheme;
@ -92,15 +81,22 @@ function getScheme(spec) {
  }
 }

+let MessageManager = Cc["@mozilla.org/globalmessagemanager;1"].
+                     getService(Ci.nsIMessageBroadcaster);
+
 let Context = Class({
+  initialize: function() {
+    internal(this).id = uuid();
+  },
+
  // Returns the node that made this context current
  adjustPopupNode: function adjustPopupNode(popupNode) {
    return popupNode;
  },

  // Returns whether this context is current for the current node
-  isCurrent: function isCurrent(popupNode) {
-    return false;
+  isCurrent: function isCurrent(state) {
+    return state;
  }
 });

@ -109,21 +105,12 @@ let Context = Class({
 let PageContext = Class({
  extends: Context,

-  isCurrent: function isCurrent(popupNode) {
-    // If there is a selection in the window then this context does not match
-    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
-      return false;
-
-    // If the clicked node or any of its ancestors is one of the blacklisted
-    // NON_PAGE_CONTEXT_ELTS then this context does not match
-    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
-      if (NON_PAGE_CONTEXT_ELTS.some(function(type) popupNode instanceof type))
-        return false;
-
-      popupNode = popupNode.parentNode;
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "PageContext",
+      args: []
    }
-
-    return true;
  }
 });
 exports.PageContext = PageContext;
@ -132,19 +119,11 @@ exports.PageContext = PageContext;
 let SelectionContext = Class({
  extends: Context,

-  isCurrent: function isCurrent(popupNode) {
-    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
-      return true;
-
-    try {
-      // The node may be a text box which has selectionStart and selectionEnd
-      // properties. If not this will throw.
-      let { selectionStart, selectionEnd } = popupNode;
-      return !isNaN(selectionStart) && !isNaN(selectionEnd) &&
-             selectionStart !== selectionEnd;
-    }
-    catch (e) {
-      return false;
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "SelectionContext",
+      args: []
    }
  }
 });
@ -156,6 +135,7 @@ let SelectorContext = Class({
  extends: Context,

  initialize: function initialize(selector) {
+    Context.prototype.initialize.call(this);
    let options = validateOptions({ selector: selector }, {
      selector: {
        is: ["string"],
@ -165,21 +145,12 @@ let SelectorContext = Class({
    internal(this).selector = options.selector;
  },

-  adjustPopupNode: function adjustPopupNode(popupNode) {
-    let selector = internal(this).selector;
-
-    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
-      if (popupNode.mozMatchesSelector(selector))
-        return popupNode;
-
-      popupNode = popupNode.parentNode;
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "SelectorContext",
+      args: [internal(this).selector]
    }
-
-    return null;
-  },
-
-  isCurrent: function isCurrent(popupNode) {
-    return !!this.adjustPopupNode(popupNode);
  }
 });
 exports.SelectorContext = SelectorContext;
@ -189,6 +160,7 @@ let URLContext = Class({
  extends: Context,

  initialize: function initialize(patterns) {
+    Context.prototype.initialize.call(this);
    patterns = Array.isArray(patterns) ? patterns : [patterns];

    try {
@ -198,12 +170,18 @@ let URLContext = Class({
      throw new Error("Patterns must be a string, regexp or an array of " +
                      "strings or regexps: " + err);
    }
-
  },

-  isCurrent: function isCurrent(popupNode) {
-    let url = popupNode.ownerDocument.URL;
+  isCurrent: function isCurrent(url) {
    return internal(this).patterns.some(function (p) p.test(url));
+  },
+
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "URLContext",
+      args: []
+    }
  }
 });
 exports.URLContext = URLContext;
@ -213,6 +191,7 @@ let PredicateContext = Class({
  extends: Context,

  initialize: function initialize(predicate) {
+    Context.prototype.initialize.call(this);
    let options = validateOptions({ predicate: predicate }, {
      predicate: {
        is: ["function"],
@ -222,56 +201,20 @@ let PredicateContext = Class({
    internal(this).predicate = options.predicate;
  },

-  isCurrent: function isCurrent(popupNode) {
-    return internal(this).predicate(populateCallbackNodeData(popupNode));
+  isCurrent: function isCurrent(state) {
+    return internal(this).predicate(state);
+  },
+
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "PredicateContext",
+      args: []
+    }
  }
 });
 exports.PredicateContext = PredicateContext;

-// List all editable types of inputs.  Or is it better to have a list
-// of non-editable inputs?
-let editableInputs = {
-  email: true,
-  number: true,
-  password: true,
-  search: true,
-  tel: true,
-  text: true,
-  textarea: true,
-  url: true
-};
-
-function populateCallbackNodeData(node) {
-  let window = node.ownerDocument.defaultView;
-  let data = {};
-
-  data.documentType = node.ownerDocument.contentType;
-
-  data.documentURL = node.ownerDocument.location.href;
-  data.targetName = node.nodeName.toLowerCase();
-  data.targetID = node.id || null ;
-
-  if ((data.targetName === 'input' && editableInputs[node.type]) ||
-      data.targetName === 'textarea') {
-    data.isEditable = !node.readOnly && !node.disabled;
-  }
-  else {
-    data.isEditable = node.isContentEditable;
-  }
-
-  data.selectionText = selection.text;
-
-  data.srcURL = node.src || null;
-  data.value = node.value || null;
-
-  while (!data.linkURL && node) {
-    data.linkURL = node.href || null;
-    node = node.parentNode;
-  }
-
-  return data;
-}
-
 function removeItemFromArray(array, item) {
  return array.filter(function(i) i !== item);
 }
@ -362,130 +305,82 @@ let menuRules = mix(labelledItemRules, {
  }
 });

-let ContextWorker = Class({
-  implements: [ Worker ],
-
-  // Calls the context workers context listeners and returns the first result
-  // that is either a string or a value that evaluates to true. If all of the
-  // listeners returned false then returns false. If there are no listeners,
-  // returns true (show the menu item by default).
-  getMatchedContext: function getCurrentContexts(popupNode) {
-    let results = this.getSandbox().emitSync("context", popupNode);
-    if (!results.length)
-      return true;
-    return results.reduce((val, result) => val || result);
-  },
-
-  // Emits a click event in the worker's port. popupNode is the node that was
-  // context-clicked, and clickedItemData is the data of the item that was
-  // clicked.
-  fireClick: function fireClick(popupNode, clickedItemData) {
-    this.getSandbox().emitSync("click", popupNode, clickedItemData);
-  }
-});
-
 // Returns true if any contexts match. If there are no contexts then a
 // PageContext is tested instead
-function hasMatchingContext(contexts, popupNode) {
-  for (let context in contexts) {
-    if (!context.isCurrent(popupNode))
+function hasMatchingContext(contexts, addonInfo) {
+  for (let context of contexts) {
+    if (!(internal(context).id in addonInfo.contextStates)) {
+      console.error("Missing state for context " + internal(context).id + " this is an error in the SDK modules.");
+      return false;
+    }
+    if (!context.isCurrent(addonInfo.contextStates[internal(context).id]))
      return false;
  }

  return true;
 }

-// Gets the matched context from any worker for this item. If there is no worker
-// or no matched context then returns false.
-function getCurrentWorkerContext(item, popupNode) {
-  let worker = getItemWorkerForWindow(item, popupNode.ownerDocument.defaultView);
-  if (!worker)
-    return true;
-  return worker.getMatchedContext(popupNode);
-}
-
 // Tests whether an item should be visible or not based on its contexts and
 // content scripts
-function isItemVisible(item, popupNode, defaultVisibility) {
+function isItemVisible(item, addonInfo, usePageWorker) {
  if (!item.context.length) {
-    let worker = getItemWorkerForWindow(item, popupNode.ownerDocument.defaultView);
-    if (!worker)
-      return defaultVisibility;
+    if (!addonInfo.hasWorker)
+      return usePageWorker ? addonInfo.pageContext : true;
  }

-  if (!hasMatchingContext(item.context, popupNode))
+  if (!hasMatchingContext(item.context, addonInfo))
    return false;

-  let context = getCurrentWorkerContext(item, popupNode);
+  let context = addonInfo.workerContext;
  if (typeof(context) === "string" && context != "")
    item.label = context;

  return !!context;
 }

-// Gets the item's content script worker for a window, creating one if necessary
-// Once created it will be automatically destroyed when the window unloads.
-// If there is not content scripts for the item then null will be returned.
-function getItemWorkerForWindow(item, window) {
-  if (!item.contentScript && !item.contentScriptFile)
-    return null;
-
-  let id = getInnerId(window);
-  let worker = internal(item).workerMap.get(id);
-
-  if (worker)
-    return worker;
-
-  worker = ContextWorker({
-    window: window,
-    contentScript: item.contentScript,
-    contentScriptFile: item.contentScriptFile,
-    onMessage: function(msg) {
-      emit(item, "message", msg);
-    },
-    onDetach: function() {
-      internal(item).workerMap.delete(id);
-    }
-  });
-
-  internal(item).workerMap.set(id, worker);
-
-  return worker;
-}
-
 // Called when an item is clicked to send out click events to the content
 // scripts
-function itemActivated(item, clickedItem, popupNode) {
-  let worker = getItemWorkerForWindow(item, popupNode.ownerDocument.defaultView);
-
-  if (worker) {
-    let adjustedNode = popupNode;
-    for (let context in item.context)
-        adjustedNode = context.adjustPopupNode(adjustedNode);
-    worker.fireClick(adjustedNode, clickedItem.data);
+function itemActivated(item, clickedNode) {
+  let data = {
+    items: [internal(item).id],
+    data: item.data,
  }

-  if (item.parentMenu)
-    itemActivated(item.parentMenu, clickedItem, popupNode);
+  while (item.parentMenu) {
+    item = item.parentMenu;
+    data.items.push(internal(item).id);
+  }
+
+  let menuData = clickedNode.ownerDocument.defaultView.gContextMenuContentData;
+  let messageManager = menuData.browser.messageManager;
+  messageManager.sendAsyncMessage('sdk/contextmenu/activateitems', data, {
+    popupNode: menuData.popupNode
+  });
+}
+
+function serializeItem(item) {
+  return {
+    id: internal(item).id,
+    contexts: [c.serialize() for (c of item.context)],
+    contentScript: item.contentScript,
+    contentScriptFile: item.contentScriptFile,
+  };
 }

 // All things that appear in the context menu extend this
 let BaseItem = Class({
  initialize: function initialize() {
-    addCollectionProperty(this, "context");
-
-    // Used to cache content script workers and the windows they have been
-    // created for
-    internal(this).workerMap = new Map();
+    internal(this).id = uuid();

+    internal(this).contexts = [];
    if ("context" in internal(this).options && internal(this).options.context) {
      let contexts = internal(this).options.context;
      if (Array.isArray(contexts)) {
        for (let context of contexts)
-          this.context.add(context);
+          internal(this).contexts.push(context);
      }
      else {
-        this.context.add(contexts);
+        internal(this).contexts.push(contexts);
      }
    }

@ -500,15 +395,59 @@ let BaseItem = Class({
      value: internal(this).options.contentScript
    });

+    // Resolve URIs here as tests may have overriden self
+    let files = internal(this).options.contentScriptFile;
+    if (files) {
+      if (!Array.isArray(files))
+        files = [files];
+      files = files.map(self.data.url);
+    }
+    internal(this).options.contentScriptFile = files;
    Object.defineProperty(this, "contentScriptFile", {
      enumerable: true,
      value: internal(this).options.contentScriptFile
    });
+
+    // Notify all frames of this new item
+    sendItems([serializeItem(this)]);
  },

  destroy: function destroy() {
+    if (internal(this).destroyed)
+      return;
+
+    // Tell all existing frames that this item has been destroyed
+    MessageManager.broadcastAsyncMessage("sdk/contextmenu/destroyitems", {
+      items: [internal(this).id]
+    });
+
    if (this.parentMenu)
      this.parentMenu.removeItem(this);
+
+    internal(this).destroyed = true;
+  },
+
+  get context() {
+    let contexts = internal(this).contexts.slice(0);
+    contexts.add = (context) => {
+      internal(this).contexts.push(context);
+      // Notify all frames that this item has changed
+      sendItems([serializeItem(this)]);
+    };
+    contexts.remove = (context) => {
+      internal(this).contexts = internal(this).contexts.filter(c => {
+        return c != context;
+      });
+      // Notify all frames that this item has changed
+      sendItems([serializeItem(this)]);
+    };
+    return contexts;
+  },
+
+  set context(val) {
+    internal(this).contexts = val.slice(0);
+    // Notify all frames that this item has changed
+    sendItems([serializeItem(this)]);
  },

  get parentMenu() {
@ -516,6 +455,13 @@ let BaseItem = Class({
  },
 });

+function workerMessageReceived({ data: { id, args } }) {
+  if (internal(this).id != id)
+    return;
+
+  emit(this, ...args);
+}
+
 // All things that have a label on the context menu extend this
 let LabelledItem = Class({
  extends: BaseItem,
@ -524,11 +470,16 @@ let LabelledItem = Class({
  initialize: function initialize(options) {
    BaseItem.prototype.initialize.call(this);
    EventTarget.prototype.initialize.call(this, options);
+
+    internal(this).messageListener = workerMessageReceived.bind(this);
+    MessageManager.addMessageListener('sdk/worker/event', internal(this).messageListener);
  },

  destroy: function destroy() {
-    for (let [,worker] of internal(this).workerMap)
-      worker.destroy();
+    if (internal(this).destroyed)
+      return;
+
+    MessageManager.removeMessageListener('sdk/worker/event', internal(this).messageListener);

    BaseItem.prototype.destroy.call(this);
  },
@ -712,7 +663,39 @@ exports.Separator = Separator;
 let contentContextMenu = ItemContainer();
 exports.contentContextMenu = contentContextMenu;

+function getContainerItems(container) {
+  let items = [];
+  for (let item of internal(container).children) {
+    items.push(serializeItem(item));
+    if (item instanceof Menu)
+      items = items.concat(getContainerItems(item));
+  }
+  return items;
+}
+
+// Notify all frames of these new or changed items
+function sendItems(items) {
+  MessageManager.broadcastAsyncMessage("sdk/contextmenu/createitems", {
+    items,
+    addon: ADDON,
+  });
+}
+
+// Called when a new frame is created and wants to get the current list of items
+function remoteItemRequest({ target: { messageManager } }) {
+  let items = getContainerItems(contentContextMenu);
+  if (items.length == 0)
+    return;
+
+  messageManager.sendAsyncMessage("sdk/contextmenu/createitems", {
+    items,
+    addon: ADDON,
+  });
+}
+MessageManager.addMessageListener('sdk/contextmenu/requestitems', remoteItemRequest);
+
 when(function() {
+  MessageManager.removeMessageListener('sdk/contextmenu/requestitems', remoteItemRequest);
  contentContextMenu.destroy();
 });

@ -800,16 +783,16 @@ let MenuWrapper = Class({

  // Recurses through the menu setting the visibility of items. Returns true
  // if any of the items in this menu were visible
-  setVisibility: function setVisibility(menu, popupNode, defaultVisibility) {
+  setVisibility: function setVisibility(menu, addonInfo, usePageWorker) {
    let anyVisible = false;

    for (let item of internal(menu).children) {
-      let visible = isItemVisible(item, popupNode, defaultVisibility);
+      let visible = isItemVisible(item, addonInfo[internal(item).id], usePageWorker);

      // Recurse through Menus, if none of the sub-items were visible then the
      // menu is hidden too.
      if (visible && (item instanceof Menu))
-        visible = this.setVisibility(item, popupNode, true);
+        visible = this.setVisibility(item, addonInfo, false);

      let xulNode = this.getXULNodeForItem(item);
      xulNode.hidden = !visible;
@ -912,7 +895,7 @@ let MenuWrapper = Class({
        if (event.target !== xulNode)
          return;

-        itemActivated(item, item, self.contextMenu.triggerNode);
+        itemActivated(item, xulNode);
      }, false);
    }

@ -1027,8 +1010,14 @@ let MenuWrapper = Class({
        this.populate(this.items);
      }

-      let popupNode = event.target.triggerNode;
-      this.setVisibility(this.items, popupNode, PageContext().isCurrent(popupNode));
+      let mainWindow = event.target.ownerDocument.defaultView;
+      this.contextMenuContentData = mainWindow.gContextMenuContentData
+      let addonInfo = this.contextMenuContentData.addonInfo[self.id];
+      if (!addonInfo) {
+        console.warn("No context menu state data was provided.");
+        return;
+      }
+      this.setVisibility(this.items, addonInfo, true);
    }
    catch (e) {
      console.exception(e);
--- a/addon-sdk/source/test/test-context-menu.js
+++ b/addon-sdk/source/test/test-context-menu.js
@ -11,6 +11,7 @@ const { Loader } = require('sdk/test/loader');
 const timer = require("sdk/timers");
 const { merge } = require("sdk/util/object");
 const { defer } = require("sdk/core/promise");
+const observers = require("sdk/system/events");

 // These should match the same constants in the module.
 const ITEM_CLASS = "addon-context-menu-item";
@ -103,7 +104,7 @@ exports.testSelectorContextMatch = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu([item], [], []);
      test.done();
    });
@ -125,7 +126,7 @@ exports.testSelectorAncestorContextMatch = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
      test.checkMenu([item], [], []);
      test.done();
    });
@ -209,7 +210,7 @@ exports.testPageContextNoMatch = function (assert, done) {
  ];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, items, []);
      test.done();
    });
@ -249,9 +250,8 @@ exports.testSelectionContextMatchInTextField = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    let textfield = doc.getElementById("textfield");
-    textfield.setSelectionRange(0, textfield.value.length);
-    test.showMenu(textfield, function (popup) {
+    test.selectRange("#textfield", 0, null);
+    test.showMenu("#textfield", function (popup) {
      test.checkMenu([item], [], []);
      test.done();
    });
@ -271,9 +271,8 @@ exports.testSelectionContextNoMatchInTextField = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    let textfield = doc.getElementById("textfield");
-    textfield.setSelectionRange(0, 0);
-    test.showMenu(textfield, function (popup) {
+    test.selectRange("#textfield", 0, 0);
+    test.showMenu("#textfield", function (popup) {
      test.checkMenu([item], [item], []);
      test.done();
    });
@ -314,25 +313,31 @@ exports.testSelectionContextInNewTab = function (assert, done) {
    let link = doc.getElementById("targetlink");
    link.click();

-    test.delayedEventListener(this.tabBrowser, "load", function () {
-      let browser = test.tabBrowser.selectedBrowser;
-      let window = browser.contentWindow;
-      let doc = browser.contentDocument;
-      window.getSelection().selectAllChildren(doc.body);
-
-      test.showMenu(null, function (popup) {
-        test.checkMenu([item], [], []);
-        popup.hidePopup();
-
-        test.tabBrowser.removeTab(test.tabBrowser.selectedTab);
-        test.tabBrowser.selectedTab = test.tab;
+    let tablistener = event => {
+      this.tabBrowser.tabContainer.removeEventListener("TabOpen", tablistener, false);
+      let tab = event.target;
+      let browser = tab.linkedBrowser;
+      this.loadFrameScript(browser);
+      this.delayedEventListener(browser, "load", () => {
+        let window = browser.contentWindow;
+        let doc = browser.contentDocument;
+        window.getSelection().selectAllChildren(doc.body);

        test.showMenu(null, function (popup) {
-          test.checkMenu([item], [item], []);
-          test.done();
+          test.checkMenu([item], [], []);
+          popup.hidePopup();
+
+          test.tabBrowser.removeTab(test.tabBrowser.selectedTab);
+          test.tabBrowser.selectedTab = test.tab;
+
+          test.showMenu(null, function (popup) {
+            test.checkMenu([item], [item], []);
+            test.done();
+          });
        });
-      });
-    }, true);
+      }, true);
+    };
+    this.tabBrowser.tabContainer.addEventListener("TabOpen", tablistener, false);
  });
 };

@ -349,8 +354,7 @@ exports.testSelectionContextButtonMatch = function (assert, done) {

  test.withTestDoc(function (window, doc) {
    window.getSelection().selectAllChildren(doc.body);
-    let button = doc.getElementById("button");
-    test.showMenu(button, function (popup) {
+    test.showMenu("#button", function (popup) {
      test.checkMenu([item], [], []);
      test.done();
    });
@ -369,8 +373,7 @@ exports.testSelectionContextButtonNoMatch = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    let button = doc.getElementById("button");
-    test.showMenu(button, function (popup) {
+    test.showMenu("#button", function (popup) {
      test.checkMenu([item], [item], []);
      test.done();
    });
@ -436,55 +439,6 @@ exports.testURLContextNoMatch = function (assert, done) {
 };


-// Removing a non-matching URL context after its item is created and the page is
-// loaded should cause the item's content script to be evaluated when the
-// context menu is next opened.
-exports.testURLContextRemove = function (assert, done) {
-  let test = new TestHelper(assert, done);
-  let loader = test.newLoader();
-
-  let shouldBeEvaled = false;
-  let context = loader.cm.URLContext("*.bogus.com");
-  let item = loader.cm.Item({
-    label: "item",
-    context: context,
-    contentScript: 'self.postMessage("ok"); self.on("context", function () true);',
-    onMessage: function (msg) {
-      assert.ok(shouldBeEvaled,
-                  "content script should be evaluated when expected");
-      assert.equal(msg, "ok", "Should have received the right message");
-      shouldBeEvaled = false;
-    }
-  });
-
-  test.withTestDoc(function (window, doc) {
-    test.showMenu(null, function (popup) {
-      test.checkMenu([item], [item], []);
-
-      item.context.remove(context);
-
-      shouldBeEvaled = true;
-
-      test.hideMenu(function () {
-        test.showMenu(null, function (popup) {
-          test.checkMenu([item], [], []);
-
-          assert.ok(!shouldBeEvaled,
-                      "content script should have been evaluated");
-
-          test.hideMenu(function () {
-            // Shouldn't get evaluated again
-            test.showMenu(null, function (popup) {
-              test.checkMenu([item], [], []);
-              test.done();
-            });
-          });
-        });
-      });
-    });
-  });
-};
-
 // Loading a new page in the same tab should correctly start a new worker for
 // any content scripts
 exports.testPageReload = function (assert, done) {
@ -772,7 +726,7 @@ exports.testContentContextMatchActiveElement = function (assert, done) {
  ];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, [items[2], items[3]], []);
      test.done();
    });
@ -810,7 +764,7 @@ exports.testContentContextNoMatchActiveElement = function (assert, done) {
  ];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, items, []);
      test.done();
    });
@ -848,7 +802,7 @@ exports.testContentContextNoMatchActiveElement = function (assert, done) {
  ];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, items, []);
      test.done();
    });
@ -915,7 +869,6 @@ exports.testContentScriptFile = function (assert, done) {
      itemScript[1].resolve();
    }
  });
-  console.log(item.contentScriptFile, item2.contentScriptFile);

  test.showMenu(null, function (popup) {
    test.checkMenu([item, item2], [], []);
@ -949,8 +902,7 @@ exports.testContentContextArgs = function (assert, done) {
  });
 };

-// Multiple contexts imply intersection, not union, and content context
-// listeners should not be called if all declarative contexts are not current.
+// Multiple contexts imply intersection, not union.
 exports.testMultipleContexts = function (assert, done) {
  let test = new TestHelper(assert, done);
  let loader = test.newLoader();
@ -958,14 +910,10 @@ exports.testMultipleContexts = function (assert, done) {
  let item = new loader.cm.Item({
    label: "item",
    context: [loader.cm.SelectorContext("a[href]"), loader.cm.PageContext()],
-    contentScript: 'self.on("context", function () self.postMessage());',
-    onMessage: function () {
-      test.fail("Context listener should not be called");
-    }
  });

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
      test.checkMenu([item], [item], []);
      test.done();
    });
@ -984,7 +932,7 @@ exports.testRemoveContext = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {

      // The item should be present at first.
      test.checkMenu([item], [], []);
@ -992,7 +940,7 @@ exports.testRemoveContext = function (assert, done) {

      // Remove the img context and check again.
      item.context.remove(ctxt);
-      test.showMenu(doc.getElementById("image"), function (popup) {
+      test.showMenu("#image", function (popup) {
        test.checkMenu([item], [item], []);
        test.done();
      });
@ -1000,6 +948,87 @@ exports.testRemoveContext = function (assert, done) {
  });
 };

+// Once a context is removed, it should no longer cause its item to appear.
+exports.testSetContextRemove = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let ctxt = loader.cm.SelectorContext("img");
+  let item = new loader.cm.Item({
+    label: "item",
+    context: ctxt
+  });
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu("#image", function (popup) {
+
+      // The item should be present at first.
+      test.checkMenu([item], [], []);
+      popup.hidePopup();
+
+      // Remove the img context and check again.
+      item.context = [];
+      test.showMenu("#image", function (popup) {
+        test.checkMenu([item], [item], []);
+        test.done();
+      });
+    });
+  });
+};
+
+// Once a context is added, it should affect whether the item appears.
+exports.testAddContext = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let ctxt = loader.cm.SelectorContext("img");
+  let item = new loader.cm.Item({
+    label: "item"
+  });
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu("#image", function (popup) {
+
+      // The item should not be present at first.
+      test.checkMenu([item], [item], []);
+      popup.hidePopup();
+
+      // Add the img context and check again.
+      item.context.add(ctxt);
+      test.showMenu("#image", function (popup) {
+        test.checkMenu([item], [], []);
+        test.done();
+      });
+    });
+  });
+};
+
+// Once a context is added, it should affect whether the item appears.
+exports.testSetContextAdd = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let ctxt = loader.cm.SelectorContext("img");
+  let item = new loader.cm.Item({
+    label: "item"
+  });
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu("#image", function (popup) {
+
+      // The item should not be present at first.
+      test.checkMenu([item], [item], []);
+      popup.hidePopup();
+
+      // Add the img context and check again.
+      item.context = [ctxt];
+      test.showMenu("#image", function (popup) {
+        test.checkMenu([item], [], []);
+        test.done();
+      });
+    });
+  });
+};

 // Lots of items should overflow into the overflow submenu.
 exports.testOverflow = function (assert, done) {
@ -1636,12 +1665,12 @@ exports.testOverflowTransition = function (assert, done) {
  let allItems = pItems.concat(aItems);

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("link"), function (popup) {
+    test.showMenu("#link", function (popup) {
      // The menu should contain all items and will overflow
      test.checkMenu(allItems, [], []);
      popup.hidePopup();

-      test.showMenu(doc.getElementById("text"), function (popup) {
+      test.showMenu("#text", function (popup) {
        // Only contains hald the items and will not overflow
        test.checkMenu(allItems, aItems, []);
        popup.hidePopup();
@ -1651,12 +1680,12 @@ exports.testOverflowTransition = function (assert, done) {
          test.checkMenu(allItems, allItems, []);
          popup.hidePopup();

-          test.showMenu(doc.getElementById("text"), function (popup) {
+          test.showMenu("#text", function (popup) {
            // Only contains hald the items and will not overflow
            test.checkMenu(allItems, aItems, []);
            popup.hidePopup();

-            test.showMenu(doc.getElementById("link"), function (popup) {
+            test.showMenu("#link", function (popup) {
              // The menu should contain all items and will overflow
              test.checkMenu(allItems, [], []);
              popup.hidePopup();
@ -1666,7 +1695,7 @@ exports.testOverflowTransition = function (assert, done) {
                test.checkMenu(allItems, allItems, []);
                popup.hidePopup();

-                test.showMenu(doc.getElementById("link"), function (popup) {
+                test.showMenu("#link", function (popup) {
                  // The menu should contain all items and will overflow
                  test.checkMenu(allItems, [], []);
                  test.done();
@ -1758,7 +1787,7 @@ exports.testMenuCommand = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
      test.checkMenu([topMenu], [], []);
      let topMenuElt = test.getItemElt(popup, topMenu);
      let topMenuPopup = topMenuElt.firstChild;
@ -1884,7 +1913,7 @@ exports.testMenuClick = function (assert, done) {
  });

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
      test.checkMenu([topMenu], [], []);
      let topMenuElt = test.getItemElt(popup, topMenu);
      let topMenuPopup = topMenuElt.firstChild;
@ -2224,7 +2253,7 @@ exports.testDrawImageOnClickNode = function (assert, done) {
          test.done();
      }
    });
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu([item], [], []);
      test.getItemElt(popup, item).click();
    });
@ -2560,7 +2589,7 @@ exports.testAlreadyOpenIframe = function (assert, done) {
    let item = new loader.cm.Item({
      label: "item"
    });
-    test.showMenu(doc.getElementById("iframe"), function (popup) {
+    test.showMenu("#iframe", function (popup) {
      test.checkMenu([item], [], []);
      test.done();
    });
@ -3004,7 +3033,7 @@ exports.testSubItemDefaultVisible = function (assert, done) {
  let hiddenItems = [items[0].items[2]];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, hiddenItems, []);
      test.done();
    });
@ -3175,7 +3204,7 @@ exports.testSelectionInInnerFrameMatch = function (assert, done) {
    let frame = doc.getElementById("iframe");
    frame.contentWindow.getSelection().selectAllChildren(frame.contentDocument.body);

-    test.showMenu(frame.contentDocument.getElementById("text"), function (popup) {
+    test.showMenu(["#iframe", "#text"], function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3201,7 +3230,7 @@ exports.testSelectionInOuterFrameNoMatch = function (assert, done) {
    let frame = doc.getElementById("iframe");
    window.getSelection().selectAllChildren(doc.body);

-    test.showMenu(frame.contentDocument.getElementById("text"), function (popup) {
+    test.showMenu(["#iframe", "#text"], function (popup) {
      test.checkMenu(items, items, []);
      test.done();
    });
@ -3288,7 +3317,7 @@ exports.testPredicateContextTargetName = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("button"), function (popup) {
+    test.showMenu("#button", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3310,7 +3339,7 @@ exports.testPredicateContextTargetIDSet = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("button"), function (popup) {
+    test.showMenu("#button", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3331,7 +3360,7 @@ exports.testPredicateContextTargetIDNotSet = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementsByClassName("predicate-test-a")[0], function (popup) {
+    test.showMenu(".predicate-test-a", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3352,7 +3381,7 @@ exports.testPredicateContextTextBoxIsEditable = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("textbox"), function (popup) {
+    test.showMenu("#textbox", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3373,7 +3402,7 @@ exports.testPredicateContextReadonlyTextBoxIsNotEditable = function (assert, don
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("readonly-textbox"), function (popup) {
+    test.showMenu("#readonly-textbox", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3394,7 +3423,7 @@ exports.testPredicateContextDisabledTextBoxIsNotEditable = function (assert, don
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("disabled-textbox"), function (popup) {
+    test.showMenu("#disabled-textbox", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3415,7 +3444,7 @@ exports.testPredicateContextTextAreaIsEditable = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("textfield"), function (popup) {
+    test.showMenu("#textfield", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3436,7 +3465,7 @@ exports.testPredicateContextButtonIsNotEditable = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("button"), function (popup) {
+    test.showMenu("#button", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3458,7 +3487,7 @@ exports.testPredicateContextNonInputIsNotEditable = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3480,7 +3509,7 @@ exports.testPredicateContextEditableElement = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("editable"), function (popup) {
+    test.showMenu("#editable", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3549,9 +3578,8 @@ exports.testPredicateContextSelectionInTextBox = function (assert, done) {

  test.withTestDoc(function (window, doc) {
    let textbox = doc.getElementById("textbox");
-    textbox.focus();
-    textbox.setSelectionRange(3, 6);
-    test.showMenu(textbox, function (popup) {
+    test.selectRange("#textbox", 3, 6);
+    test.showMenu("#textbox", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3574,7 +3602,7 @@ exports.testPredicateContextTargetSrcSet = function (assert, done) {

  test.withTestDoc(function (window, doc) {
    image = doc.getElementById("image");
-    test.showMenu(image, function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3595,7 +3623,7 @@ exports.testPredicateContextTargetSrcNotSet = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("link"), function (popup) {
+    test.showMenu("#link", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3618,7 +3646,7 @@ exports.testPredicateContextTargetLinkSet = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementsByClassName("predicate-test-a")[0], function (popup) {
+    test.showMenu(".predicate-test-a", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3639,7 +3667,7 @@ exports.testPredicateContextTargetLinkNotSet = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3660,7 +3688,7 @@ exports.testPredicateContextTargetLinkSetNestedImage = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("predicate-test-nested-image"), function (popup) {
+    test.showMenu("#predicate-test-nested-image", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3681,7 +3709,7 @@ exports.testPredicateContextTargetLinkSetNestedStructure = function (assert, don
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("predicate-test-nested-structure"), function (popup) {
+    test.showMenu("#predicate-test-nested-structure", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3703,7 +3731,7 @@ exports.testPredicateContextTargetValueSet = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("textbox"), function (popup) {
+    test.showMenu("#textbox", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -3724,7 +3752,7 @@ exports.testPredicateContextTargetValueNotSet = function (assert, done) {
  })];

  test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
      test.checkMenu(items, [], []);
      test.done();
    });
@ -4098,14 +4126,69 @@ TestHelper.prototype = {
            OVERFLOW_THRESH_DEFAULT);
  },

-  // Opens the context menu on the current page.  If targetNode is null, the
+  // Loads scripts necessary in the content process
+  loadFrameScript: function(browser = this.browserWindow.gBrowser.selectedBrowser) {
+    function frame_script() {
+      let { interfaces: Ci } = Components;
+      addMessageListener('test:contextmenu', ({ data: { selectors } }) => {
+        let targetNode = null;
+        let contentWin = content;
+        if (selectors) {
+          while (selectors.length) {
+            targetNode = contentWin.document.querySelector(selectors.shift());
+            if (selectors.length)
+              contentWin = targetNode.contentWindow;
+          }
+        }
+
+        let rect = targetNode ?
+                   targetNode.getBoundingClientRect() :
+                   { left: 0, top: 0, width: 0, height: 0 };
+        contentWin.QueryInterface(Ci.nsIInterfaceRequestor)
+                  .getInterface(Ci.nsIDOMWindowUtils)
+                  .sendMouseEvent('contextmenu',
+                  rect.left + (rect.width / 2),
+                  rect.top + (rect.height / 2),
+                  2, 1, 0);
+      });
+
+      addMessageListener('test:ping', () => {
+        sendAsyncMessage('test:pong');
+      });
+
+      addMessageListener('test:select', ({ data: { selector, start, end } }) => {
+        let element = content.document.querySelector(selector);
+        element.focus();
+        if (end === null)
+          end = element.value.length;
+        element.setSelectionRange(start, end);
+      });
+    }
+
+    let messageManager = browser.messageManager;
+    messageManager.loadFrameScript("data:,(" + frame_script.toString() + ")();", true);
+  },
+
+  selectRange: function(selector, start, end) {
+    let messageManager = this.browserWindow.gBrowser.selectedBrowser.messageManager;
+    messageManager.sendAsyncMessage('test:select', { selector, start, end });
+  },
+
+  // Opens the context menu on the current page.  If selectors is null, the
  // menu is opened in the top-left corner.  onShowncallback is passed the
-  // popup.
-  showMenu: function(targetNode, onshownCallback) {
+  // popup. selectors is an array of selectors. Starting from the main document
+  // each selector points to an iframe, the last selector gives the target node.
+  // In the simple case of a single selector just that string can be passed
+  // instead of an array
+  showMenu: function(selectors, onshownCallback) {
    let { promise, resolve } = defer();

-    function sendEvent() {
-      this.delayedEventListener(this.browserWindow, "popupshowing",
+    if (selectors && !Array.isArray(selectors))
+      selectors = [selectors];
+
+    let sendEvent = () => {
+      let menu = this.browserWindow.document.getElementById("contentAreaContextMenu");
+      this.delayedEventListener(menu, "popupshowing",
        function (e) {
          let popup = e.target;
          if (onshownCallback) {
@ -4114,35 +4197,41 @@ TestHelper.prototype = {
          resolve(popup);
        }, false);

-      let rect = targetNode ?
-                 targetNode.getBoundingClientRect() :
-                 { left: 0, top: 0, width: 0, height: 0 };
-      let contentWin = targetNode ? targetNode.ownerDocument.defaultView
-                                  : this.browserWindow.content;
-      contentWin.
-        QueryInterface(Ci.nsIInterfaceRequestor).
-        getInterface(Ci.nsIDOMWindowUtils).
-        sendMouseEvent("contextmenu",
-                       rect.left + (rect.width / 2),
-                       rect.top + (rect.height / 2),
-                       2, 1, 0);
+      let messageManager = this.browserWindow.gBrowser.selectedBrowser.messageManager;
+      messageManager.sendAsyncMessage('test:contextmenu', { selectors });
+    }
+
+    // Bounces an asynchronous message through the browser message manager.
+    // This ensures that any pending messages have been delivered to the frame
+    // scripts and so the remote proxies have been updated
+    let flushMessages = () => {
+      let listener = () => {
+        messageManager.removeMessageListener('test:pong', listener);
+        sendEvent();
+      };
+
+      let messageManager = this.browserWindow.gBrowser.selectedBrowser.messageManager;
+      messageManager.addMessageListener('test:pong', listener);
+      messageManager.sendAsyncMessage('test:ping');
    }

    // If a new tab or window has not yet been opened, open a new tab now.  For
    // some reason using the tab already opened when the test starts causes
    // leaks.  See bug 566351 for details.
-    if (!targetNode && !this.oldSelectedTab && !this.oldBrowserWindow) {
+    if (!selectors && !this.oldSelectedTab && !this.oldBrowserWindow) {
      this.oldSelectedTab = this.tabBrowser.selectedTab;
      this.tab = this.tabBrowser.addTab("about:blank");
      let browser = this.tabBrowser.getBrowserForTab(this.tab);

      this.delayedEventListener(browser, "load", function () {
        this.tabBrowser.selectedTab = this.tab;
-        sendEvent.call(this);
+        this.loadFrameScript();
+        flushMessages();
      }, true);
    }
-    else
-      sendEvent.call(this);
+    else {
+      flushMessages();
+    }

    return promise;
  },
@ -4155,9 +4244,14 @@ TestHelper.prototype = {

  // Opens a new browser window.  The window will be closed automatically when
  // done() is called.
-  withNewWindow: function (onloadCallback) {
-    let win = this.browserWindow.OpenBrowserWindow();
-    this.delayedEventListener(win, "load", onloadCallback, true);
+  withNewWindow: function (onloadCallback, makePrivate = false) {
+    let win = this.browserWindow.OpenBrowserWindow({ private: makePrivate });
+    observers.once("browser-delayed-startup-finished", () => {
+      // Open a new tab so we can make sure it is remote and loaded
+      win.gBrowser.selectedTab = win.gBrowser.addTab();
+      this.loadFrameScript();
+      this.delayedEventListener(win.gBrowser.selectedBrowser, "load", onloadCallback, true);
+    });
    this.oldBrowserWindow = this.browserWindow;
    this.browserWindow = win;
  },
@ -4165,10 +4259,7 @@ TestHelper.prototype = {
  // Opens a new private browser window.  The window will be closed
  // automatically when done() is called.
  withNewPrivateWindow: function (onloadCallback) {
-    let win = this.browserWindow.OpenBrowserWindow({private: true});
-    this.delayedEventListener(win, "load", onloadCallback, true);
-    this.oldBrowserWindow = this.browserWindow;
-    this.browserWindow = win;
+    this.withNewWindow(onloadCallback, true);
  },

  // Opens a new tab with our test page in the current window.  The tab will
@ -4180,6 +4271,7 @@ TestHelper.prototype = {

    this.delayedEventListener(browser, "load", function () {
      this.tabBrowser.selectedTab = this.tab;
+      this.loadFrameScript();
      onloadCallback.call(this, browser.contentWindow, browser.contentDocument);
    }, true, function(evt) {
      return evt.target.location == TEST_DOC_URL;
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@ -5369,7 +5369,10 @@
          }, () => {
            // If the promise rejected, that means we don't want to actually
            // flip the deck, so we cancel the tab switch.
-            gBrowser._cancelTabSwitch(toTab);
+            // We need to nullcheck the method we're about to call because
+            // the binding might be dead at this point.
+            if (gBrowser._cancelTabSwitch)
+              gBrowser._cancelTabSwitch(toTab);
          });

          return val;
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@ -124,7 +124,7 @@ skip-if = os == "linux" || e10s # Linux: Intermittent failures, bug 951680; e10s
 [browser_autocomplete_a11y_label.js]
 skip-if = e10s # Bug ????? - no e10s switch-to-tab support yet
 [browser_backButtonFitts.js]
-skip-if = os != "win" || e10s # The Fitts Law back button is only supported on Windows (bug 571454) / e10s - Bug ?????? test touches content (attempts to add an event listener directly to the contentWindow)
+skip-if = os != "win" || e10s # The Fitts Law back button is only supported on Windows (bug 571454) / e10s - Bug 1099154: test touches content (attempts to add an event listener directly to the contentWindow)
 [browser_blob-channelname.js]
 [browser_bookmark_titles.js]
 skip-if = buildapp == 'mulet' || toolkit == "windows" || e10s # Disabled on Windows due to frequent failures (bugs 825739, 841341) / e10s - Bug 1094205 - places doesn't return the right thing in e10s mode, for some reason
@ -165,7 +165,7 @@ skip-if = e10s # Bug ?????? - test directly manipulates content (eg, var expertD
 [browser_bug432599.js]
 [browser_bug435035.js]
 [browser_bug435325.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content
+skip-if = buildapp == 'mulet' || e10s # Bug 1099156 - test directly manipulates content
 [browser_bug441778.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1056146 - zoom tests use FullZoomHelper and break in e10s
 [browser_bug455852.js]
@ -265,7 +265,7 @@ skip-if = buildapp == 'mulet' || os == "mac" # mac: Intermittent failures, bug 9
 [browser_bug678392.js]
 skip-if = e10s # Bug ?????? - Obscure non-windows failures ("Snapshot array has correct length of 1 after loading one page. - Got 0, expected 1" and more)
 [browser_bug710878.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (doc.querySelector)
+skip-if = e10s # Bug 1100653 - test uses waitForFocus on content
 [browser_bug719271.js]
 skip-if = e10s # Bug 1056146 - zoom tests use FullZoomHelper and break in e10s
 [browser_bug724239.js]
@ -352,10 +352,10 @@ skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (
 [browser_middleMouse_noJSPaste.js]
 skip-if = e10s # Bug 921952 - Content:Click event issues
 [browser_minimize.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (TypeError: gBrowser.docShell is null)
+skip-if = e10s # Bug 1100664 - test directly access content docShells (TypeError: gBrowser.docShell is null)
 [browser_mixedcontent_securityflags.js]
 [browser_notification_tab_switching.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32
+skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32 (or in RemoteAddonsChild.jsm)
 [browser_offlineQuotaNotification.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1093603 - test breaks with PopupNotifications.panel.firstElementChild is null
 [browser_overflowScroll.js]
@ -373,7 +373,7 @@ skip-if = asan # Disabled because it takes a long time (see test for more inform
 [browser_plainTextLinks.js]
 skip-if = e10s # Bug 1093155 - tries to use context menu from browser-chrome and gets in a mess when in e10s mode
 [browser_popupUI.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content (tries to get a popup element directly from content)
+skip-if = buildapp == 'mulet' || e10s # Bug 1100707 - test fails in e10s because it can't get accel-w to close the popup (?)
 [browser_popup_blocker.js]
 [browser_printpreview.js]
 skip-if = buildapp == 'mulet' || e10s # Bug ?????? - timeout after logging "Error: Channel closing: too late to send/recv, messages will be lost"
@ -402,11 +402,11 @@ skip-if = true  # disabled until the tree view is added
                # back to the clear recent history dialog (sanitize.xul), if
                # it ever is (bug 480169)
 [browser_save_link-perwindowpb.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content (event.target)
+skip-if = buildapp == 'mulet' || e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_private_link_perwindowpb.js]
 skip-if = buildapp == 'mulet' || e10s # e10s: Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_video.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content (event.target)
+skip-if = buildapp == 'mulet' || e10s # Bug 1100698 - test uses synthesizeMouse and then does a load of other stuff that breaks in e10s
 [browser_save_video_frame.js]
 [browser_scope.js]
 [browser_searchSuggestionUI.js]
@ -439,7 +439,7 @@ skip-if = e10s
 [browser_tabopen_reflows.js]
 skip-if = e10s # Bug ?????? - test needs to be updated for e10s (captures a stack that isn't correct in e10s)
 [browser_tabs_isActive.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (tries to get/set attributes directly on content docshell)
+skip-if = e10s # Bug 1100664 - test relies on linkedBrowser.docShell
 [browser_tabs_owner.js]
 [browser_trackingUI.js]
 skip-if = e10s # Bug 1093155 - tries to use context menu from browser-chrome and gets in a mess when in e10s mode
@ -449,7 +449,7 @@ support-files =
 [browser_typeAheadFind.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 921935 - focusmanager issues with e10s (test calls waitForFocus)
 [browser_unloaddialogs.js]
-skip-if = e10s # Bug ?????? - test uses chrome windowMediator to try and see alert() from content
+skip-if = e10s # Bug 1100700 - test relies on unload event firing on closed tabs, which it doesn't
 [browser_urlHighlight.js]
 [browser_urlbarAutoFillTrimURLs.js]
 skip-if = e10s # Bug 1093941 - Waits indefinitely for onSearchComplete
@ -459,7 +459,6 @@ skip-if = e10s # Bug 1093941 - used to cause obscure non-windows child process c
 [browser_urlbarRevert.js]
 skip-if = e10s # Bug 1093941 - ESC reverted the location bar value - Got foobar, expected example.com
 [browser_urlbarSearchSingleWordNotification.js]
-skip-if = e10s # Bug 1093997 - intermittent failures in e10s-mode only
 [browser_urlbarStop.js]
 skip-if = e10s # Bug 1093941 - test calls gBrowser.contentWindow.stop
 [browser_urlbarTrimURLs.js]
@ -479,7 +478,7 @@ skip-if = (os == "win" && !debug) || e10s # Bug 1007418
 [browser_windowopen_reflows.js]
 skip-if = buildapp == 'mulet'
 [browser_wyciwyg_urlbarCopying.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (content.document.getElementById)
+skip-if = e10s # Bug 1100703 - test directly manipulates content (content.document.getElementById)
 [browser_zbug569342.js]
 skip-if = e10s # Bug 1094240 - has findbar-related failures
 [browser_registerProtocolHandler_notification.js]
@ -491,10 +490,10 @@ skip-if = e10s
 skip-if = e10s
 [browser_bug1025195_switchToTabHavingURI_ignoreFragment.js]
 [browser_addCertException.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (content.document.getElementById)
+skip-if = e10s # Bug 1100687 - test directly manipulates content (content.document.getElementById)
 [browser_bug1045809.js]
 [browser_e10s_switchbrowser.js]
 [browser_blockHPKP.js]
-skip-if = e10s # bug ?????? - test directly manipulates content (content.document.getElementById)
+skip-if = e10s # bug 1100687 - test directly manipulates content (content.document.getElementById)
 [browser_mcb_redirect.js]
 skip-if = e10s # bug 1084504 - [e10s] Mixed content detection does not take redirection into account
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@ -2056,25 +2056,23 @@ let CustomizableUIInternal = {
    // If we're restoring the widget to it's old placement, fire off the
    // onWidgetAdded event - our own handler will take care of adding it to
    // any build areas.
-    if (widget.currentArea) {
-      this.notifyListeners("onWidgetAdded", widget.id, widget.currentArea,
-                           widget.currentPosition);
-    } else if (widgetMightNeedAutoAdding) {
-      let autoAdd = true;
-      try {
-        autoAdd = Services.prefs.getBoolPref(kPrefCustomizationAutoAdd);
-      } catch (e) {}
-
-      // If the widget doesn't have an existing placement, and it hasn't been
-      // seen before, then add it to its default area so it can be used.
-      // If the widget is not removable, we *have* to add it to its default
-      // area here.
-      let canBeAutoAdded = autoAdd && !gSeenWidgets.has(widget.id);
-      if (!widget.currentArea && (!widget.removable || canBeAutoAdded)) {
-        this.beginBatchUpdate();
+    this.beginBatchUpdate();
+    try {
+      if (widget.currentArea) {
+        this.notifyListeners("onWidgetAdded", widget.id, widget.currentArea,
+                             widget.currentPosition);
+      } else if (widgetMightNeedAutoAdding) {
+        let autoAdd = true;
        try {
-          gSeenWidgets.add(widget.id);
+          autoAdd = Services.prefs.getBoolPref(kPrefCustomizationAutoAdd);
+        } catch (e) {}

+        // If the widget doesn't have an existing placement, and it hasn't been
+        // seen before, then add it to its default area so it can be used.
+        // If the widget is not removable, we *have* to add it to its default
+        // area here.
+        let canBeAutoAdded = autoAdd && !gSeenWidgets.has(widget.id);
+        if (!widget.currentArea && (!widget.removable || canBeAutoAdded)) {
          if (widget.defaultArea) {
            if (this.isAreaLazy(widget.defaultArea)) {
              gFuturePlacements.get(widget.defaultArea).add(widget.id);
@ -2082,10 +2080,13 @@ let CustomizableUIInternal = {
              this.addWidgetToArea(widget.id, widget.defaultArea);
            }
          }
-        } finally {
-          this.endBatchUpdate(true);
        }
      }
+    } finally {
+      // Ensure we always have this widget in gSeenWidgets, and save
+      // state in case this needs to be done here.
+      gSeenWidgets.add(widget.id);
+      this.endBatchUpdate(true);
    }

    this.notifyListeners("onWidgetAfterCreation", widget.id, widget.currentArea);
@ -2119,7 +2120,7 @@ let CustomizableUIInternal = {
  normalizeWidget: function(aData, aSource) {
    let widget = {
      implementation: aData,
-      source: aSource || "addon",
+      source: aSource || CustomizableUI.SOURCE_EXTERNAL,
      instances: new Map(),
      currentArea: null,
      removable: true,
@ -2323,6 +2324,15 @@ let CustomizableUIInternal = {
    // was reset above.
    this._rebuildRegisteredAreas();

+    for (let [widgetId, widget] of gPalette) {
+      if (widget.source == CustomizableUI.SOURCE_EXTERNAL) {
+        gSeenWidgets.add(widgetId);
+      }
+    }
+    if (gSeenWidgets.size) {
+      gDirty = true;
+    }
+
    gResetting = false;
  },

--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@ -154,3 +154,4 @@ skip-if = os == "mac"
 [browser_bootstrapped_custom_toolbar.js]
 [browser_panel_toggle.js]
 [browser_1089591_still_customizable_after_reset.js]
+[browser_1096763_seen_widgets_post_reset.js]
--- a/browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js
+++ b/browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js
@ -0,0 +1,30 @@
+"use strict";
+
+const BUTTONID = "test-seenwidget-post-reset";
+
+add_task(function*() {
+  let widget = CustomizableUI.createWidget({
+    id: BUTTONID,
+    label: "Test widget seen post reset",
+    defaultArea: CustomizableUI.AREA_NAVBAR
+  });
+
+  let bsPass = Cu.import("resource:///modules/CustomizableUI.jsm", {});
+  ok(bsPass.gSeenWidgets.has(BUTTONID), "Widget should be seen after createWidget is called.");
+  CustomizableUI.reset();
+  ok(bsPass.gSeenWidgets.has(BUTTONID), "Widget should still be seen after reset.");
+  ok(!Services.prefs.prefHasUserValue(bsPass.kPrefCustomizationState), "Pref shouldn't be set right now, because that'd break undo.");
+  CustomizableUI.addWidgetToArea(BUTTONID, CustomizableUI.AREA_NAVBAR);
+  gCustomizeMode.removeFromArea(document.getElementById(BUTTONID));
+  let hasUserValue = Services.prefs.prefHasUserValue(bsPass.kPrefCustomizationState);
+  ok(hasUserValue, "Pref should be set right now.");
+  if (hasUserValue) {
+    let seenArray = JSON.parse(Services.prefs.getCharPref(bsPass.kPrefCustomizationState)).seen;
+    isnot(seenArray.indexOf(BUTTONID), -1, "Widget should be in saved 'seen' list.");
+  }
+});
+
+registerCleanupFunction(function() {
+  CustomizableUI.destroyWidget(BUTTONID);
+  CustomizableUI.reset();
+});
--- a/browser/components/loop/LoopRooms.jsm
+++ b/browser/components/loop/LoopRooms.jsm
@ -376,6 +376,34 @@ let LoopRoomsInternal = {
    }, callback);
  },

+  /**
+   * Renames a room.
+   *
+   * @param {String} roomToken   The room token
+   * @param {String} newRoomName The new name for the room
+   * @param {Function} callback   Function that will be invoked once the operation
+   *                              finished. The first argument passed will be an
+   *                              `Error` object or `null`.
+   */
+  rename: function(roomToken, newRoomName, callback) {
+    let room = this.rooms.get(roomToken);
+    let url = "/rooms/" + encodeURIComponent(roomToken);
+
+    let origRoom = this.rooms.get(roomToken);
+    let patchData = {
+      roomName: newRoomName,
+      // XXX We have to supply the max size and room owner due to bug 1099063.
+      maxSize: origRoom.maxSize,
+      roomOwner: origRoom.roomOwner
+    };
+    MozLoopService.hawkRequest(this.sessionType, url, "PATCH", patchData)
+      .then(response => {
+        let data = JSON.parse(response.body);
+        extend(room, data);
+        callback(null, room);
+      }, error => callback(error)).catch(error => callback(error));
+  },
+
  /**
   * Callback used to indicate changes to rooms data on the LoopServer.
   *
@ -443,6 +471,10 @@ this.LoopRooms = {
    return LoopRoomsInternal.leave(roomToken, sessionToken, callback);
  },

+  rename: function(roomToken, newRoomName, callback) {
+    return LoopRoomsInternal.rename(roomToken, newRoomName, callback);
+  },
+
  promise: function(method, ...params) {
    return new Promise((resolve, reject) => {
      this[method](...params, (error, result) => {
--- a/browser/components/loop/content/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@ -59,7 +59,7 @@ loop.roomViews = (function(mozL10n) {
   * Desktop room invitation view (overlay).
   */
  var DesktopRoomInvitationView = React.createClass({displayName: 'DesktopRoomInvitationView',
-    mixins: [ActiveRoomStoreMixin],
+    mixins: [ActiveRoomStoreMixin, React.addons.LinkedStateMixin],

    propTypes: {
      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
@ -67,13 +67,23 @@ loop.roomViews = (function(mozL10n) {

    getInitialState: function() {
      return {
-        copiedUrl: false
+        copiedUrl: false,
+        newRoomName: ""
      }
    },

    handleFormSubmit: function(event) {
      event.preventDefault();
-      // XXX
+
+      var newRoomName = this.state.newRoomName;
+
+      if (newRoomName && this.state.roomName != newRoomName) {
+        this.props.dispatcher.dispatch(
+          new sharedActions.RenameRoom({
+            roomToken: this.state.roomToken,
+            newRoomName: newRoomName
+          }));
+      }
    },

    handleEmailButtonClick: function(event) {
@ -96,7 +106,9 @@ loop.roomViews = (function(mozL10n) {
      return (
        React.DOM.div({className: "room-invitation-overlay"}, 
          React.DOM.form({onSubmit: this.handleFormSubmit}, 
-            React.DOM.input({type: "text", ref: "roomName", 
+            React.DOM.input({type: "text", className: "input-room-name", 
+              valueLink: this.linkState("newRoomName"), 
+              onBlur: this.handleFormSubmit, 
              placeholder: mozL10n.get("rooms_name_this_room_label")})
          ), 
          React.DOM.p(null, mozL10n.get("invite_header_text")), 
--- a/browser/components/loop/content/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@ -59,7 +59,7 @@ loop.roomViews = (function(mozL10n) {
   * Desktop room invitation view (overlay).
   */
  var DesktopRoomInvitationView = React.createClass({
-    mixins: [ActiveRoomStoreMixin],
+    mixins: [ActiveRoomStoreMixin, React.addons.LinkedStateMixin],

    propTypes: {
      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
@ -67,13 +67,23 @@ loop.roomViews = (function(mozL10n) {

    getInitialState: function() {
      return {
-        copiedUrl: false
+        copiedUrl: false,
+        newRoomName: ""
      }
    },

    handleFormSubmit: function(event) {
      event.preventDefault();
-      // XXX
+
+      var newRoomName = this.state.newRoomName;
+
+      if (newRoomName && this.state.roomName != newRoomName) {
+        this.props.dispatcher.dispatch(
+          new sharedActions.RenameRoom({
+            roomToken: this.state.roomToken,
+            newRoomName: newRoomName
+          }));
+      }
    },

    handleEmailButtonClick: function(event) {
@ -96,7 +106,9 @@ loop.roomViews = (function(mozL10n) {
      return (
        <div className="room-invitation-overlay">
          <form onSubmit={this.handleFormSubmit}>
-            <input type="text" ref="roomName"
+            <input type="text" className="input-room-name"
+              valueLink={this.linkState("newRoomName")}
+              onBlur={this.handleFormSubmit}
              placeholder={mozL10n.get("rooms_name_this_room_label")} />
          </form>
          <p>{mozL10n.get("invite_header_text")}</p>
--- a/browser/components/loop/content/shared/js/actions.js
+++ b/browser/components/loop/content/shared/js/actions.js
@ -242,6 +242,15 @@ loop.shared.actions = (function() {
      roomToken: String
    }),

+    /**
+     * Renames a room.
+     * XXX: should move to some roomActions module - refs bug 1079284
+     */
+    RenameRoom: Action.define("renameRoom", {
+      roomToken: String,
+      newRoomName: String
+    }),
+
    /**
     * Copy a room url into the user's clipboard.
     * XXX: should move to some roomActions module - refs bug 1079284
@ -265,6 +274,19 @@ loop.shared.actions = (function() {
      error: Object
    }),

+    /**
+     * Sets up the room information when it is received.
+     * XXX: should move to some roomActions module - refs bug 1079284
+     *
+     * @see https://wiki.mozilla.org/Loop/Architecture/Rooms#GET_.2Frooms.2F.7Btoken.7D
+     */
+    SetupRoomInfo: Action.define("setupRoomInfo", {
+      roomName: String,
+      roomOwner: String,
+      roomToken: String,
+      roomUrl: String
+    }),
+
    /**
     * Updates the room information when it is received.
     * XXX: should move to some roomActions module - refs bug 1079284
@ -274,7 +296,6 @@ loop.shared.actions = (function() {
    UpdateRoomInfo: Action.define("updateRoomInfo", {
      roomName: String,
      roomOwner: String,
-      roomToken: String,
      roomUrl: String
    }),

--- a/browser/components/loop/content/shared/js/activeRoomStore.js
+++ b/browser/components/loop/content/shared/js/activeRoomStore.js
@ -150,6 +150,7 @@ loop.store.ActiveRoomStore = (function() {
    _registerActions: function() {
      this._dispatcher.register(this, [
        "roomFailure",
+        "setupRoomInfo",
        "updateRoomInfo",
        "joinRoom",
        "joinedRoom",
@ -194,12 +195,12 @@ loop.store.ActiveRoomStore = (function() {
          }

          this._dispatcher.dispatch(
-            new sharedActions.UpdateRoomInfo({
-            roomToken: actionData.roomToken,
-            roomName: roomData.roomName,
-            roomOwner: roomData.roomOwner,
-            roomUrl: roomData.roomUrl
-          }));
+            new sharedActions.SetupRoomInfo({
+              roomToken: actionData.roomToken,
+              roomName: roomData.roomName,
+              roomOwner: roomData.roomOwner,
+              roomUrl: roomData.roomUrl
+            }));

          // For the conversation window, we need to automatically
          // join the room.
@ -227,15 +228,18 @@ loop.store.ActiveRoomStore = (function() {
        roomToken: actionData.token,
        roomState: ROOM_STATES.READY
      });
+
+      this._mozLoop.rooms.on("update:" + actionData.roomToken,
+        this._handleRoomUpdate.bind(this));
    },

    /**
-     * Handles the updateRoomInfo action. Updates the room data and
+     * Handles the setupRoomInfo action. Sets up the initial room data and
     * sets the state to `READY`.
     *
-     * @param {sharedActions.UpdateRoomInfo} actionData
+     * @param {sharedActions.SetupRoomInfo} actionData
     */
-    updateRoomInfo: function(actionData) {
+    setupRoomInfo: function(actionData) {
      this.setStoreState({
        roomName: actionData.roomName,
        roomOwner: actionData.roomOwner,
@ -243,6 +247,36 @@ loop.store.ActiveRoomStore = (function() {
        roomToken: actionData.roomToken,
        roomUrl: actionData.roomUrl
      });
+
+      this._mozLoop.rooms.on("update:" + actionData.roomToken,
+        this._handleRoomUpdate.bind(this));
+    },
+
+    /**
+     * Handles the updateRoomInfo action. Updates the room data.
+     *
+     * @param {sharedActions.UpdateRoomInfo} actionData
+     */
+    updateRoomInfo: function(actionData) {
+      this.setStoreState({
+        roomName: actionData.roomName,
+        roomOwner: actionData.roomOwner,
+        roomUrl: actionData.roomUrl
+      });
+    },
+
+    /**
+     * Handles room updates notified by the mozLoop rooms API.
+     *
+     * @param {String} eventName The name of the event
+     * @param {Object} roomData  The new roomData.
+     */
+    _handleRoomUpdate: function(eventName, roomData) {
+      this._dispatcher.dispatch(new sharedActions.UpdateRoomInfo({
+        roomName: roomData.roomName,
+        roomOwner: roomData.roomOwner,
+        roomUrl: roomData.roomUrl
+      }));
    },

    /**
@ -351,6 +385,10 @@ loop.store.ActiveRoomStore = (function() {
     */
    windowUnload: function() {
      this._leaveRoom();
+
+      // If we're closing the window, we can stop listening to updates.
+      this._mozLoop.rooms.off("update:" + this.getStoreState().roomToken,
+        this._handleRoomUpdate.bind(this));
    },

    /**
--- a/browser/components/loop/content/shared/js/roomStore.js
+++ b/browser/components/loop/content/shared/js/roomStore.js
@ -87,6 +87,7 @@ loop.store = loop.store || {};
      "getAllRooms",
      "getAllRoomsError",
      "openRoom",
+      "renameRoom",
      "updateRoomList"
    ]);
  }
@ -411,6 +412,21 @@ loop.store = loop.store || {};
     */
    openRoom: function(actionData) {
      this._mozLoop.rooms.open(actionData.roomToken);
+    },
+
+    /**
+     * Renames a room.
+     *
+     * @param {sharedActions.RenameRoom} actionData
+     */
+    renameRoom: function(actionData) {
+      this._mozLoop.rooms.rename(actionData.roomToken, actionData.newRoomName,
+        function(err) {
+          if (err) {
+            // XXX Give this a proper UI - bug 1100595.
+            console.error("Failed to rename the room", err);
+          }
+        });
    }
  }, Backbone.Events);

--- a/browser/components/loop/standalone/content/js/standaloneMozLoop.js
+++ b/browser/components/loop/standalone/content/js/standaloneMozLoop.js
@ -170,7 +170,13 @@ loop.StandaloneMozLoop = (function(mozL10n) {
        action: "leave",
        sessionToken: sessionToken
      }, null, callback);
-    }
+    },
+
+    // Dummy functions to reflect those in the desktop mozLoop.rooms that we
+    // don't currently use.
+    on: function() {},
+    once: function() {},
+    off: function() {}
  };

  var StandaloneMozLoop = function(options) {
--- a/browser/components/loop/test/desktop-local/roomViews_test.js
+++ b/browser/components/loop/test/desktop-local/roomViews_test.js
@ -119,6 +119,48 @@ describe("loop.roomViews", function () {
          new sharedActions.EmailRoomUrl({roomUrl: "http://invalid"}));
      });

+    describe("Rename Room", function() {
+      var roomNameBox;
+
+      beforeEach(function() {
+        view = mountTestComponent();
+        view.setState({
+          roomToken: "fakeToken",
+          roomName: "fakeName"
+        });
+
+        roomNameBox = view.getDOMNode().querySelector('.input-room-name');
+
+        React.addons.TestUtils.Simulate.change(roomNameBox, { target: {
+          value: "reallyFake"
+        }});
+      });
+
+      it("should dispatch a RenameRoom action when the focus is lost",
+        function() {
+          React.addons.TestUtils.Simulate.blur(roomNameBox);
+
+          sinon.assert.calledOnce(dispatcher.dispatch);
+          sinon.assert.calledWithExactly(dispatcher.dispatch,
+            new sharedActions.RenameRoom({
+              roomToken: "fakeToken",
+              newRoomName: "reallyFake"
+            }));
+        });
+
+      it("should dispatch a RenameRoom action when enter is pressed",
+        function() {
+          React.addons.TestUtils.Simulate.submit(roomNameBox);
+
+          sinon.assert.calledOnce(dispatcher.dispatch);
+          sinon.assert.calledWithExactly(dispatcher.dispatch,
+            new sharedActions.RenameRoom({
+              roomToken: "fakeToken",
+              newRoomName: "reallyFake"
+            }));
+        });
+    });
+
    describe("Copy Button", function() {
      beforeEach(function() {
        view = mountTestComponent();
--- a/browser/components/loop/test/shared/activeRoomStore_test.js
+++ b/browser/components/loop/test/shared/activeRoomStore_test.js
@ -21,10 +21,12 @@ describe("loop.store.ActiveRoomStore", function () {

    fakeMozLoop = {
      rooms: {
-        get: sandbox.stub(),
-        join: sandbox.stub(),
-        refreshMembership: sandbox.stub(),
-        leave: sandbox.stub()
+        get: sinon.stub(),
+        join: sinon.stub(),
+        refreshMembership: sinon.stub(),
+        leave: sinon.stub(),
+        on: sinon.stub(),
+        off: sinon.stub()
      }
    };

@ -161,7 +163,7 @@ describe("loop.store.ActiveRoomStore", function () {
          to.have.property('roomState', ROOM_STATES.GATHER);
      });

-    it("should dispatch an UpdateRoomInfo action if the get is successful",
+    it("should dispatch an SetupRoomInfo action if the get is successful",
      function() {
        store.setupWindowData(new sharedActions.SetupWindowData({
          windowId: "42",
@ -171,7 +173,7 @@ describe("loop.store.ActiveRoomStore", function () {

        sinon.assert.calledTwice(dispatcher.dispatch);
        sinon.assert.calledWithExactly(dispatcher.dispatch,
-          new sharedActions.UpdateRoomInfo(_.extend({
+          new sharedActions.SetupRoomInfo(_.extend({
            roomToken: fakeToken
          }, fakeRoomData)));
      });
@ -233,7 +235,7 @@ describe("loop.store.ActiveRoomStore", function () {
    });
  });

-  describe("#updateRoomInfo", function() {
+  describe("#setupRoomInfo", function() {
    var fakeRoomInfo;

    beforeEach(function() {
@ -246,18 +248,39 @@ describe("loop.store.ActiveRoomStore", function () {
    });

    it("should set the state to READY", function() {
-      store.updateRoomInfo(new sharedActions.UpdateRoomInfo(fakeRoomInfo));
+      store.setupRoomInfo(new sharedActions.SetupRoomInfo(fakeRoomInfo));

      expect(store._storeState.roomState).eql(ROOM_STATES.READY);
    });

+    it("should save the room information", function() {
+      store.setupRoomInfo(new sharedActions.SetupRoomInfo(fakeRoomInfo));
+
+      var state = store.getStoreState();
+      expect(state.roomName).eql(fakeRoomInfo.roomName);
+      expect(state.roomOwner).eql(fakeRoomInfo.roomOwner);
+      expect(state.roomToken).eql(fakeRoomInfo.roomToken);
+      expect(state.roomUrl).eql(fakeRoomInfo.roomUrl);
+    });
+  });
+
+  describe("#updateRoomInfo", function() {
+    var fakeRoomInfo;
+
+    beforeEach(function() {
+      fakeRoomInfo = {
+        roomName: "Its a room",
+        roomOwner: "Me",
+        roomUrl: "http://invalid"
+      };
+    });
+
    it("should save the room information", function() {
      store.updateRoomInfo(new sharedActions.UpdateRoomInfo(fakeRoomInfo));

      var state = store.getStoreState();
      expect(state.roomName).eql(fakeRoomInfo.roomName);
      expect(state.roomOwner).eql(fakeRoomInfo.roomOwner);
-      expect(state.roomToken).eql(fakeRoomInfo.roomToken);
      expect(state.roomUrl).eql(fakeRoomInfo.roomUrl);
    });
  });
@ -596,4 +619,33 @@ describe("loop.store.ActiveRoomStore", function () {
      expect(store._storeState.roomState).eql(ROOM_STATES.READY);
    });
  });
+
+  describe("Events", function() {
+    describe("update:{roomToken}", function() {
+      beforeEach(function() {
+        store.setupRoomInfo(new sharedActions.SetupRoomInfo({
+          roomName: "Its a room",
+          roomOwner: "Me",
+          roomToken: "fakeToken",
+          roomUrl: "http://invalid"
+        }));
+      });
+
+      it("should dispatch an UpdateRoomInfo action", function() {
+        sinon.assert.calledOnce(fakeMozLoop.rooms.on);
+
+        var fakeRoomData = {
+          roomName: "fakeName",
+          roomOwner: "you",
+          roomUrl: "original"
+        };
+
+        fakeMozLoop.rooms.on.callArgWith(1, "update", fakeRoomData);
+
+        sinon.assert.calledOnce(dispatcher.dispatch);
+        sinon.assert.calledWithExactly(dispatcher.dispatch,
+          new sharedActions.UpdateRoomInfo(fakeRoomData));
+      });
+    });
+  });
 });
--- a/browser/components/loop/test/shared/roomStore_test.js
+++ b/browser/components/loop/test/shared/roomStore_test.js
@ -437,4 +437,31 @@ describe("loop.store.RoomStore", function () {
      sinon.assert.calledWithExactly(fakeMozLoop.rooms.open, "42abc");
    });
  });
+
+  describe("#renameRoom", function() {
+    var store, fakeMozLoop;
+
+    beforeEach(function() {
+      fakeMozLoop = {
+        rooms: {
+          rename: sinon.spy()
+        }
+      };
+      store = new loop.store.RoomStore({
+        dispatcher: dispatcher,
+        mozLoop: fakeMozLoop
+      });
+    });
+
+    it("should rename the room via mozLoop", function() {
+      dispatcher.dispatch(new sharedActions.RenameRoom({
+        roomToken: "42abc",
+        newRoomName: "silly name"
+      }));
+
+      sinon.assert.calledOnce(fakeMozLoop.rooms.rename);
+      sinon.assert.calledWith(fakeMozLoop.rooms.rename, "42abc",
+        "silly name");
+    });
+  });
 });
--- a/browser/components/loop/test/xpcshell/test_looprooms.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms.js
@ -209,16 +209,22 @@ add_task(function* setup_server() {
    res.finish();
  }

+  function getJSONData(body) {
+    return JSON.parse(CommonUtils.readBytesFromInputStream(body));
+  }
+
  // Add a request handler for each room in the list.
  [...kRooms.values()].forEach(function(room) {
    loopServer.registerPathHandler("/rooms/" + encodeURIComponent(room.roomToken), (req, res) => {
      if (req.method == "POST") {
-        let body = CommonUtils.readBytesFromInputStream(req.bodyInputStream);
-        let data = JSON.parse(body);
+        let data = getJSONData(req.bodyInputStream);
        res.setStatusLine(null, 200, "OK");
        res.write(JSON.stringify(data));
        res.processAsync();
        res.finish();
+      } else if (req.method == "PATCH") {
+        let data = getJSONData(req.bodyInputStream);
+        returnRoomDetails(res, data.roomName);
      } else {
        returnRoomDetails(res, room.roomName);
      }
@ -363,6 +369,13 @@ add_task(function* test_leaveRoom() {
  Assert.equal(leaveData.sessionToken, "fakeLeaveSessionToken");
 });

+// Test if renaming a room works as expected.
+add_task(function* test_renameRoom() {
+  let roomToken = "_nxD4V4FflQ";
+  let renameData = yield LoopRooms.promise("rename", roomToken, "fakeName");
+  Assert.equal(renameData.roomName, "fakeName");
+});
+
 // Test if the event emitter implementation doesn't leak and is working as expected.
 add_task(function* () {
  Assert.strictEqual(gExpectedAdds.length, 0, "No room additions should be expected anymore");
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@ -198,14 +198,14 @@ let DebuggerController = {
    }

    let target = this._target;
-    let { client, form: { chromeDebugger, traceActor, addonActor } } = target;
+    let { client, form: { chromeDebugger, traceActor, actor } } = target;
    target.on("close", this._onTabDetached);
    target.on("navigate", this._onTabNavigated);
    target.on("will-navigate", this._onTabNavigated);
    this.client = client;

-    if (addonActor) {
-      yield this._startAddonDebugging(addonActor);
+    if (target.isAddon) {
+      yield this._startAddonDebugging(actor);
    } else if (target.chrome) {
      yield this._startChromeDebugging(chromeDebugger);
    } else {
--- a/browser/devtools/debugger/test/head.js
+++ b/browser/devtools/debugger/test/head.js
@ -567,11 +567,7 @@ AddonDebugger.prototype = {
    let addonActor = yield getAddonActorForUrl(this.client, aUrl);

    let targetOptions = {
-      form: {
-        addonActor: addonActor.actor,
-        consoleActor: addonActor.consoleActor,
-        title: addonActor.name
-      },
+      form: addonActor,
      client: this.client,
      chrome: true
    };
--- a/browser/devtools/framework/connect/connect.js
+++ b/browser/devtools/framework/connect/connect.js
@ -154,7 +154,7 @@ let onConnectionReady = Task.async(function*(aType, aTraits) {
 function buildAddonLink(addon, parent) {
  let a = document.createElement("a");
  a.onclick = function() {
-    openToolbox({ addonActor: addon.actor, title: addon.name }, true, "jsdebugger");
+    openToolbox(addon, true, "jsdebugger");
  }

  a.textContent = addon.name;
--- a/browser/devtools/framework/gDevTools.jsm
+++ b/browser/devtools/framework/gDevTools.jsm
@ -780,7 +780,7 @@ let gDevToolsBrowser = {

  isWebIDEWidgetInstalled: function() {
    let widgetWrapper = CustomizableUI.getWidget("webide-button");
-    return !!(widgetWrapper && widgetWrapper.instances.some(i => !!i.node));
+    return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API);
  },

  /**
--- a/browser/devtools/framework/target.js
+++ b/browser/devtools/framework/target.js
@ -280,6 +280,13 @@ TabTarget.prototype = {
    if (!this.client) {
      throw new Error("TabTarget#getTrait() can only be called on remote tabs.");
    }
+
+    // If the targeted actor exposes traits and has a defined value for this traits,
+    // override the root actor traits
+    if (this.form.traits && traitName in this.form.traits) {
+      return this.form.traits[traitName];
+    }
+
    return this.client.traits[traitName];
  },

@ -323,9 +330,13 @@ TabTarget.prototype = {
  },

  get name() {
-    return this._tab && this._tab.linkedBrowser.contentDocument ?
-           this._tab.linkedBrowser.contentDocument.title :
-           this._form.title;
+    if (this._tab && this._tab.linkedBrowser.contentDocument) {
+      return this._tab.linkedBrowser.contentDocument.title
+    } else if (this.isAddon) {
+      return this._form.name;
+    } else {
+      return this._form.title;
+    }
  },

  get url() {
@ -338,7 +349,8 @@ TabTarget.prototype = {
  },

  get isAddon() {
-    return !!(this._form && this._form.addonActor);
+    return !!(this._form && this._form.actor &&
+              this._form.actor.match(/conn\d+\.addon\d+/));
  },

  get isLocalTab() {
--- a/browser/devtools/framework/toolbox-process-window.js
+++ b/browser/devtools/framework/toolbox-process-window.js
@ -37,11 +37,7 @@ function connect() {
    if (addonID) {
      gClient.listAddons(({addons}) => {
        let addonActor = addons.filter(addon => addon.id === addonID).pop();
-        openToolbox({
-          addonActor: addonActor.actor,
-          consoleActor: addonActor.consoleActor,
-          title: addonActor.name
-        });
+        openToolbox(addonActor);
      });
    } else {
      gClient.listTabs(openToolbox);
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@ -53,11 +53,12 @@ loader.lazyGetter(this, "InspectorFront", () => require("devtools/server/actors/
 // (By default, supported target is only local tab)
 const ToolboxButtons = [
  { id: "command-button-pick",
-    isTargetSupported: target => !target.isAddon },
+    isTargetSupported: target =>
+      target.getTrait("highlightable")
+  },
  { id: "command-button-frames",
-    isTargetSupported: target => (
-      !target.isAddon && target.activeTab && target.activeTab.traits.frames
-    )
+    isTargetSupported: target =>
+      ( target.activeTab && target.activeTab.traits.frames )
  },
  { id: "command-button-splitconsole",
    isTargetSupported: target => !target.isAddon },
@ -1249,12 +1250,15 @@ Toolbox.prototype = {
      toolName = toolboxStrings("toolbox.defaultTitle");
    }
    let title = toolboxStrings("toolbox.titleTemplate",
-                               toolName, this.target.url || this.target.name);
+                               toolName,
+                               this.target.isAddon ?
+                               this.target.name :
+                               this.target.url || this.target.name);
    this._host.setTitle(title);
  },

  _listFrames: function (event) {
-    if (!this._target.form || !this._target.form.actor) {
+    if (!this._target.activeTab || !this._target.activeTab.traits.frames) {
      // We are not targetting a regular TabActor
      // it can be either an addon or browser toolbox actor
      return promise.resolve();
--- a/browser/devtools/main.js
+++ b/browser/devtools/main.js
@ -117,7 +117,7 @@ Tools.inspector = {
  },

  isTargetSupported: function(target) {
-    return !target.isAddon && target.hasActor("inspector");
+    return target.hasActor("inspector");
  },

  build: function(iframeWindow, toolbox) {
@ -199,8 +199,7 @@ Tools.styleEditor = {
  commands: "devtools/styleeditor/styleeditor-commands",

  isTargetSupported: function(target) {
-    return !target.isAddon &&
-      (target.hasActor("styleEditor") || target.hasActor("styleSheets"));
+    return target.hasActor("styleEditor") || target.hasActor("styleSheets");
  },

  build: function(iframeWindow, toolbox) {
@ -220,7 +219,7 @@ Tools.shaderEditor = {
  tooltip: l10n("ToolboxShaderEditor.tooltip", shaderEditorStrings),

  isTargetSupported: function(target) {
-    return !target.isAddon;
+    return target.hasActor("webgl");
  },

  build: function(iframeWindow, toolbox) {
@ -242,7 +241,7 @@ Tools.canvasDebugger = {
  // Hide the Canvas Debugger in the Add-on Debugger and Browser Toolbox
  // (bug 1047520).
  isTargetSupported: function(target) {
-    return !target.isAddon && !target.chrome;
+    return target.hasActor("canvas") && !target.chrome;
  },

  build: function (iframeWindow, toolbox) {
@ -268,7 +267,7 @@ Tools.jsprofiler = {
  isTargetSupported: function (target) {
    // Hide the profiler when debugging devices pre bug 1046394,
    // that don't expose profiler actor in content processes.
-    return !target.isAddon && target.hasActor("profiler");
+    return target.hasActor("profiler");
  },

  build: function (frame, target) {
@ -292,7 +291,7 @@ Tools.performance = {
  inMenu: true,

  isTargetSupported: function (target) {
-    return !target.isAddon && target.hasActor("profiler");
+    return target.hasActor("profiler");
  },

  build: function (frame, target) {
@ -312,7 +311,7 @@ Tools.timeline = {
  tooltip: l10n("timeline.tooltip", timelineStrings),

  isTargetSupported: function(target) {
-    return !target.isAddon && target.hasActor("timeline");
+    return target.hasActor("timeline");
  },

  build: function (iframeWindow, toolbox) {
@ -337,7 +336,7 @@ Tools.netMonitor = {
  inMenu: true,

  isTargetSupported: function(target) {
-    return !target.isAddon && target.getTrait("networkMonitor");
+    return target.getTrait("networkMonitor");
  },

  build: function(iframeWindow, toolbox) {
@ -363,7 +362,8 @@ Tools.storage = {

  isTargetSupported: function(target) {
    return target.isLocalTab ||
-           (target.client.traits.storageInspector && !target.isAddon);
+           ( target.hasActor("storage") &&
+             target.getTrait("storageInspector") );
  },

  build: function(iframeWindow, toolbox) {
@ -383,7 +383,7 @@ Tools.webAudioEditor = {
  tooltip: l10n("ToolboxWebAudioEditor1.tooltip", webAudioEditorStrings),

  isTargetSupported: function(target) {
-    return !target.isAddon && !target.chrome && target.hasActor("webaudio");
+    return !target.chrome && target.hasActor("webaudio");
  },

  build: function(iframeWindow, toolbox) {
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@ -17,11 +17,11 @@

 <!ENTITY  locbar.suggest.label          "When using the location bar, suggest:">
 <!ENTITY  locbar.history.label          "History">
-<!ENTITY  locbar.history.accesskey      "i">
+<!ENTITY  locbar.history.accesskey      "H">
 <!ENTITY  locbar.bookmarks.label        "Bookmarks">
-<!ENTITY  locbar.bookmarks.accesskey    "d">
+<!ENTITY  locbar.bookmarks.accesskey    "k">
 <!ENTITY  locbar.openpage.label         "Open tabs">
-<!ENTITY  locbar.openpage.accesskey     "g">
+<!ENTITY  locbar.openpage.accesskey     "O">

 <!ENTITY  acceptCookies.label           "Accept cookies from sites">
 <!ENTITY  acceptCookies.accesskey       "A">
@ -33,7 +33,7 @@
 <!ENTITY  acceptThirdParty.visited.label  "From visited">

 <!ENTITY  keepUntil.label               "Keep until:">
-<!ENTITY  keepUntil.accesskey           "K">
+<!ENTITY  keepUntil.accesskey           "u">

 <!ENTITY  expire.label                  "they expire">
 <!ENTITY  close.label                   "I close &brandShortName;">
--- a/browser/themes/shared/devtools/toolbars.inc.css
+++ b/browser/themes/shared/devtools/toolbars.inc.css
@ -771,8 +771,8 @@
              0 -2px 0 rgba(0,0,0,.06) inset;
 }

-#toolbox-tabs .devtools-tab[selected]:not(:first-child),
-#toolbox-tabs .devtools-tab[highlighted]:not(:first-child) {
+#toolbox-tabs .devtools-tab[selected],
+#toolbox-tabs .devtools-tab[highlighted] {
  border-width: 0;
  -moz-padding-start: 1px;
 }
--- a/docshell/test/browser/browser_timelineMarkers-04.js
+++ b/docshell/test/browser/browser_timelineMarkers-04.js
@ -43,13 +43,13 @@ let test = Task.async(function*() {
    docShell.popProfileTimelineMarkers();

    info("Running the test setup function");
-    let onMarkers = waitForMarkers(docShell);
+    let onMarkers = waitForDOMMarkers(docShell, 5);
    setup();
    info("Waiting for new markers on the docShell");
    let markers = yield onMarkers;

    info("Running the test check function");
-    check(markers.filter(m => m.name == "DOMEvent"));
+    check(markers);
  }

  info("Stop recording");
@ -73,21 +73,20 @@ function openUrl(url) {
  });
 }

-function waitForMarkers(docshell) {
+function waitForDOMMarkers(docshell, numExpected) {
  return new Promise(function(resolve, reject) {
    let waitIterationCount = 0;
    let maxWaitIterationCount = 10; // Wait for 2sec maximum
+    let markers = [];

    let interval = setInterval(() => {
-      let markers = docshell.popProfileTimelineMarkers();
-      if (markers.length > 0) {
+      let newMarkers = docshell.popProfileTimelineMarkers();
+      markers = [...markers, ...newMarkers.filter(m => m.name == "DOMEvent")];
+      if (markers.length >= numExpected
+          || waitIterationCount > maxWaitIterationCount) {
        clearInterval(interval);
        resolve(markers);
      }
-      if (waitIterationCount > maxWaitIterationCount) {
-        clearInterval(interval);
-        resolve([]);
-      }
      waitIterationCount++;
    }, 200);
  });
--- a/docshell/test/browser/timelineMarkers-04.html
+++ b/docshell/test/browser/timelineMarkers-04.html
@ -14,7 +14,7 @@

      xhr = new XMLHttpRequest();
      xhr.onreadystatechange = function() {
-        // Nothing.
+        dump("ReadyState = " + xhr.readyState + "\n");
      };
      xhr.open("get", theURL, true);
      xhr.send();
--- a/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java
@ -19,6 +19,7 @@ import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.util.Log;
+import android.view.MenuItem;
 import android.widget.Toast;

 /**
@ -105,4 +106,13 @@ public class SearchPreferenceActivity extends PreferenceActivity {
        };
        clearHistoryTask.execute();
    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return false;
+    }
 }
--- a/services/common/hawkclient.js
+++ b/services/common/hawkclient.js
@ -262,7 +262,7 @@ this.HawkClient.prototype = {
    };

    let request = this.newHAWKAuthenticatedRESTRequest(uri, credentials, extra);
-    if (method == "post" || method == "put") {
+    if (method == "post" || method == "put" || method == "patch") {
      request[method](payloadObj, onComplete);
    } else {
      request[method](onComplete);
--- a/services/common/hawkrequest.js
+++ b/services/common/hawkrequest.js
@ -67,7 +67,7 @@ HAWKAuthenticatedRESTRequest.prototype = {

  dispatch: function dispatch(method, data, onComplete, onProgress) {
    let contentType = "text/plain";
-    if (method == "POST" || method == "PUT") {
+    if (method == "POST" || method == "PUT" || method == "PATCH") {
      contentType = "application/json";
    }
    if (this.credentials) {
--- a/services/common/rest.js
+++ b/services/common/rest.js
@ -207,6 +207,23 @@ RESTRequest.prototype = {
    return this.dispatch("GET", null, onComplete, onProgress);
  },

+  /**
+   * Perform an HTTP PATCH.
+   *
+   * @param data
+   *        Data to be used as the request body. If this isn't a string
+   *        it will be JSONified automatically.
+   * @param onComplete
+   *        Short-circuit way to set the 'onComplete' method. Optional.
+   * @param onProgress
+   *        Short-circuit way to set the 'onProgress' method. Optional.
+   *
+   * @return the request object.
+   */
+  patch: function patch(data, onComplete, onProgress) {
+    return this.dispatch("PATCH", data, onComplete, onProgress);
+  },
+
  /**
   * Perform an HTTP PUT.
   *
@ -307,7 +324,7 @@ RESTRequest.prototype = {
    }

    // Set HTTP request body.
-    if (method == "PUT" || method == "POST") {
+    if (method == "PUT" || method == "POST" || method == "PATCH") {
      // Convert non-string bodies into JSON.
      if (typeof data != "string") {
        data = JSON.stringify(data);
@ -366,7 +383,7 @@ RESTRequest.prototype = {
                                     Cr.NS_ERROR_NET_TIMEOUT);
    if (!this.onComplete) {
      this._log.error("Unexpected error: onComplete not defined in " +
-                      "abortTimeout.")
+                      "abortTimeout.");
      return;
    }
    this.onComplete(error);
--- a/services/common/tests/unit/test_hawkclient.js
+++ b/services/common/tests/unit/test_hawkclient.js
@ -66,9 +66,7 @@ add_task(function test_authenticated_get_request() {
  yield deferredStop(server);
 });

-add_task(function test_authenticated_post_request() {
-  let method = "POST";
-
+function check_authenticated_request(method) {
  let server = httpd_setup({"/foo": (request, response) => {
      do_check_true(request.hasHeader("Authorization"));

@ -86,6 +84,18 @@ add_task(function test_authenticated_post_request() {
  do_check_eq("bar", result.foo);

  yield deferredStop(server);
+}
+
+add_task(function test_authenticated_post_request() {
+  check_authenticated_request("POST");
+});
+
+add_task(function test_authenticated_put_request() {
+  check_authenticated_request("PUT");
+});
+
+add_task(function test_authenticated_patch_request() {
+  check_authenticated_request("PATCH");
 });

 add_task(function test_credentials_optional() {
--- a/services/common/tests/unit/test_restrequest.js
+++ b/services/common/tests/unit/test_restrequest.js
@ -271,9 +271,10 @@ add_test(function test_charsets() {
 });

 /**
- * Test HTTP PUT with a simple string argument and default Content-Type.
+ * Used for testing PATCH/PUT/POST methods.
 */
-add_test(function test_put() {
+function check_posting_data(method) {
+  let funcName = method.toLowerCase();
  let handler = httpd_handler(200, "OK", "Got it!");
  let server = httpd_setup({"/resource": handler});

@ -299,7 +300,7 @@ add_test(function test_put() {
    do_check_eq(this.response.status, 200);
    do_check_eq(this.response.body, "Got it!");

-    do_check_eq(handler.request.method, "PUT");
+    do_check_eq(handler.request.method, method);
    do_check_eq(handler.request.body, "Hullo?");
    do_check_eq(handler.request.getHeader("Content-Type"), "text/plain");

@ -311,61 +312,33 @@ add_test(function test_put() {
    });
  };

-  do_check_eq(request.put("Hullo?", onComplete, onProgress), request);
+  do_check_eq(request[funcName]("Hullo?", onComplete, onProgress), request);
  do_check_eq(request.status, request.SENT);
-  do_check_eq(request.method, "PUT");
+  do_check_eq(request.method, method);
  do_check_throws(function () {
-    request.put("Hai!");
+    request[funcName]("Hai!");
  });
+}
+
+/**
+ * Test HTTP PATCH with a simple string argument and default Content-Type.
+ */
+add_test(function test_patch() {
+  check_posting_data("PATCH");
+});
+
+/**
+ * Test HTTP PUT with a simple string argument and default Content-Type.
+ */
+add_test(function test_put() {
+  check_posting_data("PUT");
 });

 /**
 * Test HTTP POST with a simple string argument and default Content-Type.
 */
 add_test(function test_post() {
-  let handler = httpd_handler(200, "OK", "Got it!");
-  let server = httpd_setup({"/resource": handler});
-
-  let request = new RESTRequest(server.baseURI + "/resource");
-  do_check_eq(request.status, request.NOT_SENT);
-
-  request.onProgress = request.onComplete = function () {
-    do_throw("This function should have been overwritten!");
-  };
-
-  let onProgress_called = false;
-  function onProgress() {
-    onProgress_called = true;
-    do_check_eq(this.status, request.IN_PROGRESS);
-    do_check_true(this.response.body.length > 0);
-  };
-
-  function onComplete(error) {
-    do_check_eq(error, null);
-
-    do_check_eq(this.status, this.COMPLETED);
-    do_check_true(this.response.success);
-    do_check_eq(this.response.status, 200);
-    do_check_eq(this.response.body, "Got it!");
-
-    do_check_eq(handler.request.method, "POST");
-    do_check_eq(handler.request.body, "Hullo?");
-    do_check_eq(handler.request.getHeader("Content-Type"), "text/plain");
-
-    do_check_true(onProgress_called);
-    CommonUtils.nextTick(function () {
-      do_check_eq(request.onComplete, null);
-      do_check_eq(request.onProgress, null);
-      server.stop(run_next_test);
-    });
-  };
-
-  do_check_eq(request.post("Hullo?", onComplete, onProgress), request);
-  do_check_eq(request.status, request.SENT);
-  do_check_eq(request.method, "POST");
-  do_check_throws(function () {
-    request.post("Hai!");
-  });
+  check_posting_data("POST");
 });

 /**
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@ -28,7 +28,6 @@ skip-if = toolkit == 'gonk'
 [test_bagheera_server.js]
 [test_bagheera_client.js]
 [test_hawkclient.js]
-run-if = fxaccounts # This test imports some FxAccounts modules.
 [test_hawkrequest.js]
 [test_observers.js]
 [test_restrequest.js]
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@ -702,6 +702,9 @@ SyncEngine.prototype = {
  _recordObj: CryptoWrapper,
  version: 1,

+  // Which sortindex to use when retrieving records for this engine.
+  _defaultSort: undefined,
+
  // A relative priority to use when computing an order
  // for engines to be synced. Higher-priority engines
  // (lower numbers) are synced first.
@ -929,6 +932,10 @@ SyncEngine.prototype = {
      newitems = this._itemSource();
    }

+    if (this._defaultSort) {
+      newitems.sort = this._defaultSort;
+    }
+
    if (isMobile) {
      batchSize = MOBILE_BATCH_SIZE;
    }
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@ -202,6 +202,7 @@ BookmarksEngine.prototype = {
  _storeObj: BookmarksStore,
  _trackerObj: BookmarksTracker,
  version: 2,
+  _defaultSort: "index",

  syncPriority: 4,

--- a/services/sync/modules/engines/clients.js
+++ b/services/sync/modules/engines/clients.js
@ -29,7 +29,11 @@ ClientsRec.prototype = {
  ttl: CLIENTS_TTL
 };

-Utils.deferGetSet(ClientsRec, "cleartext", ["name", "type", "commands", "version", "protocols"]);
+Utils.deferGetSet(ClientsRec,
+                  "cleartext",
+                  ["name", "type", "commands",
+                   "version", "protocols",
+                   "formfactor", "os", "appPackage", "application", "device"]);


 this.ClientEngine = function ClientEngine(service) {
@ -100,6 +104,11 @@ ClientEngine.prototype = {
  },
  set localID(value) Svc.Prefs.set("client.GUID", value),

+  get brandName() {
+    let brand = new StringBundle("chrome://branding/locale/brand.properties");
+    return brand.get("brandShortName");
+  },
+
  get localName() {
    let localName = Svc.Prefs.get("client.name", "");
    if (localName != "")
@ -111,9 +120,8 @@ ClientEngine.prototype = {
    let user = env.get("USER") || env.get("USERNAME") ||
               Svc.Prefs.get("account") || Svc.Prefs.get("username");

+    let brandName = this.brandName;
    let appName;
-    let brand = new StringBundle("chrome://branding/locale/brand.properties");
-    let brandName = brand.get("brandShortName");
    try {
      let syncStrings = new StringBundle("chrome://browser/locale/sync.properties");
      appName = syncStrings.getFormattedString("sync.defaultAccountApplication", [brandName]);
@ -412,9 +420,18 @@ ClientStore.prototype = {
      record.commands = this.engine.localCommands;
      record.version = Services.appinfo.version;
      record.protocols = SUPPORTED_PROTOCOL_VERSIONS;
-    }
-    else
+
+      // Optional fields.
+      record.os = Services.appinfo.OS;             // "Darwin"
+      record.appPackage = Services.appinfo.ID;
+      record.application = this.engine.brandName   // "Nightly"
+
+      // We can't compute these yet.
+      // record.device = "";            // Bug 1100723
+      // record.formfactor = "";        // Bug 1100722
+    } else {
      record.cleartext = this._remoteClients[id];
+    }

    return record;
  },
--- a/services/sync/tests/unit/test_clients_engine.js
+++ b/services/sync/tests/unit/test_clients_engine.js
@ -577,6 +577,32 @@ add_test(function test_receive_display_uri() {
  do_check_true(engine.processIncomingCommands());
 });

+add_test(function test_optional_client_fields() {
+  _("Ensure that we produce records with the fields added in Bug 1097222.");
+
+  const SUPPORTED_PROTOCOL_VERSIONS = ["1.1", "1.5"];
+  let local = engine._store.createRecord(engine.localID, "clients");
+  do_check_eq(local.name, engine.localName);
+  do_check_eq(local.type, engine.localType);
+  do_check_eq(local.version, Services.appinfo.version);
+  do_check_array_eq(local.protocols, SUPPORTED_PROTOCOL_VERSIONS);
+
+  // Optional fields.
+  // Make sure they're what they ought to be...
+  do_check_eq(local.os, Services.appinfo.OS);
+  do_check_eq(local.appPackage, Services.appinfo.ID);
+
+  // ... and also that they're non-empty.
+  do_check_true(!!local.os);
+  do_check_true(!!local.appPackage);
+  do_check_true(!!local.application);
+
+  // We don't currently populate device or formfactor.
+  // See Bug 1100722, Bug 1100723.
+
+  run_next_test();
+});
+
 function run_test() {
  initTestLogging("Trace");
  Log.repository.getLogger("Sync.Engine.Clients").level = Log.Level.Trace;
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@ -3793,16 +3793,23 @@ SearchService.prototype = {
      }
    }

-    // Array for the remaining engines, alphabetically sorted
-    var alphaEngines = [];
+    // Array for the remaining engines, alphabetically sorted.
+    let alphaEngines = [];

    for each (engine in this._engines) {
      if (!(engine.name in addedEngines))
        alphaEngines.push(this._engines[engine.name]);
    }
-    alphaEngines = alphaEngines.sort(function (a, b) {
-                                       return a.name.localeCompare(b.name);
-                                     });
+
+    let locale = Cc["@mozilla.org/intl/nslocaleservice;1"]
+                   .getService(Ci.nsILocaleService)
+                   .newLocale(getLocale());
+    let collation = Cc["@mozilla.org/intl/collation-factory;1"]
+                      .createInstance(Ci.nsICollationFactory)
+                      .CreateCollation(locale);
+    const strength = Ci.nsICollation.kCollationCaseInsensitiveAscii;
+    let comparator = (a, b) => collation.compareString(strength, a.name, b.name);
+    alphaEngines.sort(comparator);
    return this.__sortedEngines = this.__sortedEngines.concat(alphaEngines);
  },

--- a/toolkit/content/browser-child.js
+++ b/toolkit/content/browser-child.js
@ -38,9 +38,13 @@ FocusSyncHandler.init();

 let WebProgressListener = {
  init: function() {
+    this._filter = Cc["@mozilla.org/appshell/component/browser-status-filter;1"]
+                     .createInstance(Ci.nsIWebProgress);
+    this._filter.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_ALL);
+
    let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
                              .getInterface(Ci.nsIWebProgress);
-    webProgress.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_ALL);
+    webProgress.addProgressListener(this._filter, Ci.nsIWebProgress.NOTIFY_ALL);
  },

  _requestSpec: function (aRequest, aPropertyName) {
@ -50,12 +54,18 @@ let WebProgressListener = {
  },

  _setupJSON: function setupJSON(aWebProgress, aRequest) {
+    if (aWebProgress) {
+      aWebProgress = {
+        isTopLevel: aWebProgress.isTopLevel,
+        isLoadingDocument: aWebProgress.isLoadingDocument,
+        loadType: aWebProgress.loadType
+      };
+    }
+
    return {
-      isTopLevel: aWebProgress.isTopLevel,
-      isLoadingDocument: aWebProgress.isLoadingDocument,
+      webProgress: aWebProgress || null,
      requestURI: this._requestSpec(aRequest, "URI"),
      originalRequestURI: this._requestSpec(aRequest, "originalURI"),
-      loadType: aWebProgress.loadType,
      documentContentType: content.document && content.document.contentType
    };
  },
@ -64,7 +74,7 @@ let WebProgressListener = {
    return {
      contentWindow: content,
      // DOMWindow is not necessarily the content-window with subframes.
-      DOMWindow: aWebProgress.DOMWindow
+      DOMWindow: aWebProgress && aWebProgress.DOMWindow
    };
  },

@ -92,7 +102,7 @@ let WebProgressListener = {
    json.canGoBack = docShell.canGoBack;
    json.canGoForward = docShell.canGoForward;

-    if (json.isTopLevel) {
+    if (aWebProgress && aWebProgress.isTopLevel) {
      json.documentURI = content.document.documentURIObject.spec;
      json.charset = content.document.characterSet;
      json.mayEnableCharacterEncodingMenu = docShell.mayEnableCharacterEncodingMenu;
--- a/toolkit/devtools/Loader.jsm
+++ b/toolkit/devtools/Loader.jsm
@ -269,7 +269,9 @@ DevToolsLoader.prototype = {
   * @see setProvider
   */
  require: function() {
-    this._chooseProvider();
+    if (!this._provider) {
+      this._chooseProvider();
+    }
    return this.require.apply(this, arguments);
  },

--- a/toolkit/devtools/server/actors/webbrowser.js
+++ b/toolkit/devtools/server/actors/webbrowser.js
@ -1801,6 +1801,11 @@ BrowserAddonActor.prototype = {
      url: this.url,
      debuggable: this._addon.isDebuggable,
      consoleActor: this._consoleActor.actorID,
+
+      traits: {
+        highlightable: false,
+        networkMonitor: false,
+      },
    };
  },

--- a/toolkit/devtools/tests/unit/test_require.js
+++ b/toolkit/devtools/tests/unit/test_require.js
@ -0,0 +1,20 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test devtools.require
+
+// Ensure that DevtoolsLoader.require doesn't spawn multiple
+// loader/modules when early cached
+function testBug1091706() {
+  let loader = new DevToolsLoader();
+  let require = loader.require;
+
+  let color1 = require("devtools/css-color");
+  let color2 = require("devtools/css-color");
+
+  do_check_true(color1 === color2);
+}
+
+function run_test() {
+  testBug1091706();
+}
--- a/toolkit/devtools/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/tests/unit/xpcshell.ini
@ -12,3 +12,4 @@ support-files =
 [test_async-utils.js]
 [test_consoleID.js]
 [test_require_lazy.js]
+[test_require.js]
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@ -314,29 +314,26 @@ PopupNotifications.prototype = {
    let notifications = this._getNotificationsForBrowser(browser);
    notifications.push(notification);

-    let isActive = this._isActiveBrowser(browser);
+    let isActiveBrowser = this._isActiveBrowser(browser);
    let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
-    if (isActive && fm.activeWindow == this.window) {
-      // show panel now
-      this._update(notifications, notification.anchorElement, true);
-    } else {
-      // Otherwise, update() will display the notification the next time the
-      // relevant tab/window is selected.
+    let isActiveWindow = fm.activeWindow == this.window;

-      // If the tab is selected but the window is in the background, let the OS
-      // tell the user that there's a notification waiting in that window.
-      // At some point we might want to do something about background tabs here
-      // too. When the user switches to this window, we'll show the panel if
-      // this browser is a tab (thus showing the anchor icon). For
-      // non-tabbrowser browsers, we need to make the icon visible now or the
-      // user will not be able to open the panel.
-      if (!notification.dismissed && isActive) {
-        this.window.getAttention();
+    if (isActiveBrowser) {
+      if (isActiveWindow) {
+        // show panel now
+        this._update(notifications, notification.anchorElement, true);
+      } else {
+        // indicate attention and update the icon if necessary
+        if (!notification.dismissed) {
+          this.window.getAttention();
+        }
        if (notification.anchorElement.parentNode != this.iconBox) {
          this._updateAnchorIcon(notifications, notification.anchorElement);
        }
+        this._notify("backgroundShow");
      }

+    } else {
      // Notify observers that we're not showing the popup (useful for testing)
      this._notify("backgroundShow");
    }
--- a/toolkit/modules/RemoteWebProgress.jsm
+++ b/toolkit/modules/RemoteWebProgress.jsm
@ -139,11 +139,20 @@ RemoteWebProgressManager.prototype = {
    let json = aMessage.json;
    let objects = aMessage.objects;

+    let webProgress = null;
+    let isTopLevel = json.webProgress && json.webProgress.isTopLevel;
    // The top-level WebProgress is always the same, but because we don't
-    // really have a concept of subframes/content we always creat a new object
+    // really have a concept of subframes/content we always create a new object
    // for those.
-    let webProgress = json.isTopLevel ? this._topLevelWebProgress
-                                      : new RemoteWebProgress(this, false);
+    if (json.webProgress) {
+      webProgress = isTopLevel ? this._topLevelWebProgress
+                               : new RemoteWebProgress(this, false);
+
+      // Update the actual WebProgress fields.
+      webProgress._isLoadingDocument = json.webProgress.isLoadingDocument;
+      webProgress._DOMWindow = objects.DOMWindow;
+      webProgress._loadType = json.webProgress.loadType;
+    }

    // The WebProgressRequest object however is always dynamic.
    let request = null;
@ -152,12 +161,7 @@ RemoteWebProgressManager.prototype = {
                                             json.originalRequestURI);
    }

-    // Update the actual WebProgress fields.
-    webProgress._isLoadingDocument = json.isLoadingDocument;
-    webProgress._DOMWindow = objects.DOMWindow;
-    webProgress._loadType = json.loadType;
-
-    if (json.isTopLevel) {
+    if (isTopLevel) {
      this._browser._contentWindow = objects.contentWindow;
      this._browser._documentContentType = json.documentContentType;
    }
@ -175,7 +179,7 @@ RemoteWebProgressManager.prototype = {
      this._browser.webNavigation.canGoBack = json.canGoBack;
      this._browser.webNavigation.canGoForward = json.canGoForward;

-      if (json.isTopLevel) {
+      if (isTopLevel) {
        this._browser.webNavigation._currentURI = location;
        this._browser._characterSet = json.charset;
        this._browser._documentURI = newURI(json.documentURI);
@ -190,7 +194,7 @@ RemoteWebProgressManager.prototype = {
    case "Content:SecurityChange":
      let [status, state] = this._fixSSLStatusAndState(json.status, json.state);

-      if (json.isTopLevel) {
+      if (isTopLevel) {
        // Invoking this getter triggers the generation of the underlying object,
        // which we need to access with ._securityUI, because .securityUI returns
        // a wrapper that makes _update inaccessible.