From 1081b45e497c01b00b09d2e68b0fe93f1a8154d2 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 18 Dec 2013 12:48:38 -0600
Subject: [PATCH 01/78] Bug 946813 - Part 0: Backout ef84114446cc (bug 941012)
 for breaking browser debugger. r=bustage

--HG--
extra : rebase_source : d2f9506adc15b5f72c0dda2fd4f28deabbf874ec
---
 toolkit/devtools/Loader.jsm            |  1 -
 toolkit/devtools/server/dbg-server.jsm | 30 ++++++++++--
 toolkit/devtools/server/main.js        | 64 ++++++++++++++------------
 3 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/toolkit/devtools/Loader.jsm b/toolkit/devtools/Loader.jsm
index 530831976ae7..d2c8bb034730 100644
--- a/toolkit/devtools/Loader.jsm
+++ b/toolkit/devtools/Loader.jsm
@@ -35,7 +35,6 @@ let loaderGlobals = {
   btoa: btoa,
   console: console,
   _Iterator: Iterator,
-  ChromeWorker: ChromeWorker,
   loader: {
     lazyGetter: XPCOMUtils.defineLazyGetter.bind(XPCOMUtils),
     lazyImporter: XPCOMUtils.defineLazyModuleGetter.bind(XPCOMUtils),
diff --git a/toolkit/devtools/server/dbg-server.jsm b/toolkit/devtools/server/dbg-server.jsm
index 4087d6ab4ec6..44d88f3c3195 100644
--- a/toolkit/devtools/server/dbg-server.jsm
+++ b/toolkit/devtools/server/dbg-server.jsm
@@ -15,11 +15,31 @@ const Ci = Components.interfaces;
 const Cc = Components.classes;
 const Cu = Components.utils;
 
-const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-
 this.EXPORTED_SYMBOLS = ["DebuggerServer", "ActorPool"];
 
-let server = devtools.require("devtools/server/main");
+var loadSubScript =
+  "function loadSubScript(aURL)\n" +
+  "{\n" +
+  "const Ci = Components.interfaces;\n" +
+  "const Cc = Components.classes;\n" +
+  "  try {\n" +
+  "    let loader = Cc[\"@mozilla.org/moz/jssubscript-loader;1\"]\n" +
+  "      .getService(Ci.mozIJSSubScriptLoader);\n" +
+  "    loader.loadSubScript(aURL, this);\n" +
+  "  } catch(e) {\n" +
+  "    dump(\"Error loading: \" + aURL + \": \" + e + \" - \" + e.stack + \"\\n\");\n" +
+  "    throw e;\n" +
+  "  }\n" +
+  "}";
 
-this.DebuggerServer = server.DebuggerServer;
-this.ActorPool = server.ActorPool;
+// Load the debugging server in a sandbox with its own compartment.
+var systemPrincipal = Cc["@mozilla.org/systemprincipal;1"]
+                      .createInstance(Ci.nsIPrincipal);
+
+var gGlobal = Cu.Sandbox(systemPrincipal);
+gGlobal.ChromeWorker = ChromeWorker;
+Cu.evalInSandbox(loadSubScript, gGlobal, "1.8");
+gGlobal.loadSubScript("resource://gre/modules/devtools/server/main.js");
+
+this.DebuggerServer = gGlobal.DebuggerServer;
+this.ActorPool = gGlobal.ActorPool;
diff --git a/toolkit/devtools/server/main.js b/toolkit/devtools/server/main.js
index 70c82f0e6183..cf55cb119c57 100644
--- a/toolkit/devtools/server/main.js
+++ b/toolkit/devtools/server/main.js
@@ -10,22 +10,36 @@
  * debugging global.
  */
 
-// Until all Debugger server code is converted to SDK modules,
-// imports Components.* alias from chrome module.
-var { Ci, Cc, CC, Cu, Cr } = require("chrome");
-// On B2G, `this` != Global scope, so `Ci` won't be binded on `this`
-// (i.e. this.Ci is undefined) Then later, when using loadSubScript,
-// Ci,... won't be defined for sub scripts.
-this.Ci = Ci;
-this.Cc = Cc;
-this.CC = CC;
-this.Cu = Cu;
-this.Cr = Cr;
-// Overload `Components` to prevent SDK loader exception on Components
-// object usage
-Object.defineProperty(this, "Components", {
-  get: function () require("chrome").components
-});
+// |this.require| is used to test if this file was loaded via the devtools
+// loader (as it is in DebuggerProcess.jsm) or via loadSubScript (as it is from
+// dbg-server.jsm).  Note that testing |require| is not safe in either
+// situation, as it causes a ReferenceError.
+var Ci, Cc, CC, Cu, Cr, Components;
+if (this.require) {
+  ({ Ci, Cc, CC, Cu, Cr, components: Components }) = require("chrome");
+} else {
+  ({
+    interfaces: Ci,
+    classes: Cc,
+    Constructor: CC,
+    utils: Cu,
+    results: Cr
+  }) = Components;
+}
+
+// On B2G, if |this.require| is undefined at this point, it remains undefined
+// later on when |DebuggerServer.registerModule| is called.  On desktop (and
+// perhaps other places), if |this.require| starts out undefined, it ends up
+// being set to some native code by the time we get to |registerModule|.  Here
+// we perform a test early on, and then cache the correct require function for
+// later use.
+var localRequire;
+if (this.require) {
+  localRequire = id => require(id);
+} else {
+  let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+  localRequire = id => devtools.require(id);
+}
 
 const DBG_STRINGS_URI = "chrome://global/locale/devtools/debugger.properties";
 
@@ -54,12 +68,10 @@ function loadSubScript(aURL)
   }
 }
 
-let {defer, resolve, reject, promised, all} = require("sdk/core/promise");
-this.defer = defer;
-this.resolve = resolve;
-this.reject = reject;
-this.promised = promised;
-this.all = all;
+let loaderRequire = this.require;
+this.require = null;
+loadSubScript.call(this, "resource://gre/modules/commonjs/sdk/core/promise.js");
+this.require = loaderRequire;
 
 Cu.import("resource://gre/modules/devtools/SourceMap.jsm");
 
@@ -70,14 +82,12 @@ function dumpn(str) {
     dump("DBG-SERVER: " + str + "\n");
   }
 }
-this.dumpn = dumpn;
 
 function dbg_assert(cond, e) {
   if (!cond) {
     return e;
   }
 }
-this.dbg_assert = dbg_assert;
 
 loadSubScript.call(this, "resource://gre/modules/devtools/server/transport.js");
 
@@ -314,7 +324,7 @@ var DebuggerServer = {
     }
 
     let moduleAPI = ModuleAPI();
-    let mod = require(id);
+    let mod = localRequire(id);
     mod.register(moduleAPI);
     gRegisteredModules[id] = { module: mod, api: moduleAPI };
   },
@@ -678,8 +688,6 @@ var DebuggerServer = {
 if (this.exports) {
   exports.DebuggerServer = DebuggerServer;
 }
-// Needed on B2G (See header note)
-this.DebuggerServer = DebuggerServer;
 
 /**
  * Construct an ActorPool.
@@ -698,8 +706,6 @@ function ActorPool(aConnection)
 if (this.exports) {
   exports.ActorPool = ActorPool;
 }
-// Needed on B2G (See header note)
-this.ActorPool = ActorPool;
 
 ActorPool.prototype = {
   /**

From 887cbb50afcb1788b979d62662d7497b1d0f11f6 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Wed, 18 Dec 2013 19:10:16 +0200
Subject: [PATCH 02/78] Bug 951674 - Vertical splitter isn't shown for the
 Events tab, r=fitzgen

---
 .../devtools/shared/widgets/VariablesView.jsm    |  2 --
 browser/themes/linux/devtools/debugger.css       |  4 ++--
 browser/themes/linux/devtools/widgets.css        |  6 +++---
 browser/themes/osx/devtools/debugger.css         |  4 ++--
 browser/themes/osx/devtools/widgets.css          |  6 +++---
 browser/themes/shared/devtools/common.css        | 16 ++++++++--------
 browser/themes/shared/devtools/profiler.inc.css  |  6 +++---
 .../themes/shared/devtools/shadereditor.inc.css  |  4 ++--
 browser/themes/windows/devtools/debugger.css     |  4 ++--
 browser/themes/windows/devtools/widgets.css      |  6 +++---
 10 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/browser/devtools/shared/widgets/VariablesView.jsm b/browser/devtools/shared/widgets/VariablesView.jsm
index 78b9731472dc..9ab1bcc9aa46 100644
--- a/browser/devtools/shared/widgets/VariablesView.jsm
+++ b/browser/devtools/shared/widgets/VariablesView.jsm
@@ -907,7 +907,6 @@ VariablesView.prototype = {
     label.className = "variables-view-empty-notice";
     label.setAttribute("value", this._emptyTextValue);
 
-    this._parent.setAttribute("empty", "");
     this._parent.appendChild(label);
     this._emptyTextNode = label;
   },
@@ -920,7 +919,6 @@ VariablesView.prototype = {
       return;
     }
 
-    this._parent.removeAttribute("empty");
     this._parent.removeChild(this._emptyTextNode);
     this._emptyTextNode = null;
   },
diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index ed1d9552ec10..2b06bb3a5b37 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -14,7 +14,7 @@
 }
 
 #sources-and-editor-splitter {
-  -moz-border-start-color: transparent;
+  border-color: transparent;
 }
 
 /* Sources toolbar */
@@ -485,7 +485,7 @@
 }
 
 #globalsearch + .devtools-horizontal-splitter {
-  -moz-border-top-colors: #bfbfbf;
+  border-color: #bfbfbf;
 }
 
 .dbg-source-results {
diff --git a/browser/themes/linux/devtools/widgets.css b/browser/themes/linux/devtools/widgets.css
index 8342525997d9..a4b9ca72baab 100644
--- a/browser/themes/linux/devtools/widgets.css
+++ b/browser/themes/linux/devtools/widgets.css
@@ -271,7 +271,7 @@
 
 .side-menu-widget-container {
   /* Hack: force hardware acceleration */
-  transform: translateX(0px);
+  transform: translateZ(1px);
 }
 
 .side-menu-widget-container[theme="dark"] {
@@ -437,9 +437,9 @@
 
 /* VariablesView */
 
-.variables-view-container:not([empty]) {
+.variables-view-container {
   /* Hack: force hardware acceleration */
-  transform: translateX(1px);
+  transform: translateZ(1px);
 }
 
 .variables-view-empty-notice {
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index 09419851d2c1..1898c1d60be7 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -16,7 +16,7 @@
 }
 
 #sources-and-editor-splitter {
-  -moz-border-start-color: transparent;
+  border-color: transparent;
 }
 
 /* Sources toolbar */
@@ -487,7 +487,7 @@
 }
 
 #globalsearch + .devtools-horizontal-splitter {
-  -moz-border-top-colors: #bfbfbf;
+  border-color: #bfbfbf;
 }
 
 .dbg-source-results {
diff --git a/browser/themes/osx/devtools/widgets.css b/browser/themes/osx/devtools/widgets.css
index 6b8b33893f60..cd7b48ce2d4f 100644
--- a/browser/themes/osx/devtools/widgets.css
+++ b/browser/themes/osx/devtools/widgets.css
@@ -271,7 +271,7 @@
 
 .side-menu-widget-container {
   /* Hack: force hardware acceleration */
-  transform: translateX(0px);
+  transform: translateZ(1px);
 }
 
 .side-menu-widget-container[theme="dark"] {
@@ -431,9 +431,9 @@
 
 /* VariablesView */
 
-.variables-view-container:not([empty]) {
+.variables-view-container {
   /* Hack: force hardware acceleration */
-  transform: translateX(1px);
+  transform: translateZ(1px);
 }
 
 .variables-view-empty-notice {
diff --git a/browser/themes/shared/devtools/common.css b/browser/themes/shared/devtools/common.css
index df70486fbb63..96f160dfdba2 100644
--- a/browser/themes/shared/devtools/common.css
+++ b/browser/themes/shared/devtools/common.css
@@ -26,23 +26,23 @@
   -moz-appearance: none;
   background-image: none;
   background-color: transparent;
-  border: 1px solid black;
-  border-width: 1px 0 0 0;
+  border: 0;
+  border-bottom: 1px solid black;
   min-height: 3px;
   height: 3px;
-  margin-bottom: -3px;
+  margin-top: -3px;
   position: relative;
 }
 
 .devtools-side-splitter {
   -moz-appearance: none;
   background-image: none;
-  border: 0;
-  -moz-border-start: 1px solid black;
-  min-width: 0;
-  width: 3px;
   background-color: transparent;
-  -moz-margin-end: -3px;
+  border: 0;
+  -moz-border-end: 1px solid black;
+  min-width: 3px;
+  width: 3px;
+  -moz-margin-start: -3px;
   position: relative;
   cursor: e-resize;
 }
diff --git a/browser/themes/shared/devtools/profiler.inc.css b/browser/themes/shared/devtools/profiler.inc.css
index ed6c994bbc07..4ef3ca3ca713 100644
--- a/browser/themes/shared/devtools/profiler.inc.css
+++ b/browser/themes/shared/devtools/profiler.inc.css
@@ -13,7 +13,7 @@
 }
 
 .devtools-toolbar {
-  min-height: 33px; 
+  min-height: 33px;
 }
 
 .profiler-sidebar {
@@ -21,7 +21,7 @@
 }
 
 .profiler-sidebar + .devtools-side-splitter {
-  -moz-border-start-color: transparent;
+  border-color: transparent;
 }
 
 .profiler-sidebar-item {
@@ -86,4 +86,4 @@
 
 #profiler-start[checked] {
   -moz-image-region: rect(0px,32px,16px,16px);
-}
\ No newline at end of file
+}
diff --git a/browser/themes/shared/devtools/shadereditor.inc.css b/browser/themes/shared/devtools/shadereditor.inc.css
index ef93a59b399d..5dc226ffe46a 100644
--- a/browser/themes/shared/devtools/shadereditor.inc.css
+++ b/browser/themes/shared/devtools/shadereditor.inc.css
@@ -46,7 +46,7 @@
 }
 
 #shaders-pane + .devtools-side-splitter {
-  -moz-border-start-color: transparent;
+  border-color: transparent;
 }
 
 .side-menu-widget-item-checkbox {
@@ -88,7 +88,7 @@
 /* Shader source editors */
 
 #editors-splitter {
-  -moz-border-start-color: rgb(61,69,76);
+  border-color: rgb(61,69,76);
 }
 
 .editor-label {
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index 1aea58d0f690..e184947c6e62 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -14,7 +14,7 @@
 }
 
 #sources-and-editor-splitter {
-  -moz-border-start-color: transparent;
+  border-color: transparent;
 }
 
 /* Sources toolbar */
@@ -485,7 +485,7 @@
 }
 
 #globalsearch + .devtools-horizontal-splitter {
-  -moz-border-top-colors: #bfbfbf;
+  border-color: #bfbfbf;
 }
 
 .dbg-source-results {
diff --git a/browser/themes/windows/devtools/widgets.css b/browser/themes/windows/devtools/widgets.css
index e154432dd754..1565cfeddb8c 100644
--- a/browser/themes/windows/devtools/widgets.css
+++ b/browser/themes/windows/devtools/widgets.css
@@ -275,7 +275,7 @@
 
 .side-menu-widget-container {
   /* Hack: force hardware acceleration */
-  transform: translateX(0px);
+  transform: translateZ(1px);
 }
 
 .side-menu-widget-container[theme="dark"] {
@@ -434,9 +434,9 @@
 
 /* VariablesView */
 
-.variables-view-container:not([empty]) {
+.variables-view-container {
   /* Hack: force hardware acceleration */
-  transform: translateX(1px);
+  transform: translateZ(1px);
 }
 
 .variables-view-empty-notice {

From d66455620a5fd680192d346698069081cf04f234 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Wed, 18 Dec 2013 19:10:17 +0200
Subject: [PATCH 03/78] Bug 951694 - Sources pane can overlap content over the
 source editor, r=fitzgen

---
 browser/themes/linux/devtools/debugger.css   | 7 ++-----
 browser/themes/linux/devtools/widgets.css    | 1 -
 browser/themes/osx/devtools/debugger.css     | 7 ++-----
 browser/themes/osx/devtools/widgets.css      | 1 -
 browser/themes/windows/devtools/debugger.css | 7 ++-----
 browser/themes/windows/devtools/widgets.css  | 1 -
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index 2b06bb3a5b37..c68934f613e4 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -5,10 +5,6 @@
 
 /* Sources and breakpoints pane */
 
-#sources-pane {
-  min-width: 50px;
-}
-
 #sources-pane > tabs {
   -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
 }
@@ -72,7 +68,8 @@
 #black-boxed-message,
 #source-progress-container {
   background: url(background-noise-toolbar.png) rgb(61,69,76);
-  /* Prevent the container deck from aquiring the height from this message. */
+  /* Prevent the container deck from aquiring the size from this message. */
+  min-width: 1px;
   min-height: 1px;
   color: white;
 }
diff --git a/browser/themes/linux/devtools/widgets.css b/browser/themes/linux/devtools/widgets.css
index a4b9ca72baab..2d8d1a11bb3b 100644
--- a/browser/themes/linux/devtools/widgets.css
+++ b/browser/themes/linux/devtools/widgets.css
@@ -6,7 +6,6 @@
 /* Generic pane helpers */
 
 .generic-toggled-side-pane {
-  min-width: 50px;
   -moz-margin-start: 0px !important;
   /* Unfortunately, transitions don't work properly with locale-aware properties,
      so both the left and right margins are set via js, while the start margin
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index 1898c1d60be7..545033ab400b 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -7,10 +7,6 @@
 
 /* Sources and breakpoints pane */
 
-#sources-pane {
-  min-width: 50px;
-}
-
 #sources-pane > tabs {
   -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
 }
@@ -74,7 +70,8 @@
 #black-boxed-message,
 #source-progress-container {
   background: url(background-noise-toolbar.png) rgb(61,69,76);
-  /* Prevent the container deck from aquiring the height from this message. */
+  /* Prevent the container deck from aquiring the size from this message. */
+  min-width: 1px;
   min-height: 1px;
   color: white;
 }
diff --git a/browser/themes/osx/devtools/widgets.css b/browser/themes/osx/devtools/widgets.css
index cd7b48ce2d4f..592387f3ba1f 100644
--- a/browser/themes/osx/devtools/widgets.css
+++ b/browser/themes/osx/devtools/widgets.css
@@ -6,7 +6,6 @@
 /* Generic pane helpers */
 
 .generic-toggled-side-pane {
-  min-width: 50px;
   -moz-margin-start: 0px !important;
   /* Unfortunately, transitions don't work properly with locale-aware properties,
      so both the left and right margins are set via js, while the start margin
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index e184947c6e62..c8d8cb09c3cb 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -5,10 +5,6 @@
 
 /* Sources and breakpoints pane */
 
-#sources-pane {
-  min-width: 50px;
-}
-
 #sources-pane > tabs {
   -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
 }
@@ -72,7 +68,8 @@
 #black-boxed-message,
 #source-progress-container {
   background: url(background-noise-toolbar.png) rgb(61,69,76);
-  /* Prevent the container deck from aquiring the height from this message. */
+  /* Prevent the container deck from aquiring the size from this message. */
+  min-width: 1px;
   min-height: 1px;
   color: white;
 }
diff --git a/browser/themes/windows/devtools/widgets.css b/browser/themes/windows/devtools/widgets.css
index 1565cfeddb8c..9df4907700c0 100644
--- a/browser/themes/windows/devtools/widgets.css
+++ b/browser/themes/windows/devtools/widgets.css
@@ -6,7 +6,6 @@
 /* Generic pane helpers */
 
 .generic-toggled-side-pane {
-  min-width: 50px;
   -moz-margin-start: 0px !important;
   /* Unfortunately, transitions don't work properly with locale-aware properties,
      so both the left and right margins are set via js, while the start margin

From e081cadad51a0b1b0696a42206a7c368adb837f2 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 19 Dec 2013 13:41:46 +0200
Subject: [PATCH 04/78] Bug 951828 - Always select the variables tab when
 pausing, r=fitzgen

---
 browser/devtools/debugger/debugger-view.js    |  2 +-
 browser/devtools/debugger/test/browser.ini    |  1 +
 .../test/browser_dbg_break-on-dom-08.js       | 57 +++++++++++++++++++
 .../debugger/test/doc_event-listeners-02.html |  4 ++
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js

diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js
index f6f87f4aaa3a..9b4467318e20 100644
--- a/browser/devtools/debugger/debugger-view.js
+++ b/browser/devtools/debugger/debugger-view.js
@@ -537,7 +537,7 @@ let DebuggerView = {
       animated: true,
       delayed: true,
       callback: aCallback
-    });
+    }, 0);
   },
 
   /**
diff --git a/browser/devtools/debugger/test/browser.ini b/browser/devtools/debugger/test/browser.ini
index 377d59d5b3b4..373ff46ac700 100644
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -80,6 +80,7 @@ support-files =
 [browser_dbg_break-on-dom-05.js]
 [browser_dbg_break-on-dom-06.js]
 [browser_dbg_break-on-dom-07.js]
+[browser_dbg_break-on-dom-08.js]
 [browser_dbg_breakpoints-actual-location.js]
 [browser_dbg_breakpoints-button-01.js]
 [browser_dbg_breakpoints-button-02.js]
diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js
new file mode 100644
index 000000000000..4e15e5098fd9
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js
@@ -0,0 +1,57 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that breaking on an event selects the variables view tab.
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_event-listeners-02.html";
+
+function test() {
+  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+    let gDebugger = aPanel.panelWin;
+    let gView = gDebugger.DebuggerView;
+    let gEvents = gView.EventListeners;
+
+    Task.spawn(function() {
+      yield waitForSourceShown(aPanel, ".html");
+      aDebuggee.addBodyClickEventListener();
+
+      let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED);
+      gView.toggleInstrumentsPane({ visible: true, animated: false }, 1);
+      yield fetched;
+      yield ensureThreadClientState(aPanel, "resumed");
+
+      is(gView.instrumentsPaneHidden, false,
+        "The instruments pane should be visible.");
+      is(gView.instrumentsPaneTab, "events-tab",
+        "The events tab should be selected.");
+
+      let updated = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_BREAKPOINTS_UPDATED);
+      EventUtils.sendMouseEvent({ type: "click" }, getItemCheckboxNode(1), gDebugger);
+      yield updated;
+      yield ensureThreadClientState(aPanel, "resumed");
+
+      let paused = waitForCaretAndScopes(aPanel, 48);
+      // Spin the event loop before causing the debuggee to pause, to allow
+      // this function to yield first.
+      executeSoon(() => {
+        EventUtils.sendMouseEvent({ type: "click" }, aDebuggee.document.body, aDebuggee);
+      });
+      yield paused;
+      yield ensureThreadClientState(aPanel, "paused");
+
+      is(gView.instrumentsPaneHidden, false,
+        "The instruments pane should be visible.");
+      is(gView.instrumentsPaneTab, "variables-tab",
+        "The variables tab should be selected.");
+
+      yield resumeDebuggerThenCloseAndFinish(aPanel);
+    });
+
+    function getItemCheckboxNode(index) {
+      return gEvents.items[index].target.parentNode
+        .querySelector(".side-menu-widget-item-checkbox");
+    }
+  });
+}
diff --git a/browser/devtools/debugger/test/doc_event-listeners-02.html b/browser/devtools/debugger/test/doc_event-listeners-02.html
index fbcc8c5d9aa0..6a4649de9df8 100644
--- a/browser/devtools/debugger/test/doc_event-listeners-02.html
+++ b/browser/devtools/debugger/test/doc_event-listeners-02.html
@@ -43,6 +43,10 @@
 
         window.changeHandler = changeHandler;
       });
+
+      function addBodyClickEventListener() {
+        document.body.addEventListener("click", function() { debugger; });
+      }
     </script>
   </body>
 

From 675d61df9d2ffb1a7d93a1ffa60a7afc8e77a700 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishearth@gmail.com>
Date: Thu, 19 Dec 2013 11:32:09 -0500
Subject: [PATCH 05/78] Bug 425145 - Add a preference to override
 autocomplete=off for password manager. r=gavin

---
 modules/libpref/src/init/all.js                        | 2 ++
 toolkit/components/passwordmgr/LoginManagerContent.jsm | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 72eea7ca0bb4..3f91d837809c 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3898,6 +3898,8 @@ pref("signon.rememberSignons",              true);
 pref("signon.autofillForms",                true);
 pref("signon.autologin.proxy",              false);
 pref("signon.debug",                        false);
+// Override autocomplete=false for password manager
+pref("signon.overrideAutocomplete",         false);
 
 // Satchel (Form Manager) prefs
 pref("browser.formfill.debug",            false);
diff --git a/toolkit/components/passwordmgr/LoginManagerContent.jsm b/toolkit/components/passwordmgr/LoginManagerContent.jsm
index 50ac2b42ca0e..51d85a265d82 100644
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -13,7 +13,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-var gEnabled = false, gDebug = false, gAutofillForms = true; // these mirror signon.* prefs
+var gEnabled = false, gDebug = false, gAutofillForms = true , gOverrideAutocompleteAttribute = false; // these mirror signon.* prefs
 
 function log(...pieces) {
     function generateLogMessage(args) {
@@ -71,6 +71,7 @@ var observer = {
         gDebug = Services.prefs.getBoolPref("signon.debug");
         gEnabled = Services.prefs.getBoolPref("signon.rememberSignons");
         gAutofillForms = Services.prefs.getBoolPref("signon.autofillForms");
+        gOverrideAutocompleteAttribute = Services.prefs.getBoolPref("signon.overrideAutocomplete");
     },
 };
 
@@ -356,10 +357,13 @@ var LoginManagerContent = {
      * specified form input.
      */
     _isAutocompleteDisabled :  function (element) {
+        if (gOverrideAutocompleteAttribute)
+            return false; 
+
         if (element && element.hasAttribute("autocomplete") &&
             element.getAttribute("autocomplete").toLowerCase() == "off")
             return true;
-
+        
         return false;
     },
 

From 9e5e3e01c85710fcda159ca8fc163b3bdb2b5141 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@mozilla.com>
Date: Mon, 16 Dec 2013 14:55:37 -0500
Subject: [PATCH 06/78] Bug 803188 - Support converting between file paths and
 file:/// uris in OS.File. r=Yoric

---
 .../components/osfile/modules/ospath_unix.jsm |  36 +++++-
 .../components/osfile/modules/ospath_win.jsm  |  56 ++++++++-
 .../xpcshell/test_file_URL_conversion.js      | 111 ++++++++++++++++++
 .../osfile/tests/xpcshell/xpcshell.ini        |   1 +
 4 files changed, 202 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js

diff --git a/toolkit/components/osfile/modules/ospath_unix.jsm b/toolkit/components/osfile/modules/ospath_unix.jsm
index 35d19b103611..a040459549ed 100644
--- a/toolkit/components/osfile/modules/ospath_unix.jsm
+++ b/toolkit/components/osfile/modules/ospath_unix.jsm
@@ -20,6 +20,7 @@
 // Boilerplate used to be able to import this module both from the main
 // thread and from worker threads.
 if (typeof Components != "undefined") {
+  Components.utils.importGlobalProperties(["URL"]);
   // Global definition of |exports|, to keep everybody happy.
   // In non-main thread, |exports| is provided by the module
   // loader.
@@ -33,7 +34,9 @@ let EXPORTED_SYMBOLS = [
   "dirname",
   "join",
   "normalize",
-  "split"
+  "split",
+  "toFileURI",
+  "fromFileURI",
 ];
 
 /**
@@ -148,6 +151,37 @@ let split = function(path) {
 };
 exports.split = split;
 
+/**
+ * Returns the file:// URI file path of the given local file path.
+ */
+// The case of %3b is designed to match Services.io, but fundamentally doesn't matter.
+let toFileURIExtraEncodings = {';': '%3b', '?': '%3F', "'": '%27', '#': '%23'};
+let toFileURI = function toFileURI(path) {
+  let uri = encodeURI(this.normalize(path));
+
+  // add a prefix, and encodeURI doesn't escape a few characters that we do
+  // want to escape, so fix that up
+  let prefix = "file://";
+  uri = prefix + uri.replace(/[;?'#]/g, match => toFileURIExtraEncodings[match]);
+
+  return uri;
+};
+exports.toFileURI = toFileURI;
+
+/**
+ * Returns the local file path from a given file URI.
+ */
+let fromFileURI = function fromFileURI(uri) {
+  let url = new URL(uri);
+  if (url.protocol != 'file:') {
+    throw new Error("fromFileURI expects a file URI");
+  }
+  let path = this.normalize(decodeURIComponent(url.pathname));
+  return path;
+};
+exports.fromFileURI = fromFileURI;
+
+
 //////////// Boilerplate
 if (typeof Components != "undefined") {
   this.EXPORTED_SYMBOLS = EXPORTED_SYMBOLS;
diff --git a/toolkit/components/osfile/modules/ospath_win.jsm b/toolkit/components/osfile/modules/ospath_win.jsm
index 45cc7bd507a2..bf3079638442 100644
--- a/toolkit/components/osfile/modules/ospath_win.jsm
+++ b/toolkit/components/osfile/modules/ospath_win.jsm
@@ -29,6 +29,7 @@
 // Boilerplate used to be able to import this module both from the main
 // thread and from worker threads.
 if (typeof Components != "undefined") {
+  Components.utils.importGlobalProperties(["URL"]);
   // Global definition of |exports|, to keep everybody happy.
   // In non-main thread, |exports| is provided by the module
   // loader.
@@ -44,7 +45,9 @@ let EXPORTED_SYMBOLS = [
   "normalize",
   "split",
   "winGetDrive",
-  "winIsAbsolute"
+  "winIsAbsolute",
+  "toFileURI",
+  "fromFileURI",
 ];
 
 /**
@@ -287,6 +290,57 @@ let split = function(path) {
 };
 exports.split = split;
 
+/**
+ * Return the file:// URI file path of the given local file path.
+ */
+// The case of %3b is designed to match Services.io, but fundamentally doesn't matter.
+let toFileURIExtraEncodings = {';': '%3b', '?': '%3F', "'": '%27', '#': '%23'};
+let toFileURI = function toFileURI(path) {
+  // URI-escape forward slashes and convert backward slashes to forward
+  path = this.normalize(path).replace(/[\\\/]/g, m => (m=='\\')? '/' : '%2F');
+  let uri = encodeURI(path);
+
+  // add a prefix, and encodeURI doesn't escape a few characters that we do
+  // want to escape, so fix that up
+  let prefix = "file:///";
+  uri = prefix + uri.replace(/[;?'#]/g, match => toFileURIExtraEncodings[match]);
+
+  // turn e.g., file:///C: into file:///C:/
+  if (uri.charAt(uri.length - 1) === ':') {
+    uri += "/"
+  }
+
+  return uri;
+};
+exports.toFileURI = toFileURI;
+
+/**
+ * Returns the local file path from a given file URI.
+ */
+let fromFileURI = function fromFileURI(uri) {
+  let url = new URL(uri);
+  if (url.protocol != 'file:') {
+    throw new Error("fromFileURI expects a file URI");
+  }
+
+  // strip leading slash, since Windows paths don't start with one
+  uri = url.pathname.substr(1);
+
+  let path = decodeURI(uri);
+  // decode a few characters where URL's parsing is overzealous
+  path = path.replace(/%(3b|3f|23)/gi,
+        match => decodeURIComponent(match));
+  path = this.normalize(path);
+
+  // this.normalize() does not remove the trailing slash if the path
+  // component is a drive letter. eg. 'C:\'' will not get normalized.
+  if (path.endsWith(":\\")) {
+    path = path.substr(0, path.length - 1);
+  }
+  return this.normalize(path);
+};
+exports.fromFileURI = fromFileURI;
+
 /**
 * Utility function: Remove any leading/trailing backslashes
 * from a string.
diff --git a/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js b/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js
new file mode 100644
index 000000000000..9802a2a9d9ea
--- /dev/null
+++ b/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js
@@ -0,0 +1,111 @@
+/* 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/. */
+
+function run_test() {
+  Components.utils.import("resource://gre/modules/Services.jsm");
+  Components.utils.import("resource://gre/modules/osfile.jsm");
+  Components.utils.import("resource://gre/modules/FileUtils.jsm");
+
+  let isWindows = ("@mozilla.org/windows-registry-key;1" in Components.classes);
+
+  // Test cases for filePathToURI
+  let paths = isWindows ? [
+    'C:\\',
+    'C:\\test',
+    'C:\\test\\',
+    'C:\\test%2f',
+    'C:\\test\\test\\test',
+    'C:\\test;+%',
+    'C:\\test?action=index\\',
+    'C:\\test\ test',
+    '\\\\C:\\a\\b\\c',
+    '\\\\Server\\a\\b\\c',
+
+    // note that per http://support.microsoft.com/kb/177506 (under more info),
+    // the following characters are allowed on Windows:
+    'C:\\char^',
+    'C:\\char&',
+    'C:\\char\'',
+    'C:\\char@',
+    'C:\\char{',
+    'C:\\char}',
+    'C:\\char[',
+    'C:\\char]',
+    'C:\\char,',
+    'C:\\char$',
+    'C:\\char=',
+    'C:\\char!',
+    'C:\\char-',
+    'C:\\char#',
+    'C:\\char(',
+    'C:\\char)',
+    'C:\\char%',
+    'C:\\char.',
+    'C:\\char+',
+    'C:\\char~',
+    'C:\\char_'
+  ] : [
+    '/',
+    '/test',
+    '/test/',
+    '/test%2f',
+    '/test/test/test',
+    '/test;+%',
+    '/test?action=index/',
+    '/test\ test',
+    '/punctuation/;,/?:@&=+$-_.!~*\'()"#',
+    '/CasePreserving'
+  ];
+
+  // some additional URIs to test, beyond those generated from paths
+  let uris = isWindows ? [
+    'file:///C:/test/',
+    'file://localhost/C:/test',
+    'file:///c:/test/test.txt',
+    //'file:///C:/foo%2f', // trailing, encoded slash
+    'file:///C:/%3f%3F',
+    'file:///C:/%3b%3B',
+    'file:///C:/%3c%3C', // not one of the special-cased ? or ;
+    'file:///C:/%78', // 'x', not usually uri encoded
+    'file:///C:/test#frag', // a fragment identifier
+    'file:///C:/test?action=index' // an actual query component
+  ] : [
+    'file:///test/',
+    'file://localhost/test',
+    'file:///test/test.txt',
+    'file:///foo%2f', // trailing, encoded slash
+    'file:///%3f%3F',
+    'file:///%3b%3B',
+    'file:///%3c%3C', // not one of the special-cased ? or ;
+    'file:///%78', // 'x', not usually uri encoded
+    'file:///test#frag', // a fragment identifier
+    'file:///test?action=index' // an actual query component
+  ];
+
+  for (let path of paths) {
+    // convert that to a uri using FileUtils and Services, which toFileURI is trying to model
+    let file = FileUtils.File(path);
+    let uri = Services.io.newFileURI(file).spec;
+    do_check_eq(uri, OS.Path.toFileURI(path));
+
+    // keep the resulting URI to try the reverse
+    uris.push(uri)
+  }
+
+  for (let uri of uris) {
+    // convert URIs to paths with nsIFileURI, which fromFileURI is trying to model
+    let path = Services.io.newURI(uri, null, null).QueryInterface(Components.interfaces.nsIFileURL).file.path;
+    do_check_eq(path, OS.Path.fromFileURI(uri));
+  }
+
+  // check that non-file URLs aren't allowed
+  let thrown = false;
+  try {
+    OS.Path.fromFileURI('http://test.com')
+  } catch (e) {
+    do_check_eq(e.message, "fromFileURI expects a file URI");
+    thrown = true;
+  }
+  do_check_true(thrown);
+}
diff --git a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
index 19646c017c28..29bc2b02e049 100644
--- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
@@ -13,6 +13,7 @@ tail =
 [test_removeEmptyDir.js]
 [test_makeDir.js]
 [test_profiledir.js]
+[test_file_URL_conversion.js]
 [test_logging.js]
 [test_creationDate.js]
 [test_exception.js]

From 920887ea39fc6fac5e64ed21bed5673414c34484 Mon Sep 17 00:00:00 2001
From: Tim Abraldes <tabraldes@mozilla.com>
Date: Thu, 19 Dec 2013 11:32:12 -0500
Subject: [PATCH 07/78] Bug 850372 - Delete session store backup during process
 suspend so that termination-from-suspended-state is treated as a normal
 shutdown. r=mbrubeck

---
 browser/metro/components/SessionStore.js | 58 ++++++++++++++++++++----
 widget/nsIWinMetroUtils.idl              |  9 +++-
 widget/windows/winrt/FrameworkView.cpp   | 15 ++++--
 widget/windows/winrt/FrameworkView.h     |  2 +
 widget/windows/winrt/nsWinMetroUtils.cpp | 11 +++++
 5 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/browser/metro/components/SessionStore.js b/browser/metro/components/SessionStore.js
index 0ce923ed2447..1353e5fdc684 100644
--- a/browser/metro/components/SessionStore.js
+++ b/browser/metro/components/SessionStore.js
@@ -62,24 +62,64 @@ SessionStore.prototype = {
     this._loadState = STATE_STOPPED;
 
     try {
+      let shutdownWasUnclean = false;
+
       if (this._sessionFileBackup.exists()) {
-        this._shouldRestore = true;
         this._sessionFileBackup.remove(false);
+        shutdownWasUnclean = true;
       }
 
       if (this._sessionFile.exists()) {
-        // Disable crash recovery if we have exceeded the timeout
-        this._lastSessionTime = this._sessionFile.lastModifiedTime;
-        let delta = Date.now() - this._lastSessionTime;
-        let timeout = Services.prefs.getIntPref("browser.sessionstore.resume_from_crash_timeout");
-        if (delta > (timeout * 60000))
-          this._shouldRestore = false;
-
         this._sessionFile.copyTo(null, this._sessionFileBackup.leafName);
+
+        switch(Services.metro.previousExecutionState) {
+          // 0 == NotRunning
+          case 0:
+            // Disable crash recovery if we have exceeded the timeout
+            this._lastSessionTime = this._sessionFile.lastModifiedTime;
+            let delta = Date.now() - this._lastSessionTime;
+            let timeout =
+              Services.prefs.getIntPref(
+                  "browser.sessionstore.resume_from_crash_timeout");
+            this._shouldRestore = shutdownWasUnclean
+                                && (delta < (timeout * 60000));
+            break;
+          // 1 == Running
+          case 1:
+            // We should never encounter this situation
+            Components.utils.reportError("SessionRestore.init called with "
+                                       + "previous execution state 'Running'");
+            this._shouldRestore = true;
+            break;
+          // 2 == Suspended
+          case 2:
+            // We should never encounter this situation
+            Components.utils.reportError("SessionRestore.init called with "
+                                       + "previous execution state 'Suspended'");
+            this._shouldRestore = true;
+            break;
+          // 3 == Terminated
+          case 3:
+            // Terminated means that Windows terminated our already-suspended
+            // process to get back some resources. When we re-launch, we want
+            // to provide the illusion that our process was suspended the
+            // whole time, and never terminated.
+            this._shouldRestore = true;
+            break;
+          // 4 == ClosedByUser
+          case 4:
+            // ClosedByUser indicates that the user performed a "close" gesture
+            // on our tile. We should act as if the browser closed normally,
+            // even if we were closed from a suspended state (in which case
+            // we'll have determined that it was an unclean shtudown)
+            this._shouldRestore = false;
+            break;
+        }
       }
 
-      if (!this._sessionCache.exists() || !this._sessionCache.isDirectory())
+      if (!this._sessionCache.exists() || !this._sessionCache.isDirectory()) {
         this._sessionCache.create(Ci.nsIFile.DIRECTORY_TYPE, 0700);
+      }
     } catch (ex) {
       Cu.reportError(ex); // file was write-locked?
     }
diff --git a/widget/nsIWinMetroUtils.idl b/widget/nsIWinMetroUtils.idl
index 94d44909f879..211c23d3d596 100644
--- a/widget/nsIWinMetroUtils.idl
+++ b/widget/nsIWinMetroUtils.idl
@@ -12,7 +12,7 @@
  * implementation of this interface for non-Windows systems, for testing and
  * development purposes only.
  */
-[scriptable, uuid(d30daa27-ce2b-4503-80cc-b162f4c24e93)]
+[scriptable, uuid(148f57d3-51df-4e5c-a40b-7ae5ee76188e)]
 interface nsIWinMetroUtils : nsISupports
 {
   /**
@@ -26,6 +26,13 @@ interface nsIWinMetroUtils : nsISupports
    */
   readonly attribute AString activationURI;
 
+  /**
+   * Determine the previous execution state. The possible values of this
+   * attribute are exactly those values in the
+   * Windows::ApplicationModel::Activation enumeration.
+   */
+  readonly attribute long previousExecutionState;
+
    /**
     * Show the settings flyout
     */
diff --git a/widget/windows/winrt/FrameworkView.cpp b/widget/windows/winrt/FrameworkView.cpp
index 1c3cf270313c..405a409115b9 100644
--- a/widget/windows/winrt/FrameworkView.cpp
+++ b/widget/windows/winrt/FrameworkView.cpp
@@ -352,15 +352,20 @@ FrameworkView::OnActivated(ICoreApplicationView* aApplicationView,
 {
   LogFunction();
 
-  ApplicationExecutionState state;
-  aArgs->get_PreviousExecutionState(&state);
-  bool startup = state == ApplicationExecutionState::ApplicationExecutionState_Terminated ||
-                 state == ApplicationExecutionState::ApplicationExecutionState_ClosedByUser ||
-                 state == ApplicationExecutionState::ApplicationExecutionState_NotRunning;
+  aArgs->get_PreviousExecutionState(&mPreviousExecutionState);
+  bool startup = mPreviousExecutionState == ApplicationExecutionState::ApplicationExecutionState_Terminated ||
+                 mPreviousExecutionState == ApplicationExecutionState::ApplicationExecutionState_ClosedByUser ||
+                 mPreviousExecutionState == ApplicationExecutionState::ApplicationExecutionState_NotRunning;
   ProcessActivationArgs(aArgs, startup);
   return S_OK;
 }
 
+int
+FrameworkView::GetPreviousExecutionState()
+{
+  return mPreviousExecutionState;
+}
+
 HRESULT
 FrameworkView::OnSoftkeyboardHidden(IInputPane* aSender,
                                     IInputPaneVisibilityEventArgs* aArgs)
diff --git a/widget/windows/winrt/FrameworkView.h b/widget/windows/winrt/FrameworkView.h
index ea0139160e3d..ba41092143a1 100644
--- a/widget/windows/winrt/FrameworkView.h
+++ b/widget/windows/winrt/FrameworkView.h
@@ -81,6 +81,7 @@ public:
   HRESULT ActivateView();
 
   // Public apis for MetroWidget
+  int GetPreviousExecutionState();
   void ShutdownXPCOM();
   float GetDPI() { return mDPI; }
   ICoreWindow* GetCoreWindow() { return mWindow.Get(); }
@@ -177,6 +178,7 @@ private:
   EventRegistrationToken mPrintManager;
 
 private:
+  ABI::Windows::ApplicationModel::Activation::ApplicationExecutionState mPreviousExecutionState;
   nsIntRect mWindowBounds; // in device-pixel coordinates
   float mDPI;
   bool mShuttingDown;
diff --git a/widget/windows/winrt/nsWinMetroUtils.cpp b/widget/windows/winrt/nsWinMetroUtils.cpp
index 1c4fb2c1dc89..2640a588d194 100644
--- a/widget/windows/winrt/nsWinMetroUtils.cpp
+++ b/widget/windows/winrt/nsWinMetroUtils.cpp
@@ -247,6 +247,17 @@ nsWinMetroUtils::GetActivationURI(nsAString &aActivationURI)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsWinMetroUtils::GetPreviousExecutionState(int32_t *out)
+{
+  if (!sFrameworkView) {
+    NS_WARNING("GetPreviousExecutionState used before view is created!");
+    return NS_OK;
+  }
+  *out = sFrameworkView->GetPreviousExecutionState();
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsWinMetroUtils::GetKeyboardVisible(bool *aImersive)
 {

From d13f3cb8b33d9b1dcad8a2125b2a26ff1723574f Mon Sep 17 00:00:00 2001
From: Heather Arthur <fayearthur@gmail.com>
Date: Thu, 19 Dec 2013 11:32:12 -0500
Subject: [PATCH 08/78] Bug 949556 - Add Firefox 26-28 backwards compatibility
 to Style Editor. r=paul

---
 b2g/chrome/content/shell.js                   |   1 +
 .../devtools/styleeditor/styleeditor-panel.js |  17 +-
 toolkit/devtools/server/actors/styleeditor.js | 446 +++-----
 toolkit/devtools/server/actors/styles.js      |   2 +-
 toolkit/devtools/server/actors/stylesheets.js | 986 ++++++++++++++++++
 toolkit/devtools/server/main.js               |   2 +
 6 files changed, 1131 insertions(+), 323 deletions(-)
 create mode 100644 toolkit/devtools/server/actors/stylesheets.js

diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 07b64c7d54de..be0456240e58 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -1067,6 +1067,7 @@ let RemoteDebugger = {
         }
         DebuggerServer.registerModule("devtools/server/actors/inspector");
         DebuggerServer.registerModule("devtools/server/actors/styleeditor");
+        DebuggerServer.registerModule("devtools/server/actors/stylesheets");
         DebuggerServer.enableWebappsContentActor = true;
       }
       DebuggerServer.addActors('chrome://browser/content/dbg-browser-actors.js');
diff --git a/browser/devtools/styleeditor/styleeditor-panel.js b/browser/devtools/styleeditor/styleeditor-panel.js
index 9940fabd15db..ad13ad250a6c 100644
--- a/browser/devtools/styleeditor/styleeditor-panel.js
+++ b/browser/devtools/styleeditor/styleeditor-panel.js
@@ -16,7 +16,10 @@ Cu.import("resource:///modules/devtools/StyleEditorUI.jsm");
 Cu.import("resource:///modules/devtools/StyleEditorUtil.jsm");
 
 loader.lazyGetter(this, "StyleSheetsFront",
-  () => require("devtools/server/actors/styleeditor").StyleSheetsFront);
+  () => require("devtools/server/actors/stylesheets").StyleSheetsFront);
+
+loader.lazyGetter(this, "StyleEditorFront",
+  () => require("devtools/server/actors/styleeditor").StyleEditorFront);
 
 this.StyleEditorPanel = function StyleEditorPanel(panelWin, toolbox) {
   EventEmitter.decorate(this);
@@ -54,14 +57,20 @@ StyleEditorPanel.prototype = {
     targetPromise.then(() => {
       this.target.on("close", this.destroy);
 
-      this._debuggee = StyleSheetsFront(this.target.client, this.target.form);
-
+      if (this.target.form.styleSheetsActor) {
+        this._debuggee = StyleSheetsFront(this.target.client, this.target.form);
+      }
+      else {
+        /* We're talking to a pre-Firefox 29 server-side */
+        this._debuggee = StyleEditorFront(this.target.client, this.target.form);
+      }
       this.UI = new StyleEditorUI(this._debuggee, this.target, this._panelDoc);
       this.UI.on("error", this._showError);
 
       this.isReady = true;
+
       deferred.resolve(this);
-    })
+    }, console.error);
 
     return deferred.promise;
   },
diff --git a/toolkit/devtools/server/actors/styleeditor.js b/toolkit/devtools/server/actors/styleeditor.js
index dff2afb60492..d377912137cb 100644
--- a/toolkit/devtools/server/actors/styleeditor.js
+++ b/toolkit/devtools/server/actors/styleeditor.js
@@ -33,24 +33,23 @@ transition-property: all !important;\
 let LOAD_ERROR = "error-load";
 
 exports.register = function(handle) {
-  handle.addTabActor(StyleSheetsActor, "styleSheetsActor");
-  handle.addGlobalActor(StyleSheetsActor, "styleSheetsActor");
+  handle.addTabActor(StyleEditorActor, "styleEditorActor");
+  handle.addGlobalActor(StyleEditorActor, "styleEditorActor");
 };
 
 exports.unregister = function(handle) {
-  handle.removeTabActor(StyleSheetsActor);
-  handle.removeGlobalActor(StyleSheetsActor);
+  handle.removeTabActor(StyleEditorActor);
+  handle.removeGlobalActor(StyleEditorActor);
 };
 
-types.addActorType("stylesheet");
-types.addActorType("originalsource");
+types.addActorType("old-stylesheet");
 
 /**
- * Creates a StyleSheetsActor. StyleSheetsActor provides remote access to the
+ * Creates a StyleEditorActor. StyleEditorActor provides remote access to the
  * stylesheets of a document.
  */
-let StyleSheetsActor = protocol.ActorClass({
-  typeName: "stylesheets",
+let StyleEditorActor = protocol.ActorClass({
+  typeName: "styleeditor",
 
   /**
    * The window we work with, taken from the parent actor.
@@ -62,6 +61,13 @@ let StyleSheetsActor = protocol.ActorClass({
    */
   get document() this.window.document,
 
+  events: {
+    "document-load" : {
+      type: "documentLoad",
+      styleSheets: Arg(0, "array:old-stylesheet")
+    }
+  },
+
   form: function()
   {
     return { actor: this.actorID };
@@ -77,7 +83,7 @@ let StyleSheetsActor = protocol.ActorClass({
   },
 
   /**
-   * Destroy the current StyleSheetsActor instance.
+   * Destroy the current StyleEditorActor instance.
    */
   destroy: function()
   {
@@ -85,40 +91,46 @@ let StyleSheetsActor = protocol.ActorClass({
   },
 
   /**
-   * Protocol method for getting a list of StyleSheetActors representing
-   * all the style sheets in this document.
+   * Called by client when target navigates to a new document.
+   * Adds load listeners to document.
    */
-  getStyleSheets: method(function() {
-    let deferred = promise.defer();
+  newDocument: method(function() {
+    // delete previous document's actors
+    this._clearStyleSheetActors();
 
-    let window = this.window;
-    var domReady = () => {
-      window.removeEventListener("DOMContentLoaded", domReady, true);
+    // Note: listening for load won't be necessary once
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=839103 is fixed
+    if (this.document.readyState == "complete") {
+      this._onDocumentLoaded();
+    }
+    else {
+      this.window.addEventListener("load", this._onDocumentLoaded, false);
+    }
+    return {};
+  }),
 
-      let documents = [this.document];
-      let actors = [];
-      for (let doc of documents) {
-        let sheets = this._addStyleSheets(doc.styleSheets);
-        actors = actors.concat(sheets);
-        // Recursively handle style sheets of the documents in iframes.
-        for (let iframe of doc.getElementsByTagName("iframe")) {
-          documents.push(iframe.contentDocument);
-        }
-      }
-      deferred.resolve(actors);
-    };
-
-    if (window.document.readyState === "loading") {
-      window.addEventListener("DOMContentLoaded", domReady, true);
-    } else {
-      domReady();
+  /**
+   * Event handler for document loaded event. Add actor for each stylesheet
+   * and send an event notifying of the load
+   */
+  _onDocumentLoaded: function(event) {
+    if (event) {
+      this.window.removeEventListener("load", this._onDocumentLoaded, false);
     }
 
-    return deferred.promise;
-  }, {
-    request: {},
-    response: { styleSheets: RetVal("array:stylesheet") }
-  }),
+    let documents = [this.document];
+    var forms = [];
+    for (let doc of documents) {
+      let sheetForms = this._addStyleSheets(doc.styleSheets);
+      forms = forms.concat(sheetForms);
+      // Recursively handle style sheets of the documents in iframes.
+      for (let iframe of doc.getElementsByTagName("iframe")) {
+        documents.push(iframe.contentDocument);
+      }
+    }
+
+    events.emit(this, "document-load", forms);
+  },
 
   /**
    * Add all the stylesheets to the map and create an actor for each one
@@ -145,6 +157,27 @@ let StyleSheetsActor = protocol.ActorClass({
     return actors;
   },
 
+  /**
+   * Create a new actor for a style sheet, if it hasn't already been created.
+   *
+   * @param  {DOMStyleSheet} styleSheet
+   *         The style sheet to create an actor for.
+   * @return {StyleSheetActor}
+   *         The actor for this style sheet
+   */
+  _createStyleSheetActor: function(styleSheet)
+  {
+    if (this._sheets.has(styleSheet)) {
+      return this._sheets.get(styleSheet);
+    }
+    let actor = new OldStyleSheetActor(styleSheet, this);
+
+    this.manage(actor);
+    this._sheets.set(styleSheet, actor);
+
+    return actor;
+  },
+
   /**
    * Get all the stylesheets @imported from a stylesheet.
    *
@@ -177,27 +210,6 @@ let StyleSheetsActor = protocol.ActorClass({
     return imported;
   },
 
-  /**
-   * Create a new actor for a style sheet, if it hasn't already been created.
-   *
-   * @param  {DOMStyleSheet} styleSheet
-   *         The style sheet to create an actor for.
-   * @return {StyleSheetActor}
-   *         The actor for this style sheet
-   */
-  _createStyleSheetActor: function(styleSheet)
-  {
-    if (this._sheets.has(styleSheet)) {
-      return this._sheets.get(styleSheet);
-    }
-    let actor = new StyleSheetActor(styleSheet, this);
-
-    this.manage(actor);
-    this._sheets.set(styleSheet, actor);
-
-    return actor;
-  },
-
   /**
    * Clear all the current stylesheet actors in map.
    */
@@ -217,7 +229,7 @@ let StyleSheetsActor = protocol.ActorClass({
    * @return {object}
    *         Object with 'styelSheet' property for form on new actor.
    */
-  addStyleSheet: method(function(text) {
+  newStyleSheet: method(function(text) {
     let parent = this.document.documentElement;
     let style = this.document.createElementNS("http://www.w3.org/1999/xhtml", "style");
     style.setAttribute("type", "text/css");
@@ -231,28 +243,43 @@ let StyleSheetsActor = protocol.ActorClass({
     return actor;
   }, {
     request: { text: Arg(0, "string") },
-    response: { styleSheet: RetVal("stylesheet") }
+    response: { styleSheet: RetVal("old-stylesheet") }
   })
 });
 
 /**
- * The corresponding Front object for the StyleSheetsActor.
+ * The corresponding Front object for the StyleEditorActor.
  */
-let StyleSheetsFront = protocol.FrontClass(StyleSheetsActor, {
+let StyleEditorFront = protocol.FrontClass(StyleEditorActor, {
   initialize: function(client, tabForm) {
     protocol.Front.prototype.initialize.call(this, client);
-    this.actorID = tabForm.styleSheetsActor;
+    this.actorID = tabForm.styleEditorActor;
 
     client.addActorPool(this);
     this.manage(this);
+  },
+
+  getStyleSheets: function() {
+    let deferred = promise.defer();
+
+    events.once(this, "document-load", (styleSheets) => {
+      deferred.resolve(styleSheets);
+    });
+    this.newDocument();
+
+    return deferred.promise;
+  },
+
+  addStyleSheet: function(text) {
+    return this.newStyleSheet(text);
   }
 });
 
 /**
  * A StyleSheetActor represents a stylesheet on the server.
  */
-let StyleSheetActor = protocol.ActorClass({
-  typeName: "stylesheet",
+let OldStyleSheetActor = protocol.ActorClass({
+  typeName: "old-stylesheet",
 
   events: {
     "property-change" : {
@@ -260,16 +287,17 @@ let StyleSheetActor = protocol.ActorClass({
       property: Arg(0, "string"),
       value: Arg(1, "json")
     },
+    "source-load" : {
+      type: "sourceLoad",
+      source: Arg(0, "string")
+    },
     "style-applied" : {
       type: "styleApplied"
     }
   },
 
-  /* List of original sources that generated this stylesheet */
-  _originalSources: null,
-
   toString: function() {
-    return "[StyleSheetActor " + this.actorID + "]";
+    return "[OldStyleSheetActor " + this.actorID + "]";
   },
 
   /**
@@ -399,17 +427,14 @@ let StyleSheetActor = protocol.ActorClass({
     events.emit(this, "property-change", property, this.form()[property]);
   },
 
-  /**
-   * Protocol method to get the text of this stylesheet.
-   */
-  getText: method(function() {
-    return this._getText().then((text) => {
-      return new LongStringActor(this.conn, text || "");
+   /**
+    * Fetch the source of the style sheet from its URL. Send a "sourceLoad"
+    * event when it's been fetched.
+    */
+  fetchSource: method(function() {
+    this._getText().then((content) => {
+      events.emit(this, "source-load", this.text);
     });
-  }, {
-    response: {
-      text: RetVal("longstring")
-    }
   }),
 
   /**
@@ -442,163 +467,6 @@ let StyleSheetActor = protocol.ActorClass({
     });
   },
 
-  /**
-   * Protocol method to get the original source (actors) for this
-   * stylesheet if it has uses source maps.
-   */
-  getOriginalSources: method(function() {
-    if (this._originalSources) {
-      return promise.resolve(this._originalSources);
-    }
-    return this._fetchOriginalSources();
-  }, {
-    request: {},
-    response: {
-      originalSources: RetVal("nullable:array:originalsource")
-    }
-  }),
-
-  /**
-   * Fetch the original sources (actors) for this style sheet using its
-   * source map. If they've already been fetched, returns cached array.
-   *
-   * @return {Promise}
-   *         Promise that resolves with an array of OriginalSourceActors
-   */
-  _fetchOriginalSources: function() {
-    this._clearOriginalSources();
-    this._originalSources = [];
-
-    return this.getSourceMap().then((sourceMap) => {
-      if (!sourceMap) {
-        return null;
-      }
-      for (let url of sourceMap.sources) {
-        let actor = new OriginalSourceActor(url, sourceMap, this);
-
-        this.manage(actor);
-        this._originalSources.push(actor);
-      }
-      return this._originalSources;
-    })
-  },
-
-  /**
-   * Get the SourceMapConsumer for this stylesheet's source map, if
-   * it exists. Saves the consumer for later queries.
-   *
-   * @return {Promise}
-   *         A promise that resolves with a SourceMapConsumer, or null.
-   */
-  getSourceMap: function() {
-    if (this._sourceMap) {
-      return this._sourceMap;
-    }
-    return this._fetchSourceMap();
-  },
-
-  /**
-   * Fetch the source map for this stylesheet.
-   *
-   * @return {Promise}
-   *         A promise that resolves with a SourceMapConsumer, or null.
-   */
-  _fetchSourceMap: function() {
-    let deferred = promise.defer();
-
-    this._getText().then((content) => {
-      let url = this._extractSourceMapUrl(content);
-      if (!url) {
-        // no source map for this stylesheet
-        deferred.resolve(null);
-        return;
-      };
-
-      url = normalize(url, this.href);
-
-      let map = fetch(url, { loadFromCache: false, window: this.window })
-        .then(({content}) => {
-          let map = new SourceMapConsumer(content);
-          this._setSourceMapRoot(map, url, this.href);
-          this._sourceMap = promise.resolve(map);
-
-          deferred.resolve(map);
-          return map;
-        }, deferred.reject);
-
-      this._sourceMap = map;
-    }, deferred.reject);
-
-    return deferred.promise;
-  },
-
-  /**
-   * Clear and unmanage the original source actors for this stylesheet.
-   */
-  _clearOriginalSources: function() {
-    for (actor in this._originalSources) {
-      this.unmanage(actor);
-    }
-    this._originalSources = null;
-  },
-
-  /**
-   * Sets the source map's sourceRoot to be relative to the source map url.
-   */
-  _setSourceMapRoot: function(aSourceMap, aAbsSourceMapURL, aScriptURL) {
-    const base = dirname(
-      aAbsSourceMapURL.indexOf("data:") === 0
-        ? aScriptURL
-        : aAbsSourceMapURL);
-    aSourceMap.sourceRoot = aSourceMap.sourceRoot
-      ? normalize(aSourceMap.sourceRoot, base)
-      : base;
-  },
-
-  /**
-   * Get the source map url specified in the text of a stylesheet.
-   *
-   * @param  {string} content
-   *         The text of the style sheet.
-   * @return {string}
-   *         Url of source map.
-   */
-  _extractSourceMapUrl: function(content) {
-    var matches = /sourceMappingURL\=([^\s\*]*)/.exec(content);
-    if (matches) {
-      return matches[1];
-    }
-    return null;
-  },
-
-  /**
-   * Protocol method that gets the location in the original source of a
-   * line, column pair in this stylesheet, if its source mapped, otherwise
-   * a promise of the same location.
-   */
-  getOriginalLocation: method(function(line, column) {
-    return this.getSourceMap().then((sourceMap) => {
-      if (sourceMap) {
-        return sourceMap.originalPositionFor({ line: line, column: column });
-      }
-      return {
-        source: this.href,
-        line: line,
-        column: column
-      }
-    });
-  }, {
-    request: {
-      line: Arg(0, "number"),
-      column: Arg(1, "number")
-    },
-    response: RetVal(types.addDictType("originallocationresponse", {
-      source: "string",
-      line: "number",
-      column: "number"
-    }))
-  }),
-
   /**
    * Get the charset of the stylesheet according to the character set rules
    * defined in <http://www.w3.org/TR/CSS2/syndata.html#charset>.
@@ -685,7 +553,7 @@ let StyleSheetActor = protocol.ActorClass({
   _insertTransistionRule: function() {
     // Insert the global transition rule
     // Use a ref count to make sure we do not add it multiple times.. and remove
-    // it only when all pending StyleSheets-generated transitions ended.
+    // it only when all pending StyleEditor-generated transitions ended.
     if (this._transitionRefCount == 0) {
       this.rawSheet.insertRule(TRANSITION_RULE, this.rawSheet.cssRules.length);
       this.document.documentElement.classList.add(TRANSITION_CLASS);
@@ -717,7 +585,7 @@ let StyleSheetActor = protocol.ActorClass({
 /**
  * StyleSheetFront is the client-side counterpart to a StyleSheetActor.
  */
-var StyleSheetFront = protocol.FrontClass(StyleSheetActor, {
+var OldStyleSheetFront = protocol.FrontClass(OldStyleSheetActor, {
   initialize: function(conn, form, ctx, detail) {
     protocol.Front.prototype.initialize.call(this, conn, form, ctx, detail);
 
@@ -744,6 +612,22 @@ var StyleSheetFront = protocol.FrontClass(StyleSheetActor, {
     this._form = form;
   },
 
+  getText: function() {
+    let deferred = promise.defer();
+
+    events.once(this, "source-load", (source) => {
+      let longStr = new ShortLongString(source);
+      deferred.resolve(longStr);
+    });
+    this.fetchSource();
+
+    return deferred.promise;
+  },
+
+  getOriginalSources: function() {
+    return promise.resolve([]);
+  },
+
   get href() this._form.href,
   get nodeHref() this._form.nodeHref,
   get disabled() !!this._form.disabled,
@@ -753,89 +637,15 @@ var StyleSheetFront = protocol.FrontClass(StyleSheetActor, {
   get ruleCount() this._form.ruleCount
 });
 
-/**
- * Actor representing an original source of a style sheet that was specified
- * in a source map.
- */
-let OriginalSourceActor = protocol.ActorClass({
-  typeName: "originalsource",
-
-  initialize: function(aUrl, aSourceMap, aParentActor) {
-    protocol.Actor.prototype.initialize.call(this, null);
-
-    this.url = aUrl;
-    this.sourceMap = aSourceMap;
-    this.parentActor = aParentActor;
-    this.conn = this.parentActor.conn;
-
-    this.text = null;
-  },
-
-  form: function() {
-    return {
-      actor: this.actorID, // actorID is set when it's added to a pool
-      url: this.url,
-      parentSource: this.parentActor.actorID
-    };
-  },
-
-  _getText: function() {
-    if (this.text) {
-      return promise.resolve(this.text);
-    }
-    return fetch(this.url, { window: this.window }).then(({content}) => {
-      this.text = content;
-      return content;
-    });
-  },
-
-  /**
-   * Protocol method to get the text of this source.
-   */
-  getText: method(function() {
-    return this._getText().then((text) => {
-      return new LongStringActor(this.conn, text || "");
-    });
-  }, {
-    response: {
-      text: RetVal("longstring")
-    }
-  })
-})
-
-/**
- * The client-side counterpart for an OriginalSourceActor.
- */
-let OriginalSourceFront = protocol.FrontClass(OriginalSourceActor, {
-  initialize: function(client, form) {
-    protocol.Front.prototype.initialize.call(this, client, form);
-
-    this.isOriginalSource = true;
-  },
-
-  form: function(form, detail) {
-    if (detail === "actorid") {
-      this.actorID = form;
-      return;
-    }
-    this.actorID = form.actor;
-    this._form = form;
-  },
-
-  get href() this._form.url,
-  get url() this._form.url
-});
-
-
 XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
   return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
 });
 
-exports.StyleSheetsActor = StyleSheetsActor;
-exports.StyleSheetsFront = StyleSheetsFront;
+exports.StyleEditorActor = StyleEditorActor;
+exports.StyleEditorFront = StyleEditorFront;
 
-exports.StyleSheetActor = StyleSheetActor;
-exports.StyleSheetFront = StyleSheetFront;
+exports.OldStyleSheetActor = OldStyleSheetActor;
+exports.OldStyleSheetFront = OldStyleSheetFront;
 
 
 /**
diff --git a/toolkit/devtools/server/actors/styles.js b/toolkit/devtools/server/actors/styles.js
index e5ebbd292e91..b9d33ca92b7b 100644
--- a/toolkit/devtools/server/actors/styles.js
+++ b/toolkit/devtools/server/actors/styles.js
@@ -11,7 +11,7 @@ const {Arg, Option, method, RetVal, types} = protocol;
 const events = require("sdk/event/core");
 const object = require("sdk/util/object");
 const { Class } = require("sdk/core/heritage");
-const { StyleSheetActor } = require("devtools/server/actors/styleeditor");
+const { StyleSheetActor } = require("devtools/server/actors/stylesheets");
 
 loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm");
 loader.lazyGetter(this, "CssLogic", () => require("devtools/styleinspector/css-logic").CssLogic);
diff --git a/toolkit/devtools/server/actors/stylesheets.js b/toolkit/devtools/server/actors/stylesheets.js
new file mode 100644
index 000000000000..dff2afb60492
--- /dev/null
+++ b/toolkit/devtools/server/actors/stylesheets.js
@@ -0,0 +1,986 @@
+/* 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";
+
+let { components, Cc, Ci, Cu } = require('chrome');
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+Cu.import("resource://gre/modules/devtools/SourceMap.jsm");
+
+const promise = require("sdk/core/promise");
+const events = require("sdk/event/core");
+const protocol = require("devtools/server/protocol");
+const {Arg, Option, method, RetVal, types} = protocol;
+const {LongStringActor, ShortLongString} = require("devtools/server/actors/string");
+
+loader.lazyGetter(this, "CssLogic", () => require("devtools/styleinspector/css-logic").CssLogic);
+
+let TRANSITION_CLASS = "moz-styleeditor-transitioning";
+let TRANSITION_DURATION_MS = 500;
+let TRANSITION_RULE = "\
+:root.moz-styleeditor-transitioning, :root.moz-styleeditor-transitioning * {\
+transition-duration: " + TRANSITION_DURATION_MS + "ms !important; \
+transition-delay: 0ms !important;\
+transition-timing-function: ease-out !important;\
+transition-property: all !important;\
+}";
+
+let LOAD_ERROR = "error-load";
+
+exports.register = function(handle) {
+  handle.addTabActor(StyleSheetsActor, "styleSheetsActor");
+  handle.addGlobalActor(StyleSheetsActor, "styleSheetsActor");
+};
+
+exports.unregister = function(handle) {
+  handle.removeTabActor(StyleSheetsActor);
+  handle.removeGlobalActor(StyleSheetsActor);
+};
+
+types.addActorType("stylesheet");
+types.addActorType("originalsource");
+
+/**
+ * Creates a StyleSheetsActor. StyleSheetsActor provides remote access to the
+ * stylesheets of a document.
+ */
+let StyleSheetsActor = protocol.ActorClass({
+  typeName: "stylesheets",
+
+  /**
+   * The window we work with, taken from the parent actor.
+   */
+  get window() this.parentActor.window,
+
+  /**
+   * The current content document of the window we work with.
+   */
+  get document() this.window.document,
+
+  form: function()
+  {
+    return { actor: this.actorID };
+  },
+
+  initialize: function (conn, tabActor) {
+    protocol.Actor.prototype.initialize.call(this, null);
+
+    this.parentActor = tabActor;
+
+    // keep a map of sheets-to-actors so we don't create two actors for one sheet
+    this._sheets = new Map();
+  },
+
+  /**
+   * Destroy the current StyleSheetsActor instance.
+   */
+  destroy: function()
+  {
+    this._sheets.clear();
+  },
+
+  /**
+   * Protocol method for getting a list of StyleSheetActors representing
+   * all the style sheets in this document.
+   */
+  getStyleSheets: method(function() {
+    let deferred = promise.defer();
+
+    let window = this.window;
+    var domReady = () => {
+      window.removeEventListener("DOMContentLoaded", domReady, true);
+
+      let documents = [this.document];
+      let actors = [];
+      for (let doc of documents) {
+        let sheets = this._addStyleSheets(doc.styleSheets);
+        actors = actors.concat(sheets);
+        // Recursively handle style sheets of the documents in iframes.
+        for (let iframe of doc.getElementsByTagName("iframe")) {
+          documents.push(iframe.contentDocument);
+        }
+      }
+      deferred.resolve(actors);
+    };
+
+    if (window.document.readyState === "loading") {
+      window.addEventListener("DOMContentLoaded", domReady, true);
+    } else {
+      domReady();
+    }
+
+    return deferred.promise;
+  }, {
+    request: {},
+    response: { styleSheets: RetVal("array:stylesheet") }
+  }),
+
+  /**
+   * Add all the stylesheets to the map and create an actor for each one
+   * if not already created. Send event that there are new stylesheets.
+   *
+   * @param {[DOMStyleSheet]} styleSheets
+   *        Stylesheets to add
+   * @return {[object]}
+   *         Array of actors for each StyleSheetActor created
+   */
+  _addStyleSheets: function(styleSheets)
+  {
+    let sheets = [];
+    for (let i = 0; i < styleSheets.length; i++) {
+      let styleSheet = styleSheets[i];
+      sheets.push(styleSheet);
+
+      // Get all sheets, including imported ones
+      let imports = this._getImported(styleSheet);
+      sheets = sheets.concat(imports);
+    }
+    let actors = sheets.map(this._createStyleSheetActor.bind(this));
+
+    return actors;
+  },
+
+  /**
+   * Get all the stylesheets @imported from a stylesheet.
+   *
+   * @param  {DOMStyleSheet} styleSheet
+   *         Style sheet to search
+   * @return {array}
+   *         All the imported stylesheets
+   */
+  _getImported: function(styleSheet) {
+   let imported = [];
+
+   for (let i = 0; i < styleSheet.cssRules.length; i++) {
+      let rule = styleSheet.cssRules[i];
+      if (rule.type == Ci.nsIDOMCSSRule.IMPORT_RULE) {
+        // Associated styleSheet may be null if it has already been seen due to
+        // duplicate @imports for the same URL.
+        if (!rule.styleSheet) {
+          continue;
+        }
+        imported.push(rule.styleSheet);
+
+        // recurse imports in this stylesheet as well
+        imported = imported.concat(this._getImported(rule.styleSheet));
+      }
+      else if (rule.type != Ci.nsIDOMCSSRule.CHARSET_RULE) {
+        // @import rules must precede all others except @charset
+        break;
+      }
+    }
+    return imported;
+  },
+
+  /**
+   * Create a new actor for a style sheet, if it hasn't already been created.
+   *
+   * @param  {DOMStyleSheet} styleSheet
+   *         The style sheet to create an actor for.
+   * @return {StyleSheetActor}
+   *         The actor for this style sheet
+   */
+  _createStyleSheetActor: function(styleSheet)
+  {
+    if (this._sheets.has(styleSheet)) {
+      return this._sheets.get(styleSheet);
+    }
+    let actor = new StyleSheetActor(styleSheet, this);
+
+    this.manage(actor);
+    this._sheets.set(styleSheet, actor);
+
+    return actor;
+  },
+
+  /**
+   * Clear all the current stylesheet actors in map.
+   */
+  _clearStyleSheetActors: function() {
+    for (let actor in this._sheets) {
+      this.unmanage(this._sheets[actor]);
+    }
+    this._sheets.clear();
+  },
+
+  /**
+   * Create a new style sheet in the document with the given text.
+   * Return an actor for it.
+   *
+   * @param  {object} request
+   *         Debugging protocol request object, with 'text property'
+   * @return {object}
+   *         Object with 'styelSheet' property for form on new actor.
+   */
+  addStyleSheet: method(function(text) {
+    let parent = this.document.documentElement;
+    let style = this.document.createElementNS("http://www.w3.org/1999/xhtml", "style");
+    style.setAttribute("type", "text/css");
+
+    if (text) {
+      style.appendChild(this.document.createTextNode(text));
+    }
+    parent.appendChild(style);
+
+    let actor = this._createStyleSheetActor(style.sheet);
+    return actor;
+  }, {
+    request: { text: Arg(0, "string") },
+    response: { styleSheet: RetVal("stylesheet") }
+  })
+});
+
+/**
+ * The corresponding Front object for the StyleSheetsActor.
+ */
+let StyleSheetsFront = protocol.FrontClass(StyleSheetsActor, {
+  initialize: function(client, tabForm) {
+    protocol.Front.prototype.initialize.call(this, client);
+    this.actorID = tabForm.styleSheetsActor;
+
+    client.addActorPool(this);
+    this.manage(this);
+  }
+});
+
+/**
+ * A StyleSheetActor represents a stylesheet on the server.
+ */
+let StyleSheetActor = protocol.ActorClass({
+  typeName: "stylesheet",
+
+  events: {
+    "property-change" : {
+      type: "propertyChange",
+      property: Arg(0, "string"),
+      value: Arg(1, "json")
+    },
+    "style-applied" : {
+      type: "styleApplied"
+    }
+  },
+
+  /* List of original sources that generated this stylesheet */
+  _originalSources: null,
+
+  toString: function() {
+    return "[StyleSheetActor " + this.actorID + "]";
+  },
+
+  /**
+   * Window of target
+   */
+  get window() this._window || this.parentActor.window,
+
+  /**
+   * Document of target.
+   */
+  get document() this.window.document,
+
+  /**
+   * URL of underlying stylesheet.
+   */
+  get href() this.rawSheet.href,
+
+  /**
+   * Retrieve the index (order) of stylesheet in the document.
+   *
+   * @return number
+   */
+  get styleSheetIndex()
+  {
+    if (this._styleSheetIndex == -1) {
+      for (let i = 0; i < this.document.styleSheets.length; i++) {
+        if (this.document.styleSheets[i] == this.rawSheet) {
+          this._styleSheetIndex = i;
+          break;
+        }
+      }
+    }
+    return this._styleSheetIndex;
+  },
+
+  initialize: function(aStyleSheet, aParentActor, aWindow) {
+    protocol.Actor.prototype.initialize.call(this, null);
+
+    this.rawSheet = aStyleSheet;
+    this.parentActor = aParentActor;
+    this.conn = this.parentActor.conn;
+
+    this._window = aWindow;
+
+    // text and index are unknown until source load
+    this.text = null;
+    this._styleSheetIndex = -1;
+
+    this._transitionRefCount = 0;
+
+    // if this sheet has an @import, then it's rules are loaded async
+    let ownerNode = this.rawSheet.ownerNode;
+    if (ownerNode) {
+      let onSheetLoaded = function(event) {
+        ownerNode.removeEventListener("load", onSheetLoaded, false);
+        this._notifyPropertyChanged("ruleCount");
+      }.bind(this);
+
+      ownerNode.addEventListener("load", onSheetLoaded, false);
+    }
+  },
+
+  /**
+   * Get the current state of the actor
+   *
+   * @return {object}
+   *         With properties of the underlying stylesheet, plus 'text',
+   *        'styleSheetIndex' and 'parentActor' if it's @imported
+   */
+  form: function(detail) {
+    if (detail === "actorid") {
+      return this.actorID;
+    }
+
+    let docHref;
+    if (this.rawSheet.ownerNode) {
+      if (this.rawSheet.ownerNode instanceof Ci.nsIDOMHTMLDocument) {
+        docHref = this.rawSheet.ownerNode.location.href;
+      }
+      if (this.rawSheet.ownerNode.ownerDocument) {
+        docHref = this.rawSheet.ownerNode.ownerDocument.location.href;
+      }
+    }
+
+    let form = {
+      actor: this.actorID,  // actorID is set when this actor is added to a pool
+      href: this.href,
+      nodeHref: docHref,
+      disabled: this.rawSheet.disabled,
+      title: this.rawSheet.title,
+      system: !CssLogic.isContentStylesheet(this.rawSheet),
+      styleSheetIndex: this.styleSheetIndex
+    }
+
+    try {
+      form.ruleCount = this.rawSheet.cssRules.length;
+    }
+    catch(e) {
+      // stylesheet had an @import rule that wasn't loaded yet
+    }
+    return form;
+  },
+
+  /**
+   * Toggle the disabled property of the style sheet
+   *
+   * @return {object}
+   *         'disabled' - the disabled state after toggling.
+   */
+  toggleDisabled: method(function() {
+    this.rawSheet.disabled = !this.rawSheet.disabled;
+    this._notifyPropertyChanged("disabled");
+
+    return this.rawSheet.disabled;
+  }, {
+    response: { disabled: RetVal("boolean")}
+  }),
+
+  /**
+   * Send an event notifying that a property of the stylesheet
+   * has changed.
+   *
+   * @param  {string} property
+   *         Name of the changed property
+   */
+  _notifyPropertyChanged: function(property) {
+    events.emit(this, "property-change", property, this.form()[property]);
+  },
+
+  /**
+   * Protocol method to get the text of this stylesheet.
+   */
+  getText: method(function() {
+    return this._getText().then((text) => {
+      return new LongStringActor(this.conn, text || "");
+    });
+  }, {
+    response: {
+      text: RetVal("longstring")
+    }
+  }),
+
+  /**
+   * Fetch the text for this stylesheet from the cache or network. Return
+   * cached text if it's already been fetched.
+   *
+   * @return {Promise}
+   *         Promise that resolves with a string text of the stylesheet.
+   */
+  _getText: function() {
+    if (this.text) {
+      return promise.resolve(this.text);
+    }
+
+    if (!this.href) {
+      // this is an inline <style> sheet
+      let content = this.rawSheet.ownerNode.textContent;
+      this.text = content;
+      return promise.resolve(content);
+    }
+
+    let options = {
+      window: this.window,
+      charset: this._getCSSCharset()
+    };
+
+    return fetch(this.href, options).then(({ content }) => {
+      this.text = content;
+      return content;
+    });
+  },
+
+  /**
+   * Protocol method to get the original source (actors) for this
+   * stylesheet if it has uses source maps.
+   */
+  getOriginalSources: method(function() {
+    if (this._originalSources) {
+      return promise.resolve(this._originalSources);
+    }
+    return this._fetchOriginalSources();
+  }, {
+    request: {},
+    response: {
+      originalSources: RetVal("nullable:array:originalsource")
+    }
+  }),
+
+  /**
+   * Fetch the original sources (actors) for this style sheet using its
+   * source map. If they've already been fetched, returns cached array.
+   *
+   * @return {Promise}
+   *         Promise that resolves with an array of OriginalSourceActors
+   */
+  _fetchOriginalSources: function() {
+    this._clearOriginalSources();
+    this._originalSources = [];
+
+    return this.getSourceMap().then((sourceMap) => {
+      if (!sourceMap) {
+        return null;
+      }
+      for (let url of sourceMap.sources) {
+        let actor = new OriginalSourceActor(url, sourceMap, this);
+
+        this.manage(actor);
+        this._originalSources.push(actor);
+      }
+      return this._originalSources;
+    })
+  },
+
+  /**
+   * Get the SourceMapConsumer for this stylesheet's source map, if
+   * it exists. Saves the consumer for later queries.
+   *
+   * @return {Promise}
+   *         A promise that resolves with a SourceMapConsumer, or null.
+   */
+  getSourceMap: function() {
+    if (this._sourceMap) {
+      return this._sourceMap;
+    }
+    return this._fetchSourceMap();
+  },
+
+  /**
+   * Fetch the source map for this stylesheet.
+   *
+   * @return {Promise}
+   *         A promise that resolves with a SourceMapConsumer, or null.
+   */
+  _fetchSourceMap: function() {
+    let deferred = promise.defer();
+
+    this._getText().then((content) => {
+      let url = this._extractSourceMapUrl(content);
+      if (!url) {
+        // no source map for this stylesheet
+        deferred.resolve(null);
+        return;
+      };
+
+      url = normalize(url, this.href);
+
+      let map = fetch(url, { loadFromCache: false, window: this.window })
+        .then(({content}) => {
+          let map = new SourceMapConsumer(content);
+          this._setSourceMapRoot(map, url, this.href);
+          this._sourceMap = promise.resolve(map);
+
+          deferred.resolve(map);
+          return map;
+        }, deferred.reject);
+
+      this._sourceMap = map;
+    }, deferred.reject);
+
+    return deferred.promise;
+  },
+
+  /**
+   * Clear and unmanage the original source actors for this stylesheet.
+   */
+  _clearOriginalSources: function() {
+    for (actor in this._originalSources) {
+      this.unmanage(actor);
+    }
+    this._originalSources = null;
+  },
+
+  /**
+   * Sets the source map's sourceRoot to be relative to the source map url.
+   */
+  _setSourceMapRoot: function(aSourceMap, aAbsSourceMapURL, aScriptURL) {
+    const base = dirname(
+      aAbsSourceMapURL.indexOf("data:") === 0
+        ? aScriptURL
+        : aAbsSourceMapURL);
+    aSourceMap.sourceRoot = aSourceMap.sourceRoot
+      ? normalize(aSourceMap.sourceRoot, base)
+      : base;
+  },
+
+  /**
+   * Get the source map url specified in the text of a stylesheet.
+   *
+   * @param  {string} content
+   *         The text of the style sheet.
+   * @return {string}
+   *         Url of source map.
+   */
+  _extractSourceMapUrl: function(content) {
+    var matches = /sourceMappingURL\=([^\s\*]*)/.exec(content);
+    if (matches) {
+      return matches[1];
+    }
+    return null;
+  },
+
+  /**
+   * Protocol method that gets the location in the original source of a
+   * line, column pair in this stylesheet, if its source mapped, otherwise
+   * a promise of the same location.
+   */
+  getOriginalLocation: method(function(line, column) {
+    return this.getSourceMap().then((sourceMap) => {
+      if (sourceMap) {
+        return sourceMap.originalPositionFor({ line: line, column: column });
+      }
+      return {
+        source: this.href,
+        line: line,
+        column: column
+      }
+    });
+  }, {
+    request: {
+      line: Arg(0, "number"),
+      column: Arg(1, "number")
+    },
+    response: RetVal(types.addDictType("originallocationresponse", {
+      source: "string",
+      line: "number",
+      column: "number"
+    }))
+  }),
+
+  /**
+   * Get the charset of the stylesheet according to the character set rules
+   * defined in <http://www.w3.org/TR/CSS2/syndata.html#charset>.
+   *
+   * @param string channelCharset
+   *        Charset of the source string if set by the HTTP channel.
+   */
+  _getCSSCharset: function(channelCharset)
+  {
+    // StyleSheet's charset can be specified from multiple sources
+    if (channelCharset && channelCharset.length > 0) {
+      // step 1 of syndata.html: charset given in HTTP header.
+      return channelCharset;
+    }
+
+    let sheet = this.rawSheet;
+    if (sheet) {
+      // Do we have a @charset rule in the stylesheet?
+      // step 2 of syndata.html (without the BOM check).
+      if (sheet.cssRules) {
+        let rules = sheet.cssRules;
+        if (rules.length
+            && rules.item(0).type == Ci.nsIDOMCSSRule.CHARSET_RULE) {
+          return rules.item(0).encoding;
+        }
+      }
+
+      // step 3: charset attribute of <link> or <style> element, if it exists
+      if (sheet.ownerNode && sheet.ownerNode.getAttribute) {
+        let linkCharset = sheet.ownerNode.getAttribute("charset");
+        if (linkCharset != null) {
+          return linkCharset;
+        }
+      }
+
+      // step 4 (1 of 2): charset of referring stylesheet.
+      let parentSheet = sheet.parentStyleSheet;
+      if (parentSheet && parentSheet.cssRules &&
+          parentSheet.cssRules[0].type == Ci.nsIDOMCSSRule.CHARSET_RULE) {
+        return parentSheet.cssRules[0].encoding;
+      }
+
+      // step 4 (2 of 2): charset of referring document.
+      if (sheet.ownerNode && sheet.ownerNode.ownerDocument.characterSet) {
+        return sheet.ownerNode.ownerDocument.characterSet;
+      }
+    }
+
+    // step 5: default to utf-8.
+    return "UTF-8";
+  },
+
+  /**
+   * Update the style sheet in place with new text.
+   *
+   * @param  {object} request
+   *         'text' - new text
+   *         'transition' - whether to do CSS transition for change.
+   */
+  update: method(function(text, transition) {
+    DOMUtils.parseStyleSheet(this.rawSheet, text);
+
+    this.text = text;
+
+    this._notifyPropertyChanged("ruleCount");
+
+    if (transition) {
+      this._insertTransistionRule();
+    }
+    else {
+      this._notifyStyleApplied();
+    }
+  }, {
+    request: {
+      text: Arg(0, "string"),
+      transition: Arg(1, "boolean")
+    }
+  }),
+
+  /**
+   * Insert a catch-all transition rule into the document. Set a timeout
+   * to remove the rule after a certain time.
+   */
+  _insertTransistionRule: function() {
+    // Insert the global transition rule
+    // Use a ref count to make sure we do not add it multiple times.. and remove
+    // it only when all pending StyleSheets-generated transitions ended.
+    if (this._transitionRefCount == 0) {
+      this.rawSheet.insertRule(TRANSITION_RULE, this.rawSheet.cssRules.length);
+      this.document.documentElement.classList.add(TRANSITION_CLASS);
+    }
+
+    this._transitionRefCount++;
+
+    // Set up clean up and commit after transition duration (+10% buffer)
+    // @see _onTransitionEnd
+    this.window.setTimeout(this._onTransitionEnd.bind(this),
+                           Math.floor(TRANSITION_DURATION_MS * 1.1));
+  },
+
+  /**
+    * This cleans up class and rule added for transition effect and then
+    * notifies that the style has been applied.
+    */
+  _onTransitionEnd: function()
+  {
+    if (--this._transitionRefCount == 0) {
+      this.document.documentElement.classList.remove(TRANSITION_CLASS);
+      this.rawSheet.deleteRule(this.rawSheet.cssRules.length - 1);
+    }
+
+    events.emit(this, "style-applied");
+  }
+})
+
+/**
+ * StyleSheetFront is the client-side counterpart to a StyleSheetActor.
+ */
+var StyleSheetFront = protocol.FrontClass(StyleSheetActor, {
+  initialize: function(conn, form, ctx, detail) {
+    protocol.Front.prototype.initialize.call(this, conn, form, ctx, detail);
+
+    this._onPropertyChange = this._onPropertyChange.bind(this);
+    events.on(this, "property-change", this._onPropertyChange);
+  },
+
+  destroy: function() {
+    events.off(this, "property-change", this._onPropertyChange);
+
+    protocol.Front.prototype.destroy.call(this);
+  },
+
+  _onPropertyChange: function(property, value) {
+    this._form[property] = value;
+  },
+
+  form: function(form, detail) {
+    if (detail === "actorid") {
+      this.actorID = form;
+      return;
+    }
+    this.actorID = form.actor;
+    this._form = form;
+  },
+
+  get href() this._form.href,
+  get nodeHref() this._form.nodeHref,
+  get disabled() !!this._form.disabled,
+  get title() this._form.title,
+  get isSystem() this._form.system,
+  get styleSheetIndex() this._form.styleSheetIndex,
+  get ruleCount() this._form.ruleCount
+});
+
+/**
+ * Actor representing an original source of a style sheet that was specified
+ * in a source map.
+ */
+let OriginalSourceActor = protocol.ActorClass({
+  typeName: "originalsource",
+
+  initialize: function(aUrl, aSourceMap, aParentActor) {
+    protocol.Actor.prototype.initialize.call(this, null);
+
+    this.url = aUrl;
+    this.sourceMap = aSourceMap;
+    this.parentActor = aParentActor;
+    this.conn = this.parentActor.conn;
+
+    this.text = null;
+  },
+
+  form: function() {
+    return {
+      actor: this.actorID, // actorID is set when it's added to a pool
+      url: this.url,
+      parentSource: this.parentActor.actorID
+    };
+  },
+
+  _getText: function() {
+    if (this.text) {
+      return promise.resolve(this.text);
+    }
+    return fetch(this.url, { window: this.window }).then(({content}) => {
+      this.text = content;
+      return content;
+    });
+  },
+
+  /**
+   * Protocol method to get the text of this source.
+   */
+  getText: method(function() {
+    return this._getText().then((text) => {
+      return new LongStringActor(this.conn, text || "");
+    });
+  }, {
+    response: {
+      text: RetVal("longstring")
+    }
+  })
+})
+
+/**
+ * The client-side counterpart for an OriginalSourceActor.
+ */
+let OriginalSourceFront = protocol.FrontClass(OriginalSourceActor, {
+  initialize: function(client, form) {
+    protocol.Front.prototype.initialize.call(this, client, form);
+
+    this.isOriginalSource = true;
+  },
+
+  form: function(form, detail) {
+    if (detail === "actorid") {
+      this.actorID = form;
+      return;
+    }
+    this.actorID = form.actor;
+    this._form = form;
+  },
+
+  get href() this._form.url,
+  get url() this._form.url
+});
+
+
+XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
+  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+});
+
+exports.StyleSheetsActor = StyleSheetsActor;
+exports.StyleSheetsFront = StyleSheetsFront;
+
+exports.StyleSheetActor = StyleSheetActor;
+exports.StyleSheetFront = StyleSheetFront;
+
+
+/**
+ * Performs a request to load the desired URL and returns a promise.
+ *
+ * @param aURL String
+ *        The URL we will request.
+ * @returns Promise
+ *        A promise of the document at that URL, as a string.
+ */
+function fetch(aURL, aOptions={ loadFromCache: true, window: null,
+                                charset: null}) {
+  let deferred = promise.defer();
+  let scheme;
+  let url = aURL.split(" -> ").pop();
+  let charset;
+  let contentType;
+
+  try {
+    scheme = Services.io.extractScheme(url);
+  } catch (e) {
+    // In the xpcshell tests, the script url is the absolute path of the test
+    // file, which will make a malformed URI error be thrown. Add the file
+    // scheme prefix ourselves.
+    url = "file://" + url;
+    scheme = Services.io.extractScheme(url);
+  }
+
+  switch (scheme) {
+    case "file":
+    case "chrome":
+    case "resource":
+      try {
+        NetUtil.asyncFetch(url, function onFetch(aStream, aStatus, aRequest) {
+          if (!components.isSuccessCode(aStatus)) {
+            deferred.reject(new Error("Request failed with status code = "
+                                      + aStatus
+                                      + " after NetUtil.asyncFetch for url = "
+                                      + url));
+            return;
+          }
+
+          let source = NetUtil.readInputStreamToString(aStream, aStream.available());
+          contentType = aRequest.contentType;
+          deferred.resolve(source);
+          aStream.close();
+        });
+      } catch (ex) {
+        deferred.reject(ex);
+      }
+      break;
+
+    default:
+      let channel;
+      try {
+        channel = Services.io.newChannel(url, null, null);
+      } catch (e if e.name == "NS_ERROR_UNKNOWN_PROTOCOL") {
+        // On Windows xpcshell tests, c:/foo/bar can pass as a valid URL, but
+        // newChannel won't be able to handle it.
+        url = "file:///" + url;
+        channel = Services.io.newChannel(url, null, null);
+      }
+      let chunks = [];
+      let streamListener = {
+        onStartRequest: function(aRequest, aContext, aStatusCode) {
+          if (!components.isSuccessCode(aStatusCode)) {
+            deferred.reject(new Error("Request failed with status code = "
+                                      + aStatusCode
+                                      + " in onStartRequest handler for url = "
+                                      + url));
+          }
+        },
+        onDataAvailable: function(aRequest, aContext, aStream, aOffset, aCount) {
+          chunks.push(NetUtil.readInputStreamToString(aStream, aCount));
+        },
+        onStopRequest: function(aRequest, aContext, aStatusCode) {
+          if (!components.isSuccessCode(aStatusCode)) {
+            deferred.reject(new Error("Request failed with status code = "
+                                      + aStatusCode
+                                      + " in onStopRequest handler for url = "
+                                      + url));
+            return;
+          }
+
+          charset = channel.contentCharset || charset;
+          contentType = channel.contentType;
+          deferred.resolve(chunks.join(""));
+        }
+      };
+
+      if (aOptions.window) {
+        // respect private browsing
+        channel.loadGroup = aOptions.window.QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIWebNavigation)
+                              .QueryInterface(Ci.nsIDocumentLoader)
+                              .loadGroup;
+      }
+      channel.loadFlags = aOptions.loadFromCache
+        ? channel.LOAD_FROM_CACHE
+        : channel.LOAD_BYPASS_CACHE;
+      channel.asyncOpen(streamListener, null);
+      break;
+  }
+
+  return deferred.promise.then(source => {
+    return {
+      content: convertToUnicode(source, charset),
+      contentType: contentType
+    };
+  });
+}
+
+/**
+ * Convert a given string, encoded in a given character set, to unicode.
+ *
+ * @param string aString
+ *        A string.
+ * @param string aCharset
+ *        A character set.
+ */
+function convertToUnicode(aString, aCharset=null) {
+  // Decoding primitives.
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+    .createInstance(Ci.nsIScriptableUnicodeConverter);
+  try {
+    converter.charset = aCharset || "UTF-8";
+    return converter.ConvertToUnicode(aString);
+  } catch(e) {
+    return aString;
+  }
+}
+
+/**
+ * Normalize multiple relative paths towards the base paths on the right.
+ */
+function normalize(...aURLs) {
+  let base = Services.io.newURI(aURLs.pop(), null, null);
+  let url;
+  while ((url = aURLs.pop())) {
+    base = Services.io.newURI(url, null, base);
+  }
+  return base.spec;
+}
+
+function dirname(aPath) {
+  return Services.io.newURI(
+    ".", null, Services.io.newURI(aPath, null, null)).spec;
+}
diff --git a/toolkit/devtools/server/main.js b/toolkit/devtools/server/main.js
index cf55cb119c57..01aa3bae3888 100644
--- a/toolkit/devtools/server/main.js
+++ b/toolkit/devtools/server/main.js
@@ -367,6 +367,7 @@ var DebuggerServer = {
     this.registerModule("devtools/server/actors/webgl");
     this.registerModule("devtools/server/actors/tracer");
     this.registerModule("devtools/server/actors/device");
+    this.registerModule("devtools/server/actors/stylesheets");
     this.registerModule("devtools/server/actors/styleeditor");
   },
 
@@ -384,6 +385,7 @@ var DebuggerServer = {
       this.addActors("resource://gre/modules/devtools/server/actors/gcli.js");
       this.registerModule("devtools/server/actors/inspector");
       this.registerModule("devtools/server/actors/webgl");
+      this.registerModule("devtools/server/actors/stylesheets");
       this.registerModule("devtools/server/actors/styleeditor");
     }
     if (!("ContentAppActor" in DebuggerServer)) {

From 7522d5a09036d619a8037ac2159b9cb438735f35 Mon Sep 17 00:00:00 2001
From: Ton <tonnes.mb@gmail.com>
Date: Wed, 18 Dec 2013 19:09:52 -0600
Subject: [PATCH 09/78] Bug 951132 - Remove periods in App Manager tooltips.
 r=jryans

---
 .../chrome/browser/devtools/app-manager.dtd   | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd b/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd
index c672b7dde2c1..ebd6d03e77b2 100644
--- a/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/app-manager.dtd
@@ -8,63 +8,63 @@
 <!ENTITY index.help "Help">
 
 <!ENTITY device.screenshot "Screenshot">
-<!ENTITY device.screenshotTooltip "Open a screenshot of the current state of the device in a new tab.">
+<!ENTITY device.screenshotTooltip "Open a screenshot of the current state of the device in a new tab">
 <!ENTITY device.title "Device Control Center">
 <!ENTITY device.notConnected "Not connected. Please connect your device below.">
 <!ENTITY device.startApp "Start">
-<!ENTITY device.startAppTooltip "Start this app on the device.">
+<!ENTITY device.startAppTooltip "Start this app on the device">
 <!ENTITY device.stopApp "Stop">
-<!ENTITY device.stopAppTooltip "Stop this app on the device.">
+<!ENTITY device.stopAppTooltip "Stop this app on the device">
 <!ENTITY device.debugApp "Debug">
-<!ENTITY device.debugAppTooltip "Open the Developer Tools connected to this app on the device.">
+<!ENTITY device.debugAppTooltip "Open the Developer Tools connected to this app on the device">
 <!ENTITY device.name "Name">
 <!ENTITY device.plain "Plain (default)">
 <!ENTITY device.privileged "Privileged">
 <!ENTITY device.certified "Certified">
 <!ENTITY device.allow "Allow">
-<!ENTITY device.allowTooltip "This permission is allowed for apps of this type.">
+<!ENTITY device.allowTooltip "This permission is allowed for apps of this type">
 <!ENTITY device.prompt "Prompt">
-<!ENTITY device.promptTooltip "This permission requires a user prompt for apps of this type.">
+<!ENTITY device.promptTooltip "This permission requires a user prompt for apps of this type">
 <!ENTITY device.deny "Deny">
-<!ENTITY device.denyTooltip "This permission is denied for apps of this type.">
+<!ENTITY device.denyTooltip "This permission is denied for apps of this type">
 <!ENTITY device.installedApps "Installed Apps">
 <!ENTITY device.installedAppsTooltip "View a list of apps installed on the device. Some apps, such as certified apps, may be excluded from this view.">
 <!ENTITY device.permissions "Permissions">
-<!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps.">
+<!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps">
 <!ENTITY device.permissionsHelpLink "https://developer.mozilla.org/docs/Web/Apps/App_permissions">
 <!ENTITY device.help "Help">
 
-<!ENTITY connection.connectTooltip "Connect to the device.">
+<!ENTITY connection.connectTooltip "Connect to the device">
 <!ENTITY connection.disconnect "Disconnect">
-<!ENTITY connection.disconnectTooltip "Disconnect from the current device or simulator.">
+<!ENTITY connection.disconnectTooltip "Disconnect from the current device or simulator">
 <!ENTITY connection.notConnected2 "Not Connected.">
 <!ENTITY connection.connectTo "Connect to:">
 <!ENTITY connection.noDeviceFound "No device found. Plug a device">
 <!ENTITY connection.changeHostAndPort "Change">
-<!ENTITY connection.changeHostAndPortTooltip "Change the host and port used to connect to the device. (Defaults to localhost:6000)">
+<!ENTITY connection.changeHostAndPortTooltip "Change the host and port used to connect to the device (defaults to localhost:6000)">
 <!ENTITY connection.startSimulator "Start Simulator">
-<!ENTITY connection.startSimulatorTooltip "Start an instance of the Simulator and connect to it.">
+<!ENTITY connection.startSimulatorTooltip "Start an instance of the Simulator and connect to it">
 <!ENTITY connection.saveConnectionInfo "Save">
-<!ENTITY connection.saveConnectionInfoTooltip "Save the host and port.">
+<!ENTITY connection.saveConnectionInfoTooltip "Save the host and port">
 <!ENTITY connection.connecting "Connecting…">
 <!ENTITY connection.disconnecting "Disconnecting…">
 <!ENTITY connection.cancel "Cancel">
-<!ENTITY connection.cancelConnectTooltip "Cancel the connection in progress.">
-<!ENTITY connection.cancelShowSimulatorTooltip "Exit the Simulator connection mode and return to the initial prompt.">
+<!ENTITY connection.cancelConnectTooltip "Cancel the connection in progress">
+<!ENTITY connection.cancelShowSimulatorTooltip "Exit the Simulator connection mode and return to the initial prompt">
 <!ENTITY connection.or "or">
 <!ENTITY connection.noSimulatorInstalled "No simulator installed.">
 <!ENTITY connection.installOneSimulator "Install Simulator">
-<!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on.">
+<!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on">
 <!ENTITY connection.installAnotherSimulator "Add">
-<!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on.">
+<!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on">
 <!ENTITY connection.startRegisteredSimulator "Start:">
 
 <!ENTITY projects.localApps "Local Apps">
 <!ENTITY projects.addApp "Add">
 <!ENTITY projects.addPackaged "Add Packaged App">
-<!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer.">
+<!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer">
 <!ENTITY projects.addHosted "Add Hosted App">
-<!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote website.">
+<!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote website">
 <!ENTITY projects.title "Local Apps">
 <!ENTITY projects.appDetails "App Details">
 <!ENTITY projects.removeAppFromList "Remove this app from the list of apps you are working on. This will not remove it from a device or a simulator.">
@@ -73,13 +73,13 @@
 <!ENTITY projects.debugApp "Debug">
 <!ENTITY projects.debugAppTooltip "Open Developer Tools connected to this app">
 <!ENTITY projects.saveManifest "Save">
-<!ENTITY projects.saveManifestTooltip "Save the contents of the Manifest Editor below.">
+<!ENTITY projects.saveManifestTooltip "Save the contents of the Manifest Editor below">
 <!ENTITY projects.hostedManifestPlaceHolder2 "http://example.com/app/manifest.webapp">
 <!ENTITY projects.noProjects "No projects. Add a new packaged app below (local directory) or a hosted app (link to a manifest file).">
 <!ENTITY projects.manifestEditor "Manifest Editor">
 <!ENTITY projects.manifestEditorTooltip "Edit your app's manifest in the panel below. The Update button will save your changes and update the app.">
 <!ENTITY projects.manifestViewer "Manifest Viewer">
-<!ENTITY projects.manifestViewerTooltip "Examine your app's manifest in the panel below.">
+<!ENTITY projects.manifestViewerTooltip "Examine your app's manifest in the panel below">
 <!ENTITY projects.valid "Valid">
 <!ENTITY projects.error "Error">
 <!ENTITY projects.warning "Warning">

From 54ca95f7e838d023591f3393fcc129f67d1dda9f Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Thu, 19 Dec 2013 11:32:13 -0500
Subject: [PATCH 10/78] Bug 951616 - Use docshell to get manifest url.
 r=ochameau

---
 toolkit/devtools/server/actors/webapps.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/toolkit/devtools/server/actors/webapps.js b/toolkit/devtools/server/actors/webapps.js
index 75ac0d390fa4..283a8edfc300 100644
--- a/toolkit/devtools/server/actors/webapps.js
+++ b/toolkit/devtools/server/actors/webapps.js
@@ -947,8 +947,7 @@ WebappsActor.prototype = {
     let manifestURL;
     switch(event.type) {
       case "appwillopen":
-        let frame = event.target;
-        manifestURL = frame.getAttribute("mozapp")
+        manifestURL = event.detail.manifestURL;
 
         // Ignore the event if we already received an appwillopen for this app
         // (appwillopen is also fired when the app has been moved to background

From 15294922b8ed99e0723d94eafa6755eacf5e98a6 Mon Sep 17 00:00:00 2001
From: Yura Zenevich <yura.zenevich@gmail.com>
Date: Thu, 19 Dec 2013 11:47:25 -0500
Subject: [PATCH 11/78] Bug 853439 - Add js-ctypes bindings for sqlite.
 r=yoric, r=gps, sr=Mossop

---
 toolkit/components/moz.build                 |   1 +
 toolkit/components/sqlite/moz.build          |  13 +
 toolkit/components/sqlite/sqlite_internal.js | 323 +++++++++++++++++++
 3 files changed, 337 insertions(+)
 create mode 100644 toolkit/components/sqlite/moz.build
 create mode 100644 toolkit/components/sqlite/sqlite_internal.js

diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index df2b8a46bdba..174f55e41f4e 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -35,6 +35,7 @@ PARALLEL_DIRS += [
     'prompts',
     'protobuf',
     'reflect',
+    'sqlite',
     'startup',
     'statusfilter',
     'telemetry',
diff --git a/toolkit/components/sqlite/moz.build b/toolkit/components/sqlite/moz.build
new file mode 100644
index 000000000000..d9d295f2de0d
--- /dev/null
+++ b/toolkit/components/sqlite/moz.build
@@ -0,0 +1,13 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
+
+JS_MODULES_PATH = 'modules/sqlite'
+
+EXTRA_JS_MODULES += [
+    'sqlite_internal.js',
+]
diff --git a/toolkit/components/sqlite/sqlite_internal.js b/toolkit/components/sqlite/sqlite_internal.js
new file mode 100644
index 000000000000..e7225a7d7af2
--- /dev/null
+++ b/toolkit/components/sqlite/sqlite_internal.js
@@ -0,0 +1,323 @@
+/* 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/. */
+
+/**
+ * This file defines an Sqlite object containing js-ctypes bindings for
+ * sqlite3. It should be included from a worker thread using require.
+ *
+ * It serves the following purposes:
+ * - opens libxul;
+ * - defines sqlite3 API functions;
+ * - defines the necessary sqlite3 types.
+ */
+
+"use strict";
+
+importScripts("resource://gre/modules/workers/require.js");
+
+let SharedAll = require(
+  "resource://gre/modules/osfile/osfile_shared_allthreads.jsm");
+
+// Open the sqlite3 library.
+let path;
+if (SharedAll.Constants.Sys.Name === "Android") {
+  path = ctypes.libraryName("sqlite3");
+} else if (SharedAll.Constants.Win) {
+  path = ctypes.libraryName("nss3");
+} else {
+  path = SharedAll.Constants.Path.libxul;
+}
+
+let lib;
+try {
+  lib = ctypes.open(path);
+} catch (ex) {
+  throw new Error("Could not open system library: " + ex.message);
+}
+
+let declareLazyFFI = SharedAll.declareLazyFFI;
+
+let Type = Object.create(SharedAll.Type);
+
+/**
+ * Opaque Structure |sqlite3_ptr|.
+ * |sqlite3_ptr| is equivalent to a void*.
+ */
+Type.sqlite3_ptr = Type.voidptr_t.withName("sqlite3_ptr");
+
+/**
+ * |sqlite3_stmt_ptr| an instance of an object representing a single SQL
+ * statement.
+ * |sqlite3_stmt_ptr| is equivalent to a void*.
+ */
+Type.sqlite3_stmt_ptr = Type.voidptr_t.withName("sqlite3_stmt_ptr");
+
+/**
+ * |sqlite3_destructor_ptr| a constant defining a special destructor behaviour.
+ * |sqlite3_destructor_ptr| is equivalent to a void*.
+ */
+Type.sqlite3_destructor_ptr = Type.voidptr_t.withName(
+  "sqlite3_destructor_ptr");
+
+/**
+ * A C double.
+ */
+Type.double = new SharedAll.Type("double", ctypes.double);
+
+/**
+ * |sqlite3_int64| typedef for 64-bit integer.
+ */
+Type.sqlite3_int64 = Type.int64_t.withName("sqlite3_int64");
+
+/**
+ * Sqlite3 constants.
+ */
+let Constants = {};
+
+/**
+ * |SQLITE_STATIC| a special value for the destructor that is passed as an
+ * argument to routines like bind_blob, bind_text and bind_text16. It means that
+ * the content pointer is constant and will never change and does need to be
+ * destroyed.
+ */
+Constants.SQLITE_STATIC = Type.sqlite3_destructor_ptr.implementation(0);
+
+/**
+ * |SQLITE_TRANSIENT| a special value for the destructor that is passed as an
+ * argument to routines like bind_blob, bind_text and bind_text16. It means that
+ * the content will likely change in the near future and that SQLite should make
+ * its own private copy of the content before returning.
+ */
+Constants.SQLITE_TRANSIENT = Type.sqlite3_destructor_ptr.implementation(-1);
+
+/**
+ * |SQLITE_OK|
+ * Successful result.
+ */
+Constants.SQLITE_OK = 0;
+
+/**
+ * |SQLITE_ROW|
+ * sqlite3_step() has another row ready.
+ */
+Constants.SQLITE_ROW = 100;
+
+/**
+ * |SQLITE_DONE|
+ * sqlite3_step() has finished executing.
+ */
+Constants.SQLITE_DONE = 101;
+
+let Sqlite3 = {
+  Constants: Constants,
+  Type: Type
+};
+
+declareLazyFFI(Sqlite3, "open", lib, "sqlite3_open", null,
+               /*return*/    Type.int,
+               /*path*/      Type.char.in_ptr,
+               /*db handle*/ Type.sqlite3_ptr.out_ptr);
+
+declareLazyFFI(Sqlite3, "open_v2", lib, "sqlite3_open_v2", null,
+               /*return*/    Type.int,
+               /*path*/      Type.char.in_ptr,
+               /*db handle*/ Type.sqlite3_ptr.out_ptr,
+               /*flags*/     Type.int,
+               /*VFS*/       Type.char.in_ptr);
+
+declareLazyFFI(Sqlite3, "close", lib, "sqlite3_close", null,
+               /*return*/    Type.int,
+               /*db handle*/ Type.sqlite3_ptr);
+
+declareLazyFFI(Sqlite3, "prepare_v2", lib, "sqlite3_prepare_v2", null,
+               /*return*/    Type.int,
+               /*db handle*/ Type.sqlite3_ptr,
+               /*zSql*/      Type.char.in_ptr,
+               /*nByte*/     Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr.out_ptr,
+               /*unused*/    Type.cstring.out_ptr);
+
+declareLazyFFI(Sqlite3, "step", lib, "sqlite3_step", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr);
+
+declareLazyFFI(Sqlite3, "finalize", lib, "sqlite3_finalize", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr);
+
+declareLazyFFI(Sqlite3, "reset", lib, "sqlite3_reset", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr);
+
+declareLazyFFI(Sqlite3, "column_int", lib, "sqlite3_column_int", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "column_blob", lib, "sqlite3_column_blob", null,
+               /*return*/    Type.voidptr_t,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "column_bytes", lib, "sqlite3_column_bytes", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "column_bytes16", lib, "sqlite3_column_bytes16",
+                             null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "column_double", lib, "sqlite3_column_double", null,
+               /*return*/    Type.double,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "column_int64", lib, "sqlite3_column_int64", null,
+               /*return*/    Type.sqlite3_int64,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "column_text", lib, "sqlite3_column_text", null,
+               /*return*/    Type.cstring,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "column_text16", lib, "sqlite3_column_text16", null,
+               /*return*/    Type.wstring,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*col*/       Type.int);
+
+declareLazyFFI(Sqlite3, "bind_int", lib, "sqlite3_bind_int", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*index*/     Type.int,
+               /*value*/     Type.int);
+
+declareLazyFFI(Sqlite3, "bind_int64", lib, "sqlite3_bind_int64", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*index*/     Type.int,
+               /*value*/     Type.sqlite3_int64);
+
+declareLazyFFI(Sqlite3, "bind_double", lib, "sqlite3_bind_double", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*index*/     Type.int,
+               /*value*/     Type.double);
+
+declareLazyFFI(Sqlite3, "bind_null", lib, "sqlite3_bind_null", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*index*/     Type.int);
+
+declareLazyFFI(Sqlite3, "bind_zeroblob", lib, "sqlite3_bind_zeroblob", null,
+               /*return*/    Type.int,
+               /*statement*/ Type.sqlite3_stmt_ptr,
+               /*index*/     Type.int,
+               /*nBytes*/    Type.int);
+
+declareLazyFFI(Sqlite3, "bind_text", lib, "sqlite3_bind_text", null,
+               /*return*/     Type.int,
+               /*statement*/  Type.sqlite3_stmt_ptr,
+               /*index*/      Type.int,
+               /*value*/      Type.cstring,
+               /*nBytes*/     Type.int,
+               /*destructor*/ Type.sqlite3_destructor_ptr);
+
+declareLazyFFI(Sqlite3, "bind_text16", lib, "sqlite3_bind_text16", null,
+               /*return*/     Type.int,
+               /*statement*/  Type.sqlite3_stmt_ptr,
+               /*index*/      Type.int,
+               /*value*/      Type.wstring,
+               /*nBytes*/     Type.int,
+               /*destructor*/ Type.sqlite3_destructor_ptr);
+
+declareLazyFFI(Sqlite3, "bind_blob", lib, "sqlite3_bind_blob", null,
+               /*return*/     Type.int,
+               /*statement*/  Type.sqlite3_stmt_ptr,
+               /*index*/      Type.int,
+               /*value*/      Type.voidptr_t,
+               /*nBytes*/     Type.int,
+               /*destructor*/ Type.sqlite3_destructor_ptr);
+
+module.exports = {
+  get Constants() {
+    return Sqlite3.Constants;
+  },
+  get Type() {
+    return Sqlite3.Type;
+  },
+  get open() {
+    return Sqlite3.open;
+  },
+  get open_v2() {
+    return Sqlite3.open_v2;
+  },
+  get close() {
+    return Sqlite3.close;
+  },
+  get prepare_v2() {
+    return Sqlite3.prepare_v2;
+  },
+  get step() {
+    return Sqlite3.step;
+  },
+  get finalize() {
+    return Sqlite3.finalize;
+  },
+  get reset() {
+    return Sqlite3.reset;
+  },
+  get column_int() {
+    return Sqlite3.column_int;
+  },
+  get column_blob() {
+    return Sqlite3.column_blob;
+  },
+  get column_bytes() {
+    return Sqlite3.column_bytes;
+  },
+  get column_bytes16() {
+    return Sqlite3.column_bytes16;
+  },
+  get column_double() {
+    return Sqlite3.column_double;
+  },
+  get column_int64() {
+    return Sqlite3.column_int64;
+  },
+  get column_text() {
+    return Sqlite3.column_text;
+  },
+  get column_text16() {
+    return Sqlite3.column_text16;
+  },
+  get bind_int() {
+    return Sqlite3.bind_int;
+  },
+  get bind_int64() {
+    return Sqlite3.bind_int64;
+  },
+  get bind_double() {
+    return Sqlite3.bind_double;
+  },
+  get bind_null() {
+    return Sqlite3.bind_null;
+  },
+  get bind_zeroblob() {
+    return Sqlite3.bind_zeroblob;
+  },
+  get bind_text() {
+    return Sqlite3.bind_text;
+  },
+  get bind_text16() {
+    return Sqlite3.bind_text16;
+  },
+  get bind_blob() {
+    return Sqlite3.bind_blob;
+  }
+};

From c977ec9893bd31aad8ba2b20e9493ab1aec67d75 Mon Sep 17 00:00:00 2001
From: Yura Zenevich <yura.zenevich@gmail.com>
Date: Thu, 19 Dec 2013 11:47:27 -0500
Subject: [PATCH 12/78] Bug 853439 - Add tests for js-ctypes bindings for
 sqlite. r=yoric, r=gps

---
 .../tests/xpcshell/data/chrome.manifest       |   1 +
 .../xpcshell/data/worker_sqlite_internal.js   | 279 ++++++++++++++++++
 .../xpcshell/data/worker_sqlite_shared.js     |  39 +++
 .../tests/xpcshell/test_sqlite_internal.js    |  43 +++
 .../sqlite/tests/xpcshell/xpcshell.ini        |   9 +
 5 files changed, 371 insertions(+)
 create mode 100644 toolkit/components/sqlite/tests/xpcshell/data/chrome.manifest
 create mode 100644 toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_internal.js
 create mode 100644 toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_shared.js
 create mode 100644 toolkit/components/sqlite/tests/xpcshell/test_sqlite_internal.js
 create mode 100644 toolkit/components/sqlite/tests/xpcshell/xpcshell.ini

diff --git a/toolkit/components/sqlite/tests/xpcshell/data/chrome.manifest b/toolkit/components/sqlite/tests/xpcshell/data/chrome.manifest
new file mode 100644
index 000000000000..92b9cf60bba1
--- /dev/null
+++ b/toolkit/components/sqlite/tests/xpcshell/data/chrome.manifest
@@ -0,0 +1 @@
+content test_sqlite_internal ./
diff --git a/toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_internal.js b/toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_internal.js
new file mode 100644
index 000000000000..cb0876ea189b
--- /dev/null
+++ b/toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_internal.js
@@ -0,0 +1,279 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+importScripts("worker_sqlite_shared.js",
+  "resource://gre/modules/workers/require.js");
+
+self.onmessage = function onmessage(msg) {
+  try {
+    run_test();
+  } catch (ex) {
+    let {message, moduleStack, moduleName, lineNumber} = ex;
+    let error = new Error(message, moduleName, lineNumber);
+    error.stack = moduleStack;
+    dump("Uncaught error: " + error + "\n");
+    dump("Full stack: " + moduleStack + "\n");
+    throw error;
+  }
+};
+
+let Sqlite;
+
+let SQLITE_OK;   /* Successful result */
+let SQLITE_ROW;  /* sqlite3_step() has another row ready */
+let SQLITE_DONE; /* sqlite3_step() has finished executing */
+
+function test_init() {
+  do_print("Starting test_init");
+  // Sqlite should be loaded.
+  Sqlite = require("resource://gre/modules/sqlite/sqlite_internal.js");
+  do_check_neq(typeof Sqlite, "undefined");
+  do_check_neq(typeof Sqlite.Constants, "undefined");
+  SQLITE_OK = Sqlite.Constants.SQLITE_OK;
+  SQLITE_ROW = Sqlite.Constants.SQLITE_ROW;
+  SQLITE_DONE = Sqlite.Constants.SQLITE_DONE;
+}
+
+/**
+ * Clean up the database.
+ * @param  {sqlite3_ptr} db A pointer to the database.
+ */
+function cleanupDB(db) {
+  withQuery(db, "DROP TABLE IF EXISTS TEST;", SQLITE_DONE);
+}
+
+/**
+ * Open and close sqlite3 database.
+ * @param  {String}   open            A name of the sqlite3 open function to be
+ *                                    used.
+ * @param  {Array}    openArgs = []   Optional arguments to open function.
+ * @param  {Function} callback = null An optional callback to be run after the
+ *                                    database is opened but before it is
+ *                                    closed.
+ */
+function withDB(open, openArgs = [], callback = null) {
+  let db = Sqlite.Type.sqlite3_ptr.implementation();
+  let dbPtr = db.address();
+
+  // Open database.
+  let result = Sqlite[open].apply(Sqlite, ["data/test.db", dbPtr].concat(
+    openArgs));
+  do_check_eq(result, SQLITE_OK);
+
+  // Drop the test table if it already exists.
+  cleanupDB(db);
+
+  try {
+    if (callback) {
+      callback(db);
+    }
+  } catch (ex) {
+    do_check_true(false);
+    throw ex;
+  } finally {
+    // Drop the test table if it still exists.
+    cleanupDB(db);
+    // Close data base.
+    result = Sqlite.close(db);
+    do_check_eq(result, SQLITE_OK);
+  }
+}
+
+/**
+ * Execute an SQL query using sqlite3 API.
+ * @param  {sqlite3_ptr} db         A pointer to the database.
+ * @param  {String}      sql        A SQL query string.
+ * @param  {Number}      stepResult Expected result code after evaluating the
+ *                                  SQL statement.
+ * @param  {Function}    bind       An optional callback with SQL binding steps.
+ * @param  {Function}    callback   An optional callback that runs after the SQL
+ *                                  query completes.
+ */
+function withQuery(db, sql, stepResult, bind, callback) {
+  // Create an instance of a single SQL statement.
+  let sqlStmt = Sqlite.Type.sqlite3_stmt_ptr.implementation();
+  let sqlStmtPtr = sqlStmt.address();
+
+  // Unused portion of an SQL query.
+  let unused = Sqlite.Type.cstring.implementation();
+  let unusedPtr = unused.address();
+
+  // Compile an SQL statement.
+  let result = Sqlite.prepare_v2(db, sql, sql.length, sqlStmtPtr, unusedPtr);
+  do_check_eq(result, SQLITE_OK);
+
+  try {
+    if (bind) {
+      bind(sqlStmt);
+    }
+
+    // Evaluate an SQL statement.
+    result = Sqlite.step(sqlStmt);
+    do_check_eq(result, stepResult);
+
+    if (callback) {
+      callback(sqlStmt);
+    }
+  } catch (ex) {
+    do_check_true(false);
+    throw ex;
+  } finally {
+    // Destroy a prepared statement object.
+    result = Sqlite.finalize(sqlStmt);
+    do_check_eq(result, SQLITE_OK);
+  }
+}
+
+function test_open_close() {
+  do_print("Starting test_open_close");
+  do_check_eq(typeof Sqlite.open, "function");
+  do_check_eq(typeof Sqlite.close, "function");
+
+  withDB("open");
+}
+
+function test_open_v2_close() {
+  do_print("Starting test_open_v2_close");
+  do_check_eq(typeof Sqlite.open_v2, "function");
+
+  withDB("open_v2", [0x02, null]);
+}
+
+function createTableOnOpen(db) {
+  withQuery(db, "CREATE TABLE TEST(" +
+              "ID INT PRIMARY KEY NOT NULL," +
+              "FIELD1 INT," +
+              "FIELD2 REAL," +
+              "FIELD3 TEXT," +
+              "FIELD4 TEXT," +
+              "FIELD5 BLOB" +
+            ");", SQLITE_DONE);
+}
+
+function test_create_table() {
+  do_print("Starting test_create_table");
+  do_check_eq(typeof Sqlite.prepare_v2, "function");
+  do_check_eq(typeof Sqlite.step, "function");
+  do_check_eq(typeof Sqlite.finalize, "function");
+
+  withDB("open", [], createTableOnOpen);
+}
+
+/**
+ * Read column values after evaluating the SQL SELECT statement.
+ * @param  {sqlite3_stmt_ptr} sqlStmt A pointer to the SQL statement.
+ */
+function onSqlite3Step(sqlStmt) {
+  // Get an int value from a query result from the ID (column 0).
+  let field = Sqlite.column_int(sqlStmt, 0);
+  do_check_eq(field, 3);
+
+  // Get an int value from a query result from the column 1.
+  field = Sqlite.column_int(sqlStmt, 1);
+  do_check_eq(field, 2);
+  // Get an int64 value from a query result from the column 1.
+  field = Sqlite.column_int64(sqlStmt, 1);
+  do_check_eq(field, 2);
+
+  // Get a double value from a query result from the column 2.
+  field = Sqlite.column_double(sqlStmt, 2);
+  do_check_eq(field, 1.2);
+
+  // Get a number of bytes of the value in the column 3.
+  let bytes = Sqlite.column_bytes(sqlStmt, 3);
+  do_check_eq(bytes, 4);
+  // Get a text(cstring) value from a query result from the column 3.
+  field = Sqlite.column_text(sqlStmt, 3);
+  do_check_eq(field.readString(), "DATA");
+
+  // Get a number of bytes of the UTF-16 value in the column 4.
+  bytes = Sqlite.column_bytes16(sqlStmt, 4);
+  do_check_eq(bytes, 8);
+  // Get a text16(wstring) value from a query result from the column 4.
+  field = Sqlite.column_text16(sqlStmt, 4);
+  do_check_eq(field.readString(), "TADA");
+
+  // Get a blob value from a query result from the column 5.
+  field = Sqlite.column_blob(sqlStmt, 5);
+  do_check_eq(ctypes.cast(field,
+    Sqlite.Type.cstring.implementation).readString(), "BLOB");
+}
+
+function test_insert_select() {
+  do_print("Starting test_insert_select");
+  do_check_eq(typeof Sqlite.column_int, "function");
+  do_check_eq(typeof Sqlite.column_int64, "function");
+  do_check_eq(typeof Sqlite.column_double, "function");
+  do_check_eq(typeof Sqlite.column_bytes, "function");
+  do_check_eq(typeof Sqlite.column_text, "function");
+  do_check_eq(typeof Sqlite.column_text16, "function");
+  do_check_eq(typeof Sqlite.column_blob, "function");
+
+  function onOpen(db) {
+    createTableOnOpen(db);
+    withQuery(db,
+      "INSERT INTO TEST VALUES (3, 2, 1.2, \"DATA\", \"TADA\", \"BLOB\");",
+      SQLITE_DONE);
+    withQuery(db, "SELECT * FROM TEST;", SQLITE_ROW, null, onSqlite3Step);
+  }
+
+  withDB("open", [], onOpen);
+}
+
+function test_insert_bind_select() {
+  do_print("Starting test_insert_bind_select");
+  do_check_eq(typeof Sqlite.bind_int, "function");
+  do_check_eq(typeof Sqlite.bind_int64, "function");
+  do_check_eq(typeof Sqlite.bind_double, "function");
+  do_check_eq(typeof Sqlite.bind_text, "function");
+  do_check_eq(typeof Sqlite.bind_text16, "function");
+  do_check_eq(typeof Sqlite.bind_blob, "function");
+
+  function onBind(sqlStmt) {
+    // Bind an int value to the ID (column 0).
+    let result = Sqlite.bind_int(sqlStmt, 1, 3);
+    do_check_eq(result, SQLITE_OK);
+
+    // Bind an int64 value to the FIELD1 (column 1).
+    result = Sqlite.bind_int64(sqlStmt, 2, 2);
+    do_check_eq(result, SQLITE_OK);
+
+    // Bind a double value to the FIELD2 (column 2).
+    result = Sqlite.bind_double(sqlStmt, 3, 1.2);
+    do_check_eq(result, SQLITE_OK);
+
+    // Destructor.
+    let destructor = Sqlite.Constants.SQLITE_TRANSIENT;
+    // Bind a text value to the FIELD3 (column 3).
+    result = Sqlite.bind_text(sqlStmt, 4, "DATA", 4, destructor);
+    do_check_eq(result, SQLITE_OK);
+
+    // Bind a text16 value to the FIELD4 (column 4).
+    result = Sqlite.bind_text16(sqlStmt, 5, "TADA", 8, destructor);
+    do_check_eq(result, SQLITE_OK);
+
+    // Bind a blob value to the FIELD5 (column 5).
+    result = Sqlite.bind_blob(sqlStmt, 6, ctypes.char.array()("BLOB"), 4,
+      destructor);
+    do_check_eq(result, SQLITE_OK);
+  }
+
+  function onOpen(db) {
+    createTableOnOpen(db);
+    withQuery(db, "INSERT INTO TEST VALUES (?, ?, ?, ?, ?, ?);", SQLITE_DONE,
+      onBind);
+    withQuery(db, "SELECT * FROM TEST;", SQLITE_ROW, null, onSqlite3Step);
+  }
+
+  withDB("open", [], onOpen);
+}
+
+function run_test() {
+  test_init();
+  test_open_close();
+  test_open_v2_close();
+  test_create_table();
+  test_insert_select();
+  test_insert_bind_select();
+  do_test_complete();
+}
diff --git a/toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_shared.js b/toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_shared.js
new file mode 100644
index 000000000000..54351a02a435
--- /dev/null
+++ b/toolkit/components/sqlite/tests/xpcshell/data/worker_sqlite_shared.js
@@ -0,0 +1,39 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function send(message) {
+  self.postMessage(message);
+}
+
+function do_test_complete() {
+  send({kind: "do_test_complete", args: []});
+}
+
+function do_check_true(x) {
+  send({kind: "do_check_true", args: [!!x]});
+  if (x) {
+    dump("TEST-PASS: " + x + "\n");
+  } else {
+    throw new Error("do_check_true failed");
+  }
+}
+
+function do_check_eq(a, b) {
+  let result = a == b;
+  send({kind: "do_check_true", args: [result]});
+  if (!result) {
+    throw new Error("do_check_eq failed " + a + " != " + b);
+  }
+}
+
+function do_check_neq(a, b) {
+ let result = a != b;
+ send({kind: "do_check_true", args: [result]});
+ if (!result) {
+   throw new Error("do_check_neq failed " + a + " == " + b);
+ }
+}
+
+function do_print(x) {
+  dump("TEST-INFO: " + x + "\n");
+}
diff --git a/toolkit/components/sqlite/tests/xpcshell/test_sqlite_internal.js b/toolkit/components/sqlite/tests/xpcshell/test_sqlite_internal.js
new file mode 100644
index 000000000000..c78aa6f0a614
--- /dev/null
+++ b/toolkit/components/sqlite/tests/xpcshell/test_sqlite_internal.js
@@ -0,0 +1,43 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Components.utils.import("resource://gre/modules/Promise.jsm");
+
+let WORKER_SOURCE_URI =
+  "chrome://test_sqlite_internal/content/worker_sqlite_internal.js";
+do_load_manifest("data/chrome.manifest");
+
+function run_test() {
+  run_next_test();
+}
+
+add_task(function() {
+  let worker = new ChromeWorker(WORKER_SOURCE_URI);
+  let deferred = Promise.defer();
+  worker.onmessage = function(event) {
+    let data = event.data;
+    switch (data.kind) {
+      case "do_check_true":
+        try {
+          do_check_true(data.args[0]);
+        } catch (ex) {
+          // Ignore errors
+        }
+        break;
+      case "do_test_complete":
+        deferred.resolve();
+        worker.terminate();
+        break;
+      case "do_print":
+        do_print(data.args[0]);
+        break;
+    }
+  };
+  worker.onerror = function(event) {
+    let error = new Error(event.message, event.filename, event.lineno);
+    worker.terminate();
+    deferred.reject(error);
+  };
+  worker.postMessage("START");
+  return deferred.promise;
+});
diff --git a/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini b/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
new file mode 100644
index 000000000000..b83610f08a8e
--- /dev/null
+++ b/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
@@ -0,0 +1,9 @@
+[DEFAULT]
+head =
+tail =
+support-files =
+  data/worker_sqlite_shared.js
+  data/worker_sqlite_internal.js
+  data/chrome.manifest
+
+[test_sqlite_internal.js]
\ No newline at end of file

From 821f4e8b7f694541b495dadbaa5330d4584b5f3f Mon Sep 17 00:00:00 2001
From: Michael Brennan <brennan.brisad@gmail.com>
Date: Tue, 20 Aug 2013 22:46:38 +0200
Subject: [PATCH 13/78] Bug 888373: Simple API for detecting startup/shutdown
 crashes - tests;r=yoric,gps

---
 toolkit/components/crashmonitor/moz.build     |  2 ++
 .../components/crashmonitor/test/unit/head.js | 22 ++++++++++++++
 .../crashmonitor/test/unit/test_init.js       | 17 +++++++++++
 .../test/unit/test_invalid_file.js            | 30 +++++++++++++++++++
 .../test/unit/test_missing_file.js            | 13 ++++++++
 .../crashmonitor/test/unit/test_register.js   | 24 +++++++++++++++
 .../crashmonitor/test/unit/test_valid_file.js | 20 +++++++++++++
 .../crashmonitor/test/unit/xpcshell.ini       |  9 ++++++
 8 files changed, 137 insertions(+)
 create mode 100644 toolkit/components/crashmonitor/test/unit/head.js
 create mode 100644 toolkit/components/crashmonitor/test/unit/test_init.js
 create mode 100644 toolkit/components/crashmonitor/test/unit/test_invalid_file.js
 create mode 100644 toolkit/components/crashmonitor/test/unit/test_missing_file.js
 create mode 100644 toolkit/components/crashmonitor/test/unit/test_register.js
 create mode 100644 toolkit/components/crashmonitor/test/unit/test_valid_file.js
 create mode 100644 toolkit/components/crashmonitor/test/unit/xpcshell.ini

diff --git a/toolkit/components/crashmonitor/moz.build b/toolkit/components/crashmonitor/moz.build
index a94de010b43f..fb7f3adcf2e1 100644
--- a/toolkit/components/crashmonitor/moz.build
+++ b/toolkit/components/crashmonitor/moz.build
@@ -4,6 +4,8 @@
 # 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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+
 EXTRA_JS_MODULES = [
     'CrashMonitor.jsm',
 ]
diff --git a/toolkit/components/crashmonitor/test/unit/head.js b/toolkit/components/crashmonitor/test/unit/head.js
new file mode 100644
index 000000000000..73d8af34c108
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/head.js
@@ -0,0 +1,22 @@
+/* -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "OS",
+                                  "resource://gre/modules/osfile.jsm");
+
+let sessionCheckpointsPath;
+
+/**
+ * Start the tasks of the different tests
+ */
+function run_test()
+{
+  do_get_profile();
+  sessionCheckpointsPath = OS.Path.join(OS.Constants.Path.profileDir,
+                                        "sessionCheckpoints.json");
+  Components.utils.import("resource://gre/modules/CrashMonitor.jsm");
+  run_next_test();
+}
diff --git a/toolkit/components/crashmonitor/test/unit/test_init.js b/toolkit/components/crashmonitor/test/unit/test_init.js
new file mode 100644
index 000000000000..4b28710a2b0b
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/test_init.js
@@ -0,0 +1,17 @@
+/* -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+/**
+ * Test that calling |init| twice throws an error
+ */
+add_task(function test_init() {
+  CrashMonitor.init();
+  try {
+    CrashMonitor.init();
+    do_check_true(false);
+  } catch (ex) {
+    do_check_true(true);
+  }
+});
diff --git a/toolkit/components/crashmonitor/test/unit/test_invalid_file.js b/toolkit/components/crashmonitor/test/unit/test_invalid_file.js
new file mode 100644
index 000000000000..182d4bd697a2
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/test_invalid_file.js
@@ -0,0 +1,30 @@
+/* -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+/**
+ * Test with sessionCheckpoints.json containing invalid data
+ */
+add_task(function test_invalid_file() {
+  // Write bogus data to checkpoint file
+  let data = "1234";
+  yield OS.File.writeAtomic(sessionCheckpointsPath, data,
+                            {tmpPath: sessionCheckpointsPath + ".tmp"});
+
+  // An invalid file will cause |init| to throw an exception
+  try {
+    let status = yield CrashMonitor.init();
+    do_check_true(false);
+  } catch (ex) {
+    do_check_true(true);
+  }
+
+  // and |previousCheckpoints| will be rejected
+  try {
+    let checkpoints = yield CrashMonitor.previousCheckpoints;
+    do_check_true(false);
+  } catch (ex) {
+    do_check_true(true);
+  }
+});
diff --git a/toolkit/components/crashmonitor/test/unit/test_missing_file.js b/toolkit/components/crashmonitor/test/unit/test_missing_file.js
new file mode 100644
index 000000000000..e879264e463f
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/test_missing_file.js
@@ -0,0 +1,13 @@
+/* -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+/**
+ * Test with non-existing sessionCheckpoints.json
+ */
+add_task(function test_missing_file() {
+  CrashMonitor.init();
+  let checkpoints = yield CrashMonitor.previousCheckpoints;
+  do_check_eq(checkpoints, null);
+});
diff --git a/toolkit/components/crashmonitor/test/unit/test_register.js b/toolkit/components/crashmonitor/test/unit/test_register.js
new file mode 100644
index 000000000000..43f19dafe757
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/test_register.js
@@ -0,0 +1,24 @@
+/* -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+/**
+ * Test that CrashMonitor.jsm is correctly loaded from XPCOM component
+ */
+add_task(function test_register() {
+  let cm = Components.classes["@mozilla.org/toolkit/crashmonitor;1"]
+                             .createInstance(Components.interfaces.nsIObserver);
+
+  // Send "profile-after-change" to trigger the initialization
+  cm.observe(null, "profile-after-change", null);
+
+  // If CrashMonitor was initialized properly a new call to |init|
+  // should fail
+  try {
+    CrashMonitor.init();
+    do_check_true(false);
+  } catch (ex) {
+    do_check_true(true);
+  }
+});
diff --git a/toolkit/components/crashmonitor/test/unit/test_valid_file.js b/toolkit/components/crashmonitor/test/unit/test_valid_file.js
new file mode 100644
index 000000000000..e0a58390e843
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/test_valid_file.js
@@ -0,0 +1,20 @@
+/* -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+
+/**
+ * Test with sessionCheckpoints.json containing valid data
+ */
+add_task(function test_valid_file() {
+  // Write valid data to checkpoint file
+  let data = JSON.stringify({"final-ui-startup": true});
+  yield OS.File.writeAtomic(sessionCheckpointsPath, data,
+                            {tmpPath: sessionCheckpointsPath + ".tmp"});
+
+  CrashMonitor.init();
+  let checkpoints = yield CrashMonitor.previousCheckpoints;
+
+  do_check_true(checkpoints["final-ui-startup"]);
+  do_check_eq(Object.keys(checkpoints).length, 1);
+});
diff --git a/toolkit/components/crashmonitor/test/unit/xpcshell.ini b/toolkit/components/crashmonitor/test/unit/xpcshell.ini
new file mode 100644
index 000000000000..2a3ee66970c5
--- /dev/null
+++ b/toolkit/components/crashmonitor/test/unit/xpcshell.ini
@@ -0,0 +1,9 @@
+[DEFAULT]
+head = head.js
+tail =
+
+[test_init.js]
+[test_valid_file.js]
+[test_invalid_file.js]
+[test_missing_file.js]
+[test_register.js]

From 40c310403402e8c38bd3a315c8eacd8e74510f0e Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Thu, 19 Dec 2013 12:21:51 +0100
Subject: [PATCH 14/78] Bug 950132 - Fix pageStyle data collection r=yoric

From af5873fe7e4f55dd72f0e62d5c22285c2c94e40d Mon Sep 17 00:00:00 2001
---
 .../content/content-sessionStore.js           |  20 +++-
 .../components/sessionstore/src/PageStyle.jsm | 107 ++++++++++++------
 .../sessionstore/src/SessionStore.jsm         |  12 +-
 .../sessionstore/test/browser_pageStyle.js    |   3 +-
 .../test/browser_pageStyle_sample.html        |   3 -
 5 files changed, 98 insertions(+), 47 deletions(-)

diff --git a/browser/components/sessionstore/content/content-sessionStore.js b/browser/components/sessionstore/content/content-sessionStore.js
index 4fb77aa47225..9b592daabc39 100644
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ b/browser/components/sessionstore/content/content-sessionStore.js
@@ -244,20 +244,34 @@ let ScrollPositionListener = {
  * currently applied style to the chrome process.
  *
  * Causes a SessionStore:update message to be sent that contains the currently
- * selected pageStyle, if any. The pageStyle is represented by a string.
+ * selected pageStyle for all reachable frames.
+ *
+ * Example:
+ *   {pageStyle: "Dusk", children: [null, {pageStyle: "Mozilla"}]}
  */
 let PageStyleListener = {
   init: function () {
     Services.obs.addObserver(this, "author-style-disabled-changed", true);
     Services.obs.addObserver(this, "style-sheet-applicable-state-changed", true);
+    gFrameTree.addObserver(this);
   },
 
   observe: function (subject, topic) {
-    if (subject.defaultView && subject.defaultView.top == content) {
-      MessageQueue.push("pageStyle", () => PageStyle.collect(docShell) || null);
+    let frame = subject.defaultView;
+
+    if (frame && gFrameTree.contains(frame)) {
+      MessageQueue.push("pageStyle", () => this.collect());
     }
   },
 
+  collect: function () {
+    return PageStyle.collect(docShell, gFrameTree);
+  },
+
+  onFrameTreeReset: function () {
+    MessageQueue.push("pageStyle", () => null);
+  },
+
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
                                          Ci.nsISupportsWeakReference])
 };
diff --git a/browser/components/sessionstore/src/PageStyle.jsm b/browser/components/sessionstore/src/PageStyle.jsm
index 0907d24242da..c677adc5dc8d 100644
--- a/browser/components/sessionstore/src/PageStyle.jsm
+++ b/browser/components/sessionstore/src/PageStyle.jsm
@@ -12,13 +12,17 @@ const Ci = Components.interfaces;
  * The external API exported by this module.
  */
 this.PageStyle = Object.freeze({
-  collect: function (docShell) {
-    return PageStyleInternal.collect(docShell);
+  collect: function (docShell, frameTree) {
+    return PageStyleInternal.collect(docShell, frameTree);
   },
 
   restore: function (docShell, frameList, pageStyle) {
     PageStyleInternal.restore(docShell, frameList, pageStyle);
   },
+
+  restoreTree: function (docShell, data) {
+    PageStyleInternal.restoreTree(docShell, data);
+  }
 });
 
 // Signifies that author style level is disabled for the page.
@@ -26,47 +30,29 @@ const NO_STYLE = "_nostyle";
 
 let PageStyleInternal = {
   /**
-   * Find out the title of the style sheet selected for the given
-   * docshell. Recurse into frames if needed.
+   * Collects the selected style sheet sets for all reachable frames.
    */
-  collect: function (docShell) {
+  collect: function (docShell, frameTree) {
+    let result = frameTree.map(({document: doc}) => {
+      let style;
+
+      if (doc) {
+        // http://dev.w3.org/csswg/cssom/#persisting-the-selected-css-style-sheet-set
+        style = doc.selectedStyleSheetSet || doc.lastStyleSheetSet;
+      }
+
+      return style ? {pageStyle: style} : null;
+    });
+
     let markupDocumentViewer =
       docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
+
     if (markupDocumentViewer.authorStyleDisabled) {
-      return NO_STYLE;
+      result = result || {};
+      result.disabled = true;
     }
 
-    let content = docShell.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);
-
-    return this.collectFrame(content);
-  },
-
-  /**
-   * Determine the title of the currently enabled style sheet (if any);
-   * recurse through the frameset if necessary.
-   * @param   content is a frame reference
-   * @returns the title style sheet determined to be enabled (empty string if none)
-   */
-  collectFrame: function (content) {
-    const forScreen = /(?:^|,)\s*(?:all|screen)\s*(?:,|$)/i;
-
-    let sheets = content.document.styleSheets;
-    for (let i = 0; i < sheets.length; i++) {
-      let ss = sheets[i];
-      let media = ss.media.mediaText;
-      if (!ss.disabled && ss.title && (!media || forScreen.test(media))) {
-        return ss.title;
-      }
-    }
-
-    for (let i = 0; i < content.frames.length; i++) {
-      let selectedPageStyle = this.collectFrame(content.frames[i]);
-      if (selectedPageStyle) {
-        return selectedPageStyle;
-      }
-    }
-
-    return "";
+    return result && Object.keys(result).length ? result : null;
   },
 
   /**
@@ -91,4 +77,51 @@ let PageStyleInternal = {
       });
     }
   },
+
+  /**
+   * Restores pageStyle data for the current frame hierarchy starting at the
+   * |docShell's| current DOMWindow using the given pageStyle |data|.
+   *
+   * Warning: If the current frame hierarchy doesn't match that of the given
+   * |data| object we will silently discard data for unreachable frames. We may
+   * as well assign page styles to the wrong frames if some were reordered or
+   * removed.
+   *
+   * @param docShell (nsIDocShell)
+   * @param data (object)
+   *        {
+   *          disabled: true, // when true, author styles will be disabled
+   *          pageStyle: "Dusk",
+   *          children: [
+   *            null,
+   *            {pageStyle: "Mozilla", children: [ ... ]}
+   *          ]
+   *        }
+   */
+  restoreTree: function (docShell, data) {
+    let disabled = data.disabled || false;
+    let markupDocumentViewer =
+      docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
+    markupDocumentViewer.authorStyleDisabled = disabled;
+
+    function restoreFrame(root, data) {
+      if (data.hasOwnProperty("pageStyle")) {
+        root.document.selectedStyleSheetSet = data.pageStyle;
+      }
+
+      if (!data.hasOwnProperty("children")) {
+        return;
+      }
+
+      let frames = root.frames;
+      data.children.forEach((child, index) => {
+        if (child && index < frames.length) {
+          restoreFrame(frames[index], child);
+        }
+      });
+    }
+
+    let ifreq = docShell.QueryInterface(Ci.nsIInterfaceRequestor);
+    restoreFrame(ifreq.getInterface(Ci.nsIDOMWindow), data);
+  }
 };
diff --git a/browser/components/sessionstore/src/SessionStore.jsm b/browser/components/sessionstore/src/SessionStore.jsm
index b12f0d2c4d96..ebea97436610 100644
--- a/browser/components/sessionstore/src/SessionStore.jsm
+++ b/browser/components/sessionstore/src/SessionStore.jsm
@@ -2976,11 +2976,17 @@ let SessionStoreInternal = {
     }
 
     let frameList = this.getFramesToRestore(aBrowser);
-    let pageStyle = RestoreData.get(aBrowser, "pageStyle") || "";
+    let pageStyle = RestoreData.get(aBrowser, "pageStyle") || {};
     let scrollPositions = RestoreData.get(aBrowser, "scroll") || {};
 
-    PageStyle.restore(aBrowser.docShell, frameList, pageStyle);
-    ScrollPosition.restoreTree(aBrowser.contentWindow, scrollPositions);
+    // Support the old pageStyle format.
+    if (typeof(pageStyle) === "string") {
+      PageStyle.restore(aBrowser.docShell, frameList, pageStyle);
+    } else {
+      ScrollPosition.restoreTree(aBrowser.contentWindow, scrollPositions);
+    }
+
+    PageStyle.restoreTree(aBrowser.docShell, pageStyle);
     TextAndScrollData.restore(frameList);
 
     let tab = aBrowser.__SS_restore_tab;
diff --git a/browser/components/sessionstore/test/browser_pageStyle.js b/browser/components/sessionstore/test/browser_pageStyle.js
index 155cd47ce0f8..7a3a9b199631 100644
--- a/browser/components/sessionstore/test/browser_pageStyle.js
+++ b/browser/components/sessionstore/test/browser_pageStyle.js
@@ -61,7 +61,8 @@ add_task(function nested_page_style() {
   gBrowser.removeTab(tab);
 
   let [{state: {pageStyle}}] = JSON.parse(ss.getClosedTabData(window));
-  is(pageStyle, "alternate", "correct pageStyle persisted");
+  let expected = JSON.stringify({children: [{pageStyle: "alternate"}]});
+  is(JSON.stringify(pageStyle), expected, "correct pageStyle persisted");
 });
 
 function getStyleSheets(browser) {
diff --git a/browser/components/sessionstore/test/browser_pageStyle_sample.html b/browser/components/sessionstore/test/browser_pageStyle_sample.html
index dd2758f00894..810054049b34 100644
--- a/browser/components/sessionstore/test/browser_pageStyle_sample.html
+++ b/browser/components/sessionstore/test/browser_pageStyle_sample.html
@@ -11,9 +11,6 @@
   <link href="404.css" title="media_ALL" rel="alternate stylesheet" media=" ALL ">
   <link href="404.css" title="media_screen" rel="alternate stylesheet" media="screen">
   <link href="404.css" title="media_print_screen" rel="alternate stylesheet" media="print,screen">
-  <link href="404.css" title="fail_media_print" rel="alternate stylesheet" media="print">
-  <link href="404.css" title="fail_media_projection" rel="stylesheet" media="projection">
-  <link href="404.css" title="fail_media_invalid" rel="alternate stylesheet" media="hallo">
 </head>
 <body></body>
 </html>

From 15f4944992146bb488135e12fbb7f9de853b5f8b Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 19 Dec 2013 13:18:13 -0500
Subject: [PATCH 15/78] Bug 949434 - Disable browser_first_download_panel.js on
 Linux for frequent failures.

---
 browser/components/downloads/test/browser/browser.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/components/downloads/test/browser/browser.ini b/browser/components/downloads/test/browser/browser.ini
index 11e1c49fda63..36ff421c6b45 100644
--- a/browser/components/downloads/test/browser/browser.ini
+++ b/browser/components/downloads/test/browser/browser.ini
@@ -3,4 +3,5 @@ support-files = head.js
 
 [browser_basic_functionality.js]
 [browser_first_download_panel.js]
+skip-if = os == "linux" # Bug 949434
 [browser_overflow_anchor.js]

From 1580ee5e704d9962736dd05e5b7b9e72ec2355b8 Mon Sep 17 00:00:00 2001
From: Girish Sharma <scrapmachines@gmail.com>
Date: Thu, 19 Dec 2013 22:57:25 +0530
Subject: [PATCH 16/78] Bug 952165 - Tracer icon missing in Windows aero.
 r=fitzgen

---
 browser/themes/windows/jar.mn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index e4e132fb85d9..4e71cec52b43 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -559,8 +559,8 @@ browser.jar:
         skin/classic/aero/browser/devtools/debugger-blackbox.png     (devtools/debugger-blackbox.png)
         skin/classic/aero/browser/devtools/debugger-blackboxMessageEye.png (devtools/debugger-blackboxMessageEye.png)
         skin/classic/aero/browser/devtools/debugger-toggleBreakpoints.png (devtools/debugger-toggleBreakpoints.png)
-        skin/classic/aero/devtools/tracer-icon.png                   (devtools/tracer-icon.png)
-        skin/classic/aero/devtools/tracer-icon@2x.png                (devtools/tracer-icon@2x.png)
+        skin/classic/aero/browser/devtools/tracer-icon.png           (devtools/tracer-icon.png)
+        skin/classic/aero/browser/devtools/tracer-icon@2x.png        (devtools/tracer-icon@2x.png)
         skin/classic/aero/browser/devtools/responsive-se-resizer.png (devtools/responsive-se-resizer.png)
         skin/classic/aero/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
         skin/classic/aero/browser/devtools/responsive-horizontal-resizer.png (devtools/responsive-horizontal-resizer.png)

From d272f6cf5559ab8b6f8ba76f53bbab3d1694c62d Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 19 Dec 2013 10:20:16 -0800
Subject: [PATCH 17/78] Bug 943901 - Add an api to add actions to the text
 selection actionbar. r=mfinkle

---
 mobile/android/chrome/content/SelectionHandler.js | 15 +++++++++++++++
 mobile/android/chrome/content/browser.js          |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mobile/android/chrome/content/SelectionHandler.js b/mobile/android/chrome/content/SelectionHandler.js
index 82dc3a9b4119..12361dd9a862 100644
--- a/mobile/android/chrome/content/SelectionHandler.js
+++ b/mobile/android/chrome/content/SelectionHandler.js
@@ -346,6 +346,21 @@ var SelectionHandler = {
     this._sendMessage("TextSelection:Update");
   },
 
+  addAction: function(action) {
+    if (!action.id)
+      action.id = uuidgen.generateUUID().toString()
+
+    if (this.actions[action.id])
+      throw "Action with id " + action.id + " already added";
+
+    this.actions[action.id] = action;
+    return action.id;
+  },
+
+  removeAction: function(id) {
+    delete this.actions[id];
+  },
+
   actions: {
     SELECT_ALL: {
       label: Strings.browser.GetStringFromName("contextmenu.selectAll"),
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 01b0547579d6..6e6b640b19a4 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6638,15 +6638,15 @@ var SearchEngines = {
                (form.enctype != "text/plain") && (form.enctype != "multipart/form-data");
       }
     };
-    SelectionHandler.actions.SEARCH_ADD = {
-      id: "add_search_action",
+    SelectionHandler.addAction({
+      id: "search_add_action",
       label: Strings.browser.GetStringFromName("contextmenu.addSearchEngine"),
       icon: "drawable://ic_url_bar_search",
       selector: filter,
       action: function(aElement) {
         SearchEngines.addEngine(aElement);
       }
-    }
+    });
   },
 
   uninit: function uninit() {

From b0ffe0bd3472c40fc0f3564f424e7823d9d22c47 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <nfitzgerald@mozilla.com>
Date: Thu, 19 Dec 2013 20:12:12 +0200
Subject: [PATCH 18/78] Bug 951794 - Make the tracers colors easier to read,
 r=vporof

---
 .../devtools/shared/widgets/FastListWidget.js |  4 ---
 browser/themes/linux/devtools/debugger.css    | 30 ++++++++++++++-----
 browser/themes/osx/devtools/debugger.css      | 30 ++++++++++++++-----
 browser/themes/windows/devtools/debugger.css  | 30 ++++++++++++++-----
 4 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/browser/devtools/shared/widgets/FastListWidget.js b/browser/devtools/shared/widgets/FastListWidget.js
index 522eabc6bb83..bfcd74a49e25 100644
--- a/browser/devtools/shared/widgets/FastListWidget.js
+++ b/browser/devtools/shared/widgets/FastListWidget.js
@@ -8,8 +8,6 @@ const { ViewHelpers } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm"
  * Note: this widget should be used in tandem with the WidgetMethods in
  * ViewHelpers.jsm.
  *
- * Note: this widget also reuses SideMenuWidget CSS class names.
- *
  * @param nsIDOMNode aNode
  *        The element associated with the widget.
  */
@@ -21,11 +19,9 @@ const FastListWidget = module.exports = function FastListWidget(aNode) {
 
   // This is a prototype element that each item added to the list clones.
   this._templateElement = this.document.createElement("hbox");
-  this._templateElement.className = "side-menu-widget-item side-menu-widget-item-contents";
 
   // Create an internal scrollbox container.
   this._list = this.document.createElement("scrollbox");
-  this._list.className = "side-menu-widget-container";
   this._list.setAttribute("flex", "1");
   this._list.setAttribute("orient", "vertical");
   this._list.setAttribute("theme", "dark");
diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index c68934f613e4..110f95db42ec 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -123,6 +123,12 @@
   -moz-padding-start: 4px !important;
 }
 
+#tracer-traces > scrollbox {
+  overflow: scroll;
+  /* Hack to enable hardware acceleration */
+  transform: translateZ(0);
+}
+
 /* Tracer dark theme */
 
 .theme-dark #tracer-message {
@@ -138,8 +144,12 @@
   color: #f5f7fa; /* Light foreground text */
 }
 
-.trace-item.selected-matching {
-  background-color: #1d4f73; /* Select highlight blue */
+.theme-dark .trace-item.selected-matching {
+  background-color: rgba(29, 79, 115, .4); /* Select highlight blue at 40% alpha */
+}
+
+.theme-dark .selected > .trace-item {
+  background-color: rgba(29, 79, 115, .75); /* Select highlight blue at 75% alpha */
 }
 
 .theme-dark .trace-call {
@@ -156,11 +166,11 @@
 }
 
 .theme-dark .trace-param {
-  color: #8fa1b2; /* Content text grey  */
+  color: #b8c8d9; /* Content text light */
 }
 
 .theme-dark .trace-syntax {
-  color: #5e88b0; /* highlight blue-grey */
+  color: #8fa1b2; /* Content text grey */
 }
 
 /* Tracer light theme */
@@ -178,8 +188,12 @@
   color: #292e33; /* Dark foreground text */
 }
 
-.trace-item.selected-matching {
-  background-color: #4c9ed9; /* Select highlight blue */
+.theme-light .trace-item.selected-matching {
+  background-color: rgba(76, 158, 217, .4); /* Select highlight blue at 40% alpha */
+}
+
+.theme-light .selected > .trace-item {
+  background-color: rgba(76, 158, 217, .75); /* Select highlight blue at 75% alpha */
 }
 
 .theme-light .trace-call {
@@ -196,11 +210,11 @@
 }
 
 .theme-light .trace-param {
-  color: #8fa1b2; /* Content text grey  */
+  color: #667380; /* Content text dark grey  */
 }
 
 .theme-light .trace-syntax {
-  color: #5f88b0; /* highlight blue-grey */
+  color: #8fa1b2; /* Content text grey */
 }
 
 /* ListWidget items */
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index 545033ab400b..eb330bd4bcbb 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -125,6 +125,12 @@
   -moz-padding-start: 4px !important;
 }
 
+#tracer-traces > scrollbox {
+  overflow: scroll;
+  /* Hack to enable hardware acceleration */
+  transform: translateZ(0);
+}
+
 /* Tracer dark theme */
 
 .theme-dark #tracer-message {
@@ -140,8 +146,12 @@
   color: #f5f7fa; /* Light foreground text */
 }
 
-.trace-item.selected-matching {
-  background-color: #1d4f73; /* Select highlight blue */
+.theme-dark .trace-item.selected-matching {
+  background-color: rgba(29, 79, 115, .4); /* Select highlight blue at 40% alpha */
+}
+
+.theme-dark .selected > .trace-item {
+  background-color: rgba(29, 79, 115, .75); /* Select highlight blue at 75% alpha */
 }
 
 .theme-dark .trace-call {
@@ -158,11 +168,11 @@
 }
 
 .theme-dark .trace-param {
-  color: #8fa1b2; /* Content text grey  */
+  color: #b8c8d9; /* Content text light */
 }
 
 .theme-dark .trace-syntax {
-  color: #5e88b0; /* highlight blue-grey */
+  color: #8fa1b2; /* Content text grey */
 }
 
 /* Tracer light theme */
@@ -180,8 +190,12 @@
   color: #292e33; /* Dark foreground text */
 }
 
-.trace-item.selected-matching {
-  background-color: #4c9ed9; /* Select highlight blue */
+.theme-light .trace-item.selected-matching {
+  background-color: rgba(76, 158, 217, .4); /* Select highlight blue at 40% alpha */
+}
+
+.theme-light .selected > .trace-item {
+  background-color: rgba(76, 158, 217, .75); /* Select highlight blue at 75% alpha */
 }
 
 .theme-light .trace-call {
@@ -198,11 +212,11 @@
 }
 
 .theme-light .trace-param {
-  color: #8fa1b2; /* Content text grey  */
+  color: #667380; /* Content text dark grey  */
 }
 
 .theme-light .trace-syntax {
-  color: #5f88b0; /* highlight blue-grey */
+  color: #8fa1b2; /* Content text grey */
 }
 
 /* ListWidget items */
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index c8d8cb09c3cb..53ba39b06800 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -123,6 +123,12 @@
   -moz-padding-start: 4px !important;
 }
 
+#tracer-traces > scrollbox {
+  overflow: scroll;
+  /* Hack to enable hardware acceleration */
+  transform: translateZ(0);
+}
+
 /* Tracer dark theme */
 
 .theme-dark #tracer-message {
@@ -138,8 +144,12 @@
   color: #f5f7fa; /* Light foreground text */
 }
 
-.trace-item.selected-matching {
-  background-color: #1d4f73; /* Select highlight blue */
+.theme-dark .trace-item.selected-matching {
+  background-color: rgba(29, 79, 115, .4); /* Select highlight blue at 40% alpha */
+}
+
+.theme-dark .selected > .trace-item {
+  background-color: rgba(29, 79, 115, .75); /* Select highlight blue at 75% alpha */
 }
 
 .theme-dark .trace-call {
@@ -156,11 +166,11 @@
 }
 
 .theme-dark .trace-param {
-  color: #8fa1b2; /* Content text grey  */
+  color: #b8c8d9; /* Content text light */
 }
 
 .theme-dark .trace-syntax {
-  color: #5e88b0; /* highlight blue-grey */
+  color: #8fa1b2; /* Content text grey */
 }
 
 /* Tracer light theme */
@@ -178,8 +188,12 @@
   color: #292e33; /* Dark foreground text */
 }
 
-.trace-item.selected-matching {
-  background-color: #4c9ed9; /* Select highlight blue */
+.theme-light .trace-item.selected-matching {
+  background-color: rgba(76, 158, 217, .4); /* Select highlight blue at 40% alpha */
+}
+
+.theme-light .selected > .trace-item {
+  background-color: rgba(76, 158, 217, .75); /* Select highlight blue at 75% alpha */
 }
 
 .theme-light .trace-call {
@@ -196,11 +210,11 @@
 }
 
 .theme-light .trace-param {
-  color: #8fa1b2; /* Content text grey  */
+  color: #667380; /* Content text dark grey  */
 }
 
 .theme-light .trace-syntax {
-  color: #5f88b0; /* highlight blue-grey */
+  color: #8fa1b2; /* Content text grey */
 }
 
 /* ListWidget items */

From 8d4769bf9dc3b7ac9d34a7784a07af9a1d27bf95 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 19 Dec 2013 20:12:22 +0200
Subject: [PATCH 19/78] Bug 952055 - When the Tracer tab is selected, the black
 splitter between the container tabbox and the source editor is invisible,
 r=fitzgen

---
 browser/themes/linux/devtools/debugger.css   | 2 +-
 browser/themes/osx/devtools/debugger.css     | 2 +-
 browser/themes/windows/devtools/debugger.css | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index 110f95db42ec..080c6c1ae789 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -9,7 +9,7 @@
   -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
 }
 
-#sources-and-editor-splitter {
+#sources-pane[selectedIndex="0"] + #sources-and-editor-splitter {
   border-color: transparent;
 }
 
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index eb330bd4bcbb..cd4c89047341 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -11,7 +11,7 @@
   -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
 }
 
-#sources-and-editor-splitter {
+#sources-pane[selectedIndex="0"] + #sources-and-editor-splitter {
   border-color: transparent;
 }
 
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index 53ba39b06800..5f7dd879b501 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -9,7 +9,7 @@
   -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
 }
 
-#sources-and-editor-splitter {
+#sources-pane[selectedIndex="0"] + #sources-and-editor-splitter {
   border-color: transparent;
 }
 

From c5dc4fe2f893eaf7612b15c49c85bc59bba75766 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 19 Dec 2013 20:12:25 +0200
Subject: [PATCH 20/78] Bug 952047 - The Tracer view should get its background
 color from the theme body, r=fitzgen

---
 browser/devtools/shared/widgets/FastListWidget.js |  2 +-
 browser/themes/linux/devtools/debugger.css        | 10 ----------
 browser/themes/osx/devtools/debugger.css          | 10 ----------
 browser/themes/windows/devtools/debugger.css      | 10 ----------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/browser/devtools/shared/widgets/FastListWidget.js b/browser/devtools/shared/widgets/FastListWidget.js
index bfcd74a49e25..96ca4545405f 100644
--- a/browser/devtools/shared/widgets/FastListWidget.js
+++ b/browser/devtools/shared/widgets/FastListWidget.js
@@ -22,9 +22,9 @@ const FastListWidget = module.exports = function FastListWidget(aNode) {
 
   // Create an internal scrollbox container.
   this._list = this.document.createElement("scrollbox");
+  this._list.className = "fast-list-widget-container theme-body";
   this._list.setAttribute("flex", "1");
   this._list.setAttribute("orient", "vertical");
-  this._list.setAttribute("theme", "dark");
   this._list.setAttribute("tabindex", "0");
   this._list.addEventListener("keypress", e => this.emit("keyPress", e), false);
   this._list.addEventListener("mousedown", e => this.emit("mousePress", e), false);
diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index 080c6c1ae789..fae00c12313c 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -133,11 +133,6 @@
 
 .theme-dark #tracer-message {
   color: #f5f7fa; /* Light foreground text */
-  background: url(background-noise-toolbar.png) #181d20; /* Content background sidebar */
-}
-
-.theme-dark #tracer-traces > scrollbox {
-  background-color: #181d20 !important; /* Content background sidebar */
 }
 
 .theme-dark .trace-item {
@@ -177,11 +172,6 @@
 
 .theme-light #tracer-message {
   color: #292e33; /* Dark foreground text */
-  background: url(background-noise-toolbar.png) #f7f7f7; /* Content background sidebar */
-}
-
-.theme-light #tracer-traces > scrollbox {
-  background-color: #f7f7f7 !important; /* Content background sidebar */
 }
 
 .theme-light .trace-item {
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index cd4c89047341..0ae86f7c0b4e 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -135,11 +135,6 @@
 
 .theme-dark #tracer-message {
   color: #f5f7fa; /* Light foreground text */
-  background: url(background-noise-toolbar.png) #181d20; /* Content background sidebar */
-}
-
-.theme-dark #tracer-traces > scrollbox {
-  background-color: #181d20 !important; /* Content background sidebar */
 }
 
 .theme-dark .trace-item {
@@ -179,11 +174,6 @@
 
 .theme-light #tracer-message {
   color: #292e33; /* Dark foreground text */
-  background: url(background-noise-toolbar.png) #f7f7f7; /* Content background sidebar */
-}
-
-.theme-light #tracer-traces > scrollbox {
-  background-color: #f7f7f7 !important; /* Content background sidebar */
 }
 
 .theme-light .trace-item {
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index 5f7dd879b501..d1331b010b39 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -133,11 +133,6 @@
 
 .theme-dark #tracer-message {
   color: #f5f7fa; /* Light foreground text */
-  background: url(background-noise-toolbar.png) #181d20; /* Content background sidebar */
-}
-
-.theme-dark #tracer-traces > scrollbox {
-  background-color: #181d20 !important; /* Content background sidebar */
 }
 
 .theme-dark .trace-item {
@@ -177,11 +172,6 @@
 
 .theme-light #tracer-message {
   color: #292e33; /* Dark foreground text */
-  background: url(background-noise-toolbar.png) #f7f7f7; /* Content background sidebar */
-}
-
-.theme-light #tracer-traces > scrollbox {
-  background-color: #f7f7f7 !important; /* Content background sidebar */
 }
 
 .theme-light .trace-item {

From 714bc2acfcb6d0dd8a7a8d8668322c23b1d8d27f Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 19 Dec 2013 20:12:58 +0200
Subject: [PATCH 21/78] Bug 952064 - The tracer search box doesn't need a
 min-width, because it flexes, r=fitzgen

---
 browser/themes/linux/devtools/debugger.css   | 4 ----
 browser/themes/osx/devtools/debugger.css     | 4 ----
 browser/themes/windows/devtools/debugger.css | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index fae00c12313c..37cd936a7a75 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -110,10 +110,6 @@
   min-width: 22px !important;
 }
 
-#tracer-search {
-  min-width: 72px !important;
-}
-
 #tracer-message {
   /* Prevent the container deck from aquiring the height from this message. */
   min-height: 1px;
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index 0ae86f7c0b4e..75394596de72 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -112,10 +112,6 @@
   min-width: 22px !important;
 }
 
-#tracer-search {
-  min-width: 72px !important;
-}
-
 #tracer-message {
   /* Prevent the container deck from aquiring the height from this message. */
   min-height: 1px;
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index d1331b010b39..0f8d879342e1 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -110,10 +110,6 @@
   min-width: 22px !important;
 }
 
-#tracer-search {
-  min-width: 72px !important;
-}
-
 #tracer-message {
   /* Prevent the container deck from aquiring the height from this message. */
   min-height: 1px;

From 2a2f19eff9634de6d2ca14d3c1f90a8daaf50379 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 17 Dec 2013 21:11:59 -0500
Subject: [PATCH 22/78] Bug 941002 - [Australis] Add Developer Tools button to
 menu default set. r=Unfocused

---
 .../customizableui/src/CustomizableUI.jsm     |  3 +-
 ...er_876944_customize_mode_create_destroy.js |  4 +-
 .../test/browser_878452_drag_to_panel.js      | 12 +--
 ...owser_880382_drag_wide_widgets_in_panel.js | 95 +++++++++++--------
 .../browser_890140_orphaned_placeholders.js   | 54 ++++++-----
 5 files changed, 95 insertions(+), 73 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 062a543e0051..6f086d9cd162 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -150,7 +150,8 @@ let CustomizableUIInternal = {
       "fullscreen-button",
       "find-button",
       "preferences-button",
-      "add-ons-button"
+      "add-ons-button",
+      "developer-button",
     ];
 
     if (gPalette.has("switch-to-metro-button")) {
diff --git a/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js b/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
index 8002f9d81276..6458db7360a2 100644
--- a/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
+++ b/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
@@ -27,7 +27,7 @@ add_task(function testWrapUnwrap() {
 // Creating and destroying a widget should correctly deal with panel placeholders
 add_task(function testPanelPlaceholders() {
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 2 : 3, "The number of placeholders should be correct.");
+  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 1 : 2, "The number of placeholders should be correct.");
   CustomizableUI.createWidget({id: kTestWidget2, label: 'Pretty label', tooltiptext: 'Pretty tooltip', defaultArea: CustomizableUI.AREA_PANEL});
   let elem = document.getElementById(kTestWidget2);
   let wrapper = document.getElementById("wrapper-" + kTestWidget2);
@@ -35,7 +35,7 @@ add_task(function testPanelPlaceholders() {
   ok(wrapper, "There should be a wrapper");
   is(wrapper.firstChild.id, kTestWidget2, "Wrapper should have test widget");
   is(wrapper.parentNode, panel, "Wrapper should be in panel");
-  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 1 : 2, "The number of placeholders should be correct.");
+  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 3 : 1, "The number of placeholders should be correct.");
   CustomizableUI.destroyWidget(kTestWidget2);
   wrapper = document.getElementById("wrapper-" + kTestWidget2);
   ok(!wrapper, "There should be a wrapper");
diff --git a/browser/components/customizableui/test/browser_878452_drag_to_panel.js b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
index 114bf1102301..d9bbe0aad648 100644
--- a/browser/components/customizableui/test/browser_878452_drag_to_panel.js
+++ b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
@@ -9,13 +9,13 @@ Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
 // Dragging an item from the palette to another button in the panel should work.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("feed-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
   let lastButtonIndex = placements.length - 1;
   let lastButton = placements[lastButtonIndex];
-  let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["developer-button", lastButton]);
+  let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["feed-button", lastButton]);
   let lastButtonNode = document.getElementById(lastButton);
   simulateItemDrag(btn, lastButtonNode);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
@@ -28,11 +28,11 @@ add_task(function() {
 // Dragging an item from the palette to the panel itself should also work.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("feed-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.concat(["developer-button"]);
+  let placementsAfterAppend = placements.concat(["feed-button"]);
   simulateItemDrag(btn, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -48,12 +48,12 @@ add_task(function() {
     CustomizableUI.removeWidgetFromArea(widgetIds.shift());
   }
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("feed-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
 
   assertAreaPlacements(panel.id, []);
 
-  let placementsAfterAppend = ["developer-button"];
+  let placementsAfterAppend = ["feed-button"];
   simulateItemDrag(btn, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
diff --git a/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js b/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
index fb8a7d20c340..f0c4f5701d2b 100644
--- a/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
+++ b/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
@@ -22,7 +22,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, printButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -47,7 +48,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -70,7 +72,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -92,7 +95,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, historyPanelMenu);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -118,7 +122,8 @@ add_task(function() {
                              "zoom-controls",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, preferencesButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -131,10 +136,10 @@ add_task(function() {
 // Dragging an item from the palette to before the zoom-controls should move it and two other buttons before the zoom controls.
 add_task(function() {
   yield startCustomizing();
-  let developerButton = document.getElementById("developer-button");
+  let openFileButton = document.getElementById("open-file-button");
   let zoomControls = document.getElementById("zoom-controls");
   let placementsAfterInsert = ["edit-controls",
-                               "developer-button",
+                               "open-file-button",
                                "new-window-button",
                                "privatebrowsing-button",
                                "zoom-controls",
@@ -144,9 +149,10 @@ add_task(function() {
                                "fullscreen-button",
                                "find-button",
                                "preferences-button",
-                               "add-ons-button"];
+                               "add-ons-button",
+                               "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterInsert);
-  simulateItemDrag(developerButton, zoomControls);
+  simulateItemDrag(openFileButton, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   let palette = document.getElementById("customization-palette");
@@ -157,9 +163,9 @@ add_task(function() {
      "feed-button should be a child of wrapper-feed-button");
   is(feedWrapper.getAttribute("place"), "palette",
      "The feed-button wrapper should have it's place set to 'palette'");
-  simulateItemDrag(developerButton, palette);
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "The developer-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(openFileButton, palette);
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "The open-file-button should be wrapped by a toolbarpaletteitem");
   let newWindowButton = document.getElementById("new-window-button");
   simulateItemDrag(zoomControls, newWindowButton);
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
@@ -169,9 +175,9 @@ add_task(function() {
 // should move it and two other buttons before the edit and zoom controls.
 add_task(function() {
   yield startCustomizing();
-  let developerButton = document.getElementById("developer-button");
+  let openFileButton = document.getElementById("open-file-button");
   let editControls = document.getElementById("edit-controls");
-  let placementsAfterInsert = ["developer-button",
+  let placementsAfterInsert = ["open-file-button",
                                "new-window-button",
                                "privatebrowsing-button",
                                "edit-controls",
@@ -182,9 +188,10 @@ add_task(function() {
                                "fullscreen-button",
                                "find-button",
                                "preferences-button",
-                               "add-ons-button"];
+                               "add-ons-button",
+                               "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterInsert);
-  simulateItemDrag(developerButton, editControls);
+  simulateItemDrag(openFileButton, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   let palette = document.getElementById("customization-palette");
@@ -195,9 +202,9 @@ add_task(function() {
      "feed-button should be a child of wrapper-feed-button");
   is(feedWrapper.getAttribute("place"), "palette",
      "The feed-button wrapper should have it's place set to 'palette'");
-  simulateItemDrag(developerButton, palette);
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "The developer-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(openFileButton, palette);
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "The open-file-button should be wrapped by a toolbarpaletteitem");
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
 
@@ -217,7 +224,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -240,7 +248,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -266,7 +275,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, privateBrowsingButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -292,7 +302,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -317,7 +328,8 @@ add_task(function() {
                              "find-button",
                              "preferences-button",
                              "add-ons-button",
-                             "edit-controls"];
+                             "edit-controls",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -341,7 +353,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   let paletteChildElementCount = palette.childElementCount;
   simulateItemDrag(editControls, palette);
@@ -365,7 +378,7 @@ add_task(function() {
   yield startCustomizing();
   let editControls = document.getElementById("edit-controls");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  let numPlaceholders = isInWin8() ? 2 : 3;
+  let numPlaceholders = isInWin8() ? 1 : 2;
   for (let i = 0; i < numPlaceholders; i++) {
     // NB: We can't just iterate over all of the placeholders
     // because each drag-drop action recreates them.
@@ -380,7 +393,8 @@ add_task(function() {
                                "find-button",
                                "preferences-button",
                                "add-ons-button",
-                               "edit-controls"];
+                               "edit-controls",
+                               "developer-button"];
     addSwitchToMetroButtonInWindows8(placementsAfterMove);
     simulateItemDrag(editControls, placeholder);
     assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -390,15 +404,15 @@ add_task(function() {
   }
 });
 
-// Dragging the developer-button back on to itself should work.
+// Dragging the open-file-button back on to itself should work.
 add_task(function() {
   yield startCustomizing();
-  let developerButton = document.getElementById("developer-button");
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "developer-button should be wrapped by a toolbarpaletteitem");
-  simulateItemDrag(developerButton, developerButton);
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "developer-button should be wrapped by a toolbarpaletteitem");
+  let openFileButton = document.getElementById("open-file-button");
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "open-file-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(openFileButton, openFileButton);
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "open-file-button should be wrapped by a toolbarpaletteitem");
   let editControls = document.getElementById("edit-controls");
   is(editControls.parentNode.tagName, "toolbarpaletteitem",
      "edit-controls should be wrapped by a toolbarpaletteitem");
@@ -421,16 +435,19 @@ add_task(function() {
                              "find-button",
                              "preferences-button",
                              "add-ons-button",
-                             "edit-controls"];
+                             "edit-controls",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, target);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let itemToDrag = "sync-button";
   let button = document.getElementById(itemToDrag);
-  if (!isInWin8()) {
-    placementsAfterMove.push(itemToDrag);
-  } else {
-    placementsAfterMove.splice(11, 0, itemToDrag);
+  placementsAfterMove.splice(11, 0, itemToDrag);
+  if (isInWin8()) {
+    placementsAfterMove[10] = placementsAfterMove[11];
+    placementsAfterMove[11] = placementsAfterMove[12];
+    placementsAfterMove[12] = placementsAfterMove[13];
+    placementsAfterMove[13] = "edit-controls";
   }
   simulateItemDrag(button, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
diff --git a/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js b/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
index 9bdf75d39258..0c873d0b60e5 100644
--- a/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
+++ b/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
@@ -9,13 +9,13 @@ Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
 // One orphaned item should have two placeholders next to it.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("open-file-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  if (!isInWin8()) {
-    placements = placements.concat(["developer-button"]);
-    simulateItemDrag(btn, panel);
+  if (isInWin8()) {
+    CustomizableUI.removeWidgetFromArea("switch-to-metro-button");
+    placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
     ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   } else {
     ok(CustomizableUI.inDefaultState, "Should be in default state.");
@@ -28,9 +28,8 @@ add_task(function() {
   yield startCustomizing();
   is(getVisiblePlaceholderCount(panel), 2, "Should only have 2 visible placeholders after re-entering");
 
-  if (!isInWin8()) {
-    let palette = document.getElementById("customization-palette");
-    simulateItemDrag(btn, palette);
+  if (isInWin8()) {
+    CustomizableUI.addWidgetToArea("switch-to-metro-button", CustomizableUI.AREA_PANEL);
   }
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
@@ -38,32 +37,30 @@ add_task(function() {
 // Two orphaned items should have one placeholder next to them (case 1).
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("open-file-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.concat(["developer-button"]);
-  simulateItemDrag(btn, panel);
+  let placementsAfterAppend = placements;
 
   if (!isInWin8()) {
-    placementsAfterAppend = placementsAfterAppend.concat(["sync-button"]);
-    btn = document.getElementById("sync-button");
+    placementsAfterAppend = placements.concat(["open-file-button"]);
     simulateItemDrag(btn, panel);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
-  ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders before exiting");
+  is(CustomizableUI.inDefaultState, isInWin8, "Should only be in default state if on Win8");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
 
   yield endCustomizing();
   yield startCustomizing();
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders after re-entering");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder after re-entering");
 
   let palette = document.getElementById("customization-palette");
   simulateItemDrag(btn, palette);
 
   if (!isInWin8()) {
-    btn = document.getElementById("developer-button");
+    btn = document.getElementById("open-file-button");
     simulateItemDrag(btn, palette);
   }
   ok(CustomizableUI.inDefaultState, "Should be in default state again."); 
@@ -73,31 +70,34 @@ add_task(function() {
 add_task(function() {
   yield startCustomizing();
   let btn = document.getElementById("add-ons-button");
-  let btn2 = document.getElementById("switch-to-metro-button");
+  let btn2 = document.getElementById("developer-button");
+  let btn3 = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.filter(p => p != btn.id);
+  let placementsAfterAppend = placements.filter(p => p != btn.id && p != btn2.id);
   simulateItemDrag(btn, palette);
+  simulateItemDrag(btn2, palette);
 
   if (isInWin8()) {
-    placementsAfterAppend = placementsAfterAppend.filter(p => p != btn2.id);
-    simulateItemDrag(btn2, palette);
+    placementsAfterAppend = placementsAfterAppend.filter(p => p != btn3.id);
+    simulateItemDrag(btn3, palette);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders before exiting");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
 
   yield endCustomizing();
   yield startCustomizing();
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders after re-entering");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder after re-entering");
 
   simulateItemDrag(btn, panel);
+  simulateItemDrag(btn2, panel);
 
   if (isInWin8()) {
-    simulateItemDrag(btn2, panel);
+    simulateItemDrag(btn3, panel);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placements);
@@ -108,11 +108,14 @@ add_task(function() {
 add_task(function() {
   yield startCustomizing();
   let btn = document.getElementById("edit-controls");
+  let developerButton = document.getElementById("developer-button");
   let metroBtn = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
+  placements.pop();
+  simulateItemDrag(developerButton, palette);
   if (isInWin8()) {
     // Remove switch-to-metro-button
     placements.pop();
@@ -129,6 +132,7 @@ add_task(function() {
   yield startCustomizing();
   is(getVisiblePlaceholderCount(panel), 3, "Should have 3 visible placeholders after re-entering");
 
+  simulateItemDrag(developerButton, panel);
   if (isInWin8()) {
     simulateItemDrag(metroBtn, panel);
   }
@@ -137,10 +141,10 @@ add_task(function() {
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
 
-// The default placements should have three placeholders at the bottom (or 2 in win8).
+// The default placements should have two placeholders at the bottom (or 1 in win8).
 add_task(function() {
   yield startCustomizing();
-  let numPlaceholders = isInWin8() ? 2 : 3;
+  let numPlaceholders = isInWin8() ? 1 : 2;
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   ok(CustomizableUI.inDefaultState, "Should be in default state.");
   is(getVisiblePlaceholderCount(panel), numPlaceholders, "Should have " + numPlaceholders + " visible placeholders before exiting");

From cd43cc80825e599c2801810936b1495723e54a2e Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 19 Dec 2013 13:29:14 -0500
Subject: [PATCH 23/78] Backed out changeset 77e83106be39 (bug 941002)

---
 .../customizableui/src/CustomizableUI.jsm     |  3 +-
 ...er_876944_customize_mode_create_destroy.js |  4 +-
 .../test/browser_878452_drag_to_panel.js      | 12 +--
 ...owser_880382_drag_wide_widgets_in_panel.js | 95 ++++++++-----------
 .../browser_890140_orphaned_placeholders.js   | 54 +++++------
 5 files changed, 73 insertions(+), 95 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 6f086d9cd162..062a543e0051 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -150,8 +150,7 @@ let CustomizableUIInternal = {
       "fullscreen-button",
       "find-button",
       "preferences-button",
-      "add-ons-button",
-      "developer-button",
+      "add-ons-button"
     ];
 
     if (gPalette.has("switch-to-metro-button")) {
diff --git a/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js b/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
index 6458db7360a2..8002f9d81276 100644
--- a/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
+++ b/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
@@ -27,7 +27,7 @@ add_task(function testWrapUnwrap() {
 // Creating and destroying a widget should correctly deal with panel placeholders
 add_task(function testPanelPlaceholders() {
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 1 : 2, "The number of placeholders should be correct.");
+  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 2 : 3, "The number of placeholders should be correct.");
   CustomizableUI.createWidget({id: kTestWidget2, label: 'Pretty label', tooltiptext: 'Pretty tooltip', defaultArea: CustomizableUI.AREA_PANEL});
   let elem = document.getElementById(kTestWidget2);
   let wrapper = document.getElementById("wrapper-" + kTestWidget2);
@@ -35,7 +35,7 @@ add_task(function testPanelPlaceholders() {
   ok(wrapper, "There should be a wrapper");
   is(wrapper.firstChild.id, kTestWidget2, "Wrapper should have test widget");
   is(wrapper.parentNode, panel, "Wrapper should be in panel");
-  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 3 : 1, "The number of placeholders should be correct.");
+  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 1 : 2, "The number of placeholders should be correct.");
   CustomizableUI.destroyWidget(kTestWidget2);
   wrapper = document.getElementById("wrapper-" + kTestWidget2);
   ok(!wrapper, "There should be a wrapper");
diff --git a/browser/components/customizableui/test/browser_878452_drag_to_panel.js b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
index d9bbe0aad648..114bf1102301 100644
--- a/browser/components/customizableui/test/browser_878452_drag_to_panel.js
+++ b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
@@ -9,13 +9,13 @@ Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
 // Dragging an item from the palette to another button in the panel should work.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("feed-button");
+  let btn = document.getElementById("developer-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
   let lastButtonIndex = placements.length - 1;
   let lastButton = placements[lastButtonIndex];
-  let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["feed-button", lastButton]);
+  let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["developer-button", lastButton]);
   let lastButtonNode = document.getElementById(lastButton);
   simulateItemDrag(btn, lastButtonNode);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
@@ -28,11 +28,11 @@ add_task(function() {
 // Dragging an item from the palette to the panel itself should also work.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("feed-button");
+  let btn = document.getElementById("developer-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.concat(["feed-button"]);
+  let placementsAfterAppend = placements.concat(["developer-button"]);
   simulateItemDrag(btn, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -48,12 +48,12 @@ add_task(function() {
     CustomizableUI.removeWidgetFromArea(widgetIds.shift());
   }
   yield startCustomizing();
-  let btn = document.getElementById("feed-button");
+  let btn = document.getElementById("developer-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
 
   assertAreaPlacements(panel.id, []);
 
-  let placementsAfterAppend = ["feed-button"];
+  let placementsAfterAppend = ["developer-button"];
   simulateItemDrag(btn, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
diff --git a/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js b/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
index f0c4f5701d2b..fb8a7d20c340 100644
--- a/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
+++ b/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
@@ -22,8 +22,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, printButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -48,8 +47,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -72,8 +70,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -95,8 +92,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, historyPanelMenu);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -122,8 +118,7 @@ add_task(function() {
                              "zoom-controls",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, preferencesButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -136,10 +131,10 @@ add_task(function() {
 // Dragging an item from the palette to before the zoom-controls should move it and two other buttons before the zoom controls.
 add_task(function() {
   yield startCustomizing();
-  let openFileButton = document.getElementById("open-file-button");
+  let developerButton = document.getElementById("developer-button");
   let zoomControls = document.getElementById("zoom-controls");
   let placementsAfterInsert = ["edit-controls",
-                               "open-file-button",
+                               "developer-button",
                                "new-window-button",
                                "privatebrowsing-button",
                                "zoom-controls",
@@ -149,10 +144,9 @@ add_task(function() {
                                "fullscreen-button",
                                "find-button",
                                "preferences-button",
-                               "add-ons-button",
-                               "developer-button"];
+                               "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterInsert);
-  simulateItemDrag(openFileButton, zoomControls);
+  simulateItemDrag(developerButton, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   let palette = document.getElementById("customization-palette");
@@ -163,9 +157,9 @@ add_task(function() {
      "feed-button should be a child of wrapper-feed-button");
   is(feedWrapper.getAttribute("place"), "palette",
      "The feed-button wrapper should have it's place set to 'palette'");
-  simulateItemDrag(openFileButton, palette);
-  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
-     "The open-file-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(developerButton, palette);
+  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
+     "The developer-button should be wrapped by a toolbarpaletteitem");
   let newWindowButton = document.getElementById("new-window-button");
   simulateItemDrag(zoomControls, newWindowButton);
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
@@ -175,9 +169,9 @@ add_task(function() {
 // should move it and two other buttons before the edit and zoom controls.
 add_task(function() {
   yield startCustomizing();
-  let openFileButton = document.getElementById("open-file-button");
+  let developerButton = document.getElementById("developer-button");
   let editControls = document.getElementById("edit-controls");
-  let placementsAfterInsert = ["open-file-button",
+  let placementsAfterInsert = ["developer-button",
                                "new-window-button",
                                "privatebrowsing-button",
                                "edit-controls",
@@ -188,10 +182,9 @@ add_task(function() {
                                "fullscreen-button",
                                "find-button",
                                "preferences-button",
-                               "add-ons-button",
-                               "developer-button"];
+                               "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterInsert);
-  simulateItemDrag(openFileButton, editControls);
+  simulateItemDrag(developerButton, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   let palette = document.getElementById("customization-palette");
@@ -202,9 +195,9 @@ add_task(function() {
      "feed-button should be a child of wrapper-feed-button");
   is(feedWrapper.getAttribute("place"), "palette",
      "The feed-button wrapper should have it's place set to 'palette'");
-  simulateItemDrag(openFileButton, palette);
-  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
-     "The open-file-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(developerButton, palette);
+  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
+     "The developer-button should be wrapped by a toolbarpaletteitem");
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
 
@@ -224,8 +217,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -248,8 +240,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -275,8 +266,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, privateBrowsingButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -302,8 +292,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -328,8 +317,7 @@ add_task(function() {
                              "find-button",
                              "preferences-button",
                              "add-ons-button",
-                             "edit-controls",
-                             "developer-button"];
+                             "edit-controls"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -353,8 +341,7 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button",
-                             "developer-button"];
+                             "add-ons-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   let paletteChildElementCount = palette.childElementCount;
   simulateItemDrag(editControls, palette);
@@ -378,7 +365,7 @@ add_task(function() {
   yield startCustomizing();
   let editControls = document.getElementById("edit-controls");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  let numPlaceholders = isInWin8() ? 1 : 2;
+  let numPlaceholders = isInWin8() ? 2 : 3;
   for (let i = 0; i < numPlaceholders; i++) {
     // NB: We can't just iterate over all of the placeholders
     // because each drag-drop action recreates them.
@@ -393,8 +380,7 @@ add_task(function() {
                                "find-button",
                                "preferences-button",
                                "add-ons-button",
-                               "edit-controls",
-                               "developer-button"];
+                               "edit-controls"];
     addSwitchToMetroButtonInWindows8(placementsAfterMove);
     simulateItemDrag(editControls, placeholder);
     assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -404,15 +390,15 @@ add_task(function() {
   }
 });
 
-// Dragging the open-file-button back on to itself should work.
+// Dragging the developer-button back on to itself should work.
 add_task(function() {
   yield startCustomizing();
-  let openFileButton = document.getElementById("open-file-button");
-  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
-     "open-file-button should be wrapped by a toolbarpaletteitem");
-  simulateItemDrag(openFileButton, openFileButton);
-  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
-     "open-file-button should be wrapped by a toolbarpaletteitem");
+  let developerButton = document.getElementById("developer-button");
+  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
+     "developer-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(developerButton, developerButton);
+  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
+     "developer-button should be wrapped by a toolbarpaletteitem");
   let editControls = document.getElementById("edit-controls");
   is(editControls.parentNode.tagName, "toolbarpaletteitem",
      "edit-controls should be wrapped by a toolbarpaletteitem");
@@ -435,19 +421,16 @@ add_task(function() {
                              "find-button",
                              "preferences-button",
                              "add-ons-button",
-                             "edit-controls",
-                             "developer-button"];
+                             "edit-controls"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, target);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let itemToDrag = "sync-button";
   let button = document.getElementById(itemToDrag);
-  placementsAfterMove.splice(11, 0, itemToDrag);
-  if (isInWin8()) {
-    placementsAfterMove[10] = placementsAfterMove[11];
-    placementsAfterMove[11] = placementsAfterMove[12];
-    placementsAfterMove[12] = placementsAfterMove[13];
-    placementsAfterMove[13] = "edit-controls";
+  if (!isInWin8()) {
+    placementsAfterMove.push(itemToDrag);
+  } else {
+    placementsAfterMove.splice(11, 0, itemToDrag);
   }
   simulateItemDrag(button, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
diff --git a/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js b/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
index 0c873d0b60e5..9bdf75d39258 100644
--- a/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
+++ b/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
@@ -9,13 +9,13 @@ Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
 // One orphaned item should have two placeholders next to it.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("open-file-button");
+  let btn = document.getElementById("developer-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  if (isInWin8()) {
-    CustomizableUI.removeWidgetFromArea("switch-to-metro-button");
-    placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
+  if (!isInWin8()) {
+    placements = placements.concat(["developer-button"]);
+    simulateItemDrag(btn, panel);
     ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   } else {
     ok(CustomizableUI.inDefaultState, "Should be in default state.");
@@ -28,8 +28,9 @@ add_task(function() {
   yield startCustomizing();
   is(getVisiblePlaceholderCount(panel), 2, "Should only have 2 visible placeholders after re-entering");
 
-  if (isInWin8()) {
-    CustomizableUI.addWidgetToArea("switch-to-metro-button", CustomizableUI.AREA_PANEL);
+  if (!isInWin8()) {
+    let palette = document.getElementById("customization-palette");
+    simulateItemDrag(btn, palette);
   }
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
@@ -37,30 +38,32 @@ add_task(function() {
 // Two orphaned items should have one placeholder next to them (case 1).
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("open-file-button");
+  let btn = document.getElementById("developer-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements;
+  let placementsAfterAppend = placements.concat(["developer-button"]);
+  simulateItemDrag(btn, panel);
 
   if (!isInWin8()) {
-    placementsAfterAppend = placements.concat(["open-file-button"]);
+    placementsAfterAppend = placementsAfterAppend.concat(["sync-button"]);
+    btn = document.getElementById("sync-button");
     simulateItemDrag(btn, panel);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
-  is(CustomizableUI.inDefaultState, isInWin8, "Should only be in default state if on Win8");
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
+  ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders before exiting");
 
   yield endCustomizing();
   yield startCustomizing();
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder after re-entering");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders after re-entering");
 
   let palette = document.getElementById("customization-palette");
   simulateItemDrag(btn, palette);
 
   if (!isInWin8()) {
-    btn = document.getElementById("open-file-button");
+    btn = document.getElementById("developer-button");
     simulateItemDrag(btn, palette);
   }
   ok(CustomizableUI.inDefaultState, "Should be in default state again."); 
@@ -70,34 +73,31 @@ add_task(function() {
 add_task(function() {
   yield startCustomizing();
   let btn = document.getElementById("add-ons-button");
-  let btn2 = document.getElementById("developer-button");
-  let btn3 = document.getElementById("switch-to-metro-button");
+  let btn2 = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.filter(p => p != btn.id && p != btn2.id);
+  let placementsAfterAppend = placements.filter(p => p != btn.id);
   simulateItemDrag(btn, palette);
-  simulateItemDrag(btn2, palette);
 
   if (isInWin8()) {
-    placementsAfterAppend = placementsAfterAppend.filter(p => p != btn3.id);
-    simulateItemDrag(btn3, palette);
+    placementsAfterAppend = placementsAfterAppend.filter(p => p != btn2.id);
+    simulateItemDrag(btn2, palette);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders before exiting");
 
   yield endCustomizing();
   yield startCustomizing();
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder after re-entering");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders after re-entering");
 
   simulateItemDrag(btn, panel);
-  simulateItemDrag(btn2, panel);
 
   if (isInWin8()) {
-    simulateItemDrag(btn3, panel);
+    simulateItemDrag(btn2, panel);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placements);
@@ -108,14 +108,11 @@ add_task(function() {
 add_task(function() {
   yield startCustomizing();
   let btn = document.getElementById("edit-controls");
-  let developerButton = document.getElementById("developer-button");
   let metroBtn = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  placements.pop();
-  simulateItemDrag(developerButton, palette);
   if (isInWin8()) {
     // Remove switch-to-metro-button
     placements.pop();
@@ -132,7 +129,6 @@ add_task(function() {
   yield startCustomizing();
   is(getVisiblePlaceholderCount(panel), 3, "Should have 3 visible placeholders after re-entering");
 
-  simulateItemDrag(developerButton, panel);
   if (isInWin8()) {
     simulateItemDrag(metroBtn, panel);
   }
@@ -141,10 +137,10 @@ add_task(function() {
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
 
-// The default placements should have two placeholders at the bottom (or 1 in win8).
+// The default placements should have three placeholders at the bottom (or 2 in win8).
 add_task(function() {
   yield startCustomizing();
-  let numPlaceholders = isInWin8() ? 1 : 2;
+  let numPlaceholders = isInWin8() ? 2 : 3;
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   ok(CustomizableUI.inDefaultState, "Should be in default state.");
   is(getVisiblePlaceholderCount(panel), numPlaceholders, "Should have " + numPlaceholders + " visible placeholders before exiting");

From 400f6251f7f290c2e6f5370bb582d00f3a01a4d5 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Thu, 19 Dec 2013 10:41:34 -0800
Subject: [PATCH 24/78] Bug 951874 - self-hosted functions shouldn't appear in
 the Tracer; r=vporof

---
 toolkit/devtools/server/actors/tracer.js      |  10 +-
 .../server/tests/unit/test_trace_actor-09.js  | 102 ++++++++++++++++++
 .../devtools/server/tests/unit/xpcshell.ini   |   1 +
 3 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 toolkit/devtools/server/tests/unit/test_trace_actor-09.js

diff --git a/toolkit/devtools/server/actors/tracer.js b/toolkit/devtools/server/actors/tracer.js
index f3f8a1c48559..44906de38b71 100644
--- a/toolkit/devtools/server/actors/tracer.js
+++ b/toolkit/devtools/server/actors/tracer.js
@@ -24,7 +24,11 @@ if (!Object.getOwnPropertyDescriptor(Debugger.Frame.prototype, "depth")) {
         if (!this.older) {
           this._depth = 0;
         } else {
-          this._depth = 1 + this.older.depth;
+          // Hide depth from self-hosted frames.
+          const increment = this.script && this.script.url == "self-hosted"
+            ? 0
+            : 1;
+          this._depth = increment + this.older.depth;
         }
       }
 
@@ -315,6 +319,10 @@ TraceActor.prototype = {
    *        The stack frame that was entered.
    */
   onEnterFrame: function(aFrame) {
+    if (aFrame.script && aFrame.script.url == "self-hosted") {
+      return;
+    }
+
     let packet = {
       type: "enteredFrame",
       sequence: this._sequence++
diff --git a/toolkit/devtools/server/tests/unit/test_trace_actor-09.js b/toolkit/devtools/server/tests/unit/test_trace_actor-09.js
new file mode 100644
index 000000000000..8df5db8c4132
--- /dev/null
+++ b/toolkit/devtools/server/tests/unit/test_trace_actor-09.js
@@ -0,0 +1,102 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that self-hosted functions aren't traced and don't add depth.
+ */
+
+let { defer } = devtools.require("sdk/core/promise");
+
+var gDebuggee;
+var gClient;
+var gTraceClient;
+
+function run_test()
+{
+  initTestTracerServer();
+  gDebuggee = addTestGlobal("test-tracer-actor");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function() {
+    attachTestTab(gClient, "test-tracer-actor", function(aResponse, aTabClient) {
+      gClient.attachTracer(aResponse.traceActor, function(aResponse, aTraceClient) {
+        gTraceClient = aTraceClient;
+        test_frame_depths();
+      });
+    });
+  });
+  do_test_pending();
+}
+
+function test_frame_depths()
+{
+  const tracesStopped = defer();
+  gClient.addListener("traces", (aEvent, { traces }) => {
+    for (let t of traces) {
+      check_trace(t);
+    }
+    tracesStopped.resolve();
+  });
+
+  start_trace()
+    .then(eval_code)
+    .then(() => tracesStopped.promise)
+    .then(stop_trace)
+    .then(function() {
+      finishClient(gClient);
+    }).then(null, error => {
+      do_check_true(false, "Should not get an error, got: " + DevToolsUtils.safeErrorString(error));
+    });
+}
+
+function start_trace()
+{
+  let deferred = defer();
+  gTraceClient.startTrace(["depth", "name", "location"], null, function() { deferred.resolve(); });
+  return deferred.promise;
+}
+
+function eval_code()
+{
+  gDebuggee.eval("(" + function iife() {
+    [1].forEach(function noop() {});
+    for (let x of [1]) {}
+  } + ")()");
+}
+
+function stop_trace()
+{
+  let deferred = defer();
+  gTraceClient.stopTrace(null, function() { deferred.resolve(); });
+  return deferred.promise;
+}
+
+function check_trace({ sequence, depth, name, location })
+{
+  if (location) {
+    do_check_true(location.url !== "self-hosted");
+  }
+
+  switch(sequence) {
+  case 0:
+    do_check_eq(name, "(eval)");
+  case 5:
+    do_check_eq(depth, 0);
+    break;
+
+  case 1:
+    do_check_eq(name, "iife");
+  case 4:
+    do_check_eq(depth, 1);
+    break;
+
+  case 2:
+    do_check_eq(name, "noop");
+  case 3:
+    do_check_eq(depth, 2);
+    break;
+
+  default:
+    // Should have covered all sequences.
+    do_check_true(false);
+  }
+}
diff --git a/toolkit/devtools/server/tests/unit/xpcshell.ini b/toolkit/devtools/server/tests/unit/xpcshell.ini
index 9fa4b98d04e6..a028f583d538 100644
--- a/toolkit/devtools/server/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/server/tests/unit/xpcshell.ini
@@ -191,4 +191,5 @@ reason = bug 820380
 [test_trace_actor-06.js]
 [test_trace_actor-07.js]
 [test_trace_actor-08.js]
+[test_trace_actor-09.js]
 [test_ignore_caught_exceptions.js]

From c56e12c06d1fcc2b649b3f5967e1061d80d9ec30 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Tue, 17 Dec 2013 21:11:59 -0500
Subject: [PATCH 25/78] Bug 941002 - [Australis] Add Developer Tools button to
 menu default set. r=Unfocused

--HG--
extra : rebase_source : 70c95582cf6dcbaa4dc55db0fd1dbfca9f5dc03b
---
 .../customizableui/src/CustomizableUI.jsm     |  3 +-
 ...er_876944_customize_mode_create_destroy.js |  4 +-
 .../test/browser_878452_drag_to_panel.js      | 12 +--
 ...owser_880382_drag_wide_widgets_in_panel.js | 95 +++++++++++--------
 .../browser_890140_orphaned_placeholders.js   | 54 ++++++-----
 5 files changed, 95 insertions(+), 73 deletions(-)

diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 062a543e0051..6f086d9cd162 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -150,7 +150,8 @@ let CustomizableUIInternal = {
       "fullscreen-button",
       "find-button",
       "preferences-button",
-      "add-ons-button"
+      "add-ons-button",
+      "developer-button",
     ];
 
     if (gPalette.has("switch-to-metro-button")) {
diff --git a/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js b/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
index 8002f9d81276..6458db7360a2 100644
--- a/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
+++ b/browser/components/customizableui/test/browser_876944_customize_mode_create_destroy.js
@@ -27,7 +27,7 @@ add_task(function testWrapUnwrap() {
 // Creating and destroying a widget should correctly deal with panel placeholders
 add_task(function testPanelPlaceholders() {
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 2 : 3, "The number of placeholders should be correct.");
+  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 1 : 2, "The number of placeholders should be correct.");
   CustomizableUI.createWidget({id: kTestWidget2, label: 'Pretty label', tooltiptext: 'Pretty tooltip', defaultArea: CustomizableUI.AREA_PANEL});
   let elem = document.getElementById(kTestWidget2);
   let wrapper = document.getElementById("wrapper-" + kTestWidget2);
@@ -35,7 +35,7 @@ add_task(function testPanelPlaceholders() {
   ok(wrapper, "There should be a wrapper");
   is(wrapper.firstChild.id, kTestWidget2, "Wrapper should have test widget");
   is(wrapper.parentNode, panel, "Wrapper should be in panel");
-  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 1 : 2, "The number of placeholders should be correct.");
+  is(panel.querySelectorAll(".panel-customization-placeholder").length, isInWin8() ? 3 : 1, "The number of placeholders should be correct.");
   CustomizableUI.destroyWidget(kTestWidget2);
   wrapper = document.getElementById("wrapper-" + kTestWidget2);
   ok(!wrapper, "There should be a wrapper");
diff --git a/browser/components/customizableui/test/browser_878452_drag_to_panel.js b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
index 114bf1102301..d9bbe0aad648 100644
--- a/browser/components/customizableui/test/browser_878452_drag_to_panel.js
+++ b/browser/components/customizableui/test/browser_878452_drag_to_panel.js
@@ -9,13 +9,13 @@ Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
 // Dragging an item from the palette to another button in the panel should work.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("feed-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
   let lastButtonIndex = placements.length - 1;
   let lastButton = placements[lastButtonIndex];
-  let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["developer-button", lastButton]);
+  let placementsAfterInsert = placements.slice(0, lastButtonIndex).concat(["feed-button", lastButton]);
   let lastButtonNode = document.getElementById(lastButton);
   simulateItemDrag(btn, lastButtonNode);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
@@ -28,11 +28,11 @@ add_task(function() {
 // Dragging an item from the palette to the panel itself should also work.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("feed-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.concat(["developer-button"]);
+  let placementsAfterAppend = placements.concat(["feed-button"]);
   simulateItemDrag(btn, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
@@ -48,12 +48,12 @@ add_task(function() {
     CustomizableUI.removeWidgetFromArea(widgetIds.shift());
   }
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("feed-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
 
   assertAreaPlacements(panel.id, []);
 
-  let placementsAfterAppend = ["developer-button"];
+  let placementsAfterAppend = ["feed-button"];
   simulateItemDrag(btn, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
diff --git a/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js b/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
index fb8a7d20c340..f0c4f5701d2b 100644
--- a/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
+++ b/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
@@ -22,7 +22,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, printButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -47,7 +48,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -70,7 +72,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -92,7 +95,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, historyPanelMenu);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -118,7 +122,8 @@ add_task(function() {
                              "zoom-controls",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(zoomControls, preferencesButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -131,10 +136,10 @@ add_task(function() {
 // Dragging an item from the palette to before the zoom-controls should move it and two other buttons before the zoom controls.
 add_task(function() {
   yield startCustomizing();
-  let developerButton = document.getElementById("developer-button");
+  let openFileButton = document.getElementById("open-file-button");
   let zoomControls = document.getElementById("zoom-controls");
   let placementsAfterInsert = ["edit-controls",
-                               "developer-button",
+                               "open-file-button",
                                "new-window-button",
                                "privatebrowsing-button",
                                "zoom-controls",
@@ -144,9 +149,10 @@ add_task(function() {
                                "fullscreen-button",
                                "find-button",
                                "preferences-button",
-                               "add-ons-button"];
+                               "add-ons-button",
+                               "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterInsert);
-  simulateItemDrag(developerButton, zoomControls);
+  simulateItemDrag(openFileButton, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   let palette = document.getElementById("customization-palette");
@@ -157,9 +163,9 @@ add_task(function() {
      "feed-button should be a child of wrapper-feed-button");
   is(feedWrapper.getAttribute("place"), "palette",
      "The feed-button wrapper should have it's place set to 'palette'");
-  simulateItemDrag(developerButton, palette);
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "The developer-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(openFileButton, palette);
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "The open-file-button should be wrapped by a toolbarpaletteitem");
   let newWindowButton = document.getElementById("new-window-button");
   simulateItemDrag(zoomControls, newWindowButton);
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
@@ -169,9 +175,9 @@ add_task(function() {
 // should move it and two other buttons before the edit and zoom controls.
 add_task(function() {
   yield startCustomizing();
-  let developerButton = document.getElementById("developer-button");
+  let openFileButton = document.getElementById("open-file-button");
   let editControls = document.getElementById("edit-controls");
-  let placementsAfterInsert = ["developer-button",
+  let placementsAfterInsert = ["open-file-button",
                                "new-window-button",
                                "privatebrowsing-button",
                                "edit-controls",
@@ -182,9 +188,10 @@ add_task(function() {
                                "fullscreen-button",
                                "find-button",
                                "preferences-button",
-                               "add-ons-button"];
+                               "add-ons-button",
+                               "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterInsert);
-  simulateItemDrag(developerButton, editControls);
+  simulateItemDrag(openFileButton, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   let palette = document.getElementById("customization-palette");
@@ -195,9 +202,9 @@ add_task(function() {
      "feed-button should be a child of wrapper-feed-button");
   is(feedWrapper.getAttribute("place"), "palette",
      "The feed-button wrapper should have it's place set to 'palette'");
-  simulateItemDrag(developerButton, palette);
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "The developer-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(openFileButton, palette);
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "The open-file-button should be wrapped by a toolbarpaletteitem");
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
 
@@ -217,7 +224,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, zoomControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -240,7 +248,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, newWindowButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -266,7 +275,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, privateBrowsingButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -292,7 +302,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, savePageButton);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -317,7 +328,8 @@ add_task(function() {
                              "find-button",
                              "preferences-button",
                              "add-ons-button",
-                             "edit-controls"];
+                             "edit-controls",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, panel);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -341,7 +353,8 @@ add_task(function() {
                              "fullscreen-button",
                              "find-button",
                              "preferences-button",
-                             "add-ons-button"];
+                             "add-ons-button",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   let paletteChildElementCount = palette.childElementCount;
   simulateItemDrag(editControls, palette);
@@ -365,7 +378,7 @@ add_task(function() {
   yield startCustomizing();
   let editControls = document.getElementById("edit-controls");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
-  let numPlaceholders = isInWin8() ? 2 : 3;
+  let numPlaceholders = isInWin8() ? 1 : 2;
   for (let i = 0; i < numPlaceholders; i++) {
     // NB: We can't just iterate over all of the placeholders
     // because each drag-drop action recreates them.
@@ -380,7 +393,8 @@ add_task(function() {
                                "find-button",
                                "preferences-button",
                                "add-ons-button",
-                               "edit-controls"];
+                               "edit-controls",
+                               "developer-button"];
     addSwitchToMetroButtonInWindows8(placementsAfterMove);
     simulateItemDrag(editControls, placeholder);
     assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
@@ -390,15 +404,15 @@ add_task(function() {
   }
 });
 
-// Dragging the developer-button back on to itself should work.
+// Dragging the open-file-button back on to itself should work.
 add_task(function() {
   yield startCustomizing();
-  let developerButton = document.getElementById("developer-button");
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "developer-button should be wrapped by a toolbarpaletteitem");
-  simulateItemDrag(developerButton, developerButton);
-  is(developerButton.parentNode.tagName, "toolbarpaletteitem",
-     "developer-button should be wrapped by a toolbarpaletteitem");
+  let openFileButton = document.getElementById("open-file-button");
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "open-file-button should be wrapped by a toolbarpaletteitem");
+  simulateItemDrag(openFileButton, openFileButton);
+  is(openFileButton.parentNode.tagName, "toolbarpaletteitem",
+     "open-file-button should be wrapped by a toolbarpaletteitem");
   let editControls = document.getElementById("edit-controls");
   is(editControls.parentNode.tagName, "toolbarpaletteitem",
      "edit-controls should be wrapped by a toolbarpaletteitem");
@@ -421,16 +435,19 @@ add_task(function() {
                              "find-button",
                              "preferences-button",
                              "add-ons-button",
-                             "edit-controls"];
+                             "edit-controls",
+                             "developer-button"];
   addSwitchToMetroButtonInWindows8(placementsAfterMove);
   simulateItemDrag(editControls, target);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
   let itemToDrag = "sync-button";
   let button = document.getElementById(itemToDrag);
-  if (!isInWin8()) {
-    placementsAfterMove.push(itemToDrag);
-  } else {
-    placementsAfterMove.splice(11, 0, itemToDrag);
+  placementsAfterMove.splice(11, 0, itemToDrag);
+  if (isInWin8()) {
+    placementsAfterMove[10] = placementsAfterMove[11];
+    placementsAfterMove[11] = placementsAfterMove[12];
+    placementsAfterMove[12] = placementsAfterMove[13];
+    placementsAfterMove[13] = "edit-controls";
   }
   simulateItemDrag(button, editControls);
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
diff --git a/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js b/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
index 9bdf75d39258..79dd684d3986 100644
--- a/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
+++ b/browser/components/customizableui/test/browser_890140_orphaned_placeholders.js
@@ -9,13 +9,13 @@ Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
 // One orphaned item should have two placeholders next to it.
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("open-file-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  if (!isInWin8()) {
-    placements = placements.concat(["developer-button"]);
-    simulateItemDrag(btn, panel);
+  if (isInWin8()) {
+    CustomizableUI.removeWidgetFromArea("switch-to-metro-button");
+    placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
     ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
   } else {
     ok(CustomizableUI.inDefaultState, "Should be in default state.");
@@ -28,9 +28,8 @@ add_task(function() {
   yield startCustomizing();
   is(getVisiblePlaceholderCount(panel), 2, "Should only have 2 visible placeholders after re-entering");
 
-  if (!isInWin8()) {
-    let palette = document.getElementById("customization-palette");
-    simulateItemDrag(btn, palette);
+  if (isInWin8()) {
+    CustomizableUI.addWidgetToArea("switch-to-metro-button", CustomizableUI.AREA_PANEL);
   }
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
@@ -38,32 +37,30 @@ add_task(function() {
 // Two orphaned items should have one placeholder next to them (case 1).
 add_task(function() {
   yield startCustomizing();
-  let btn = document.getElementById("developer-button");
+  let btn = document.getElementById("open-file-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.concat(["developer-button"]);
-  simulateItemDrag(btn, panel);
+  let placementsAfterAppend = placements;
 
   if (!isInWin8()) {
-    placementsAfterAppend = placementsAfterAppend.concat(["sync-button"]);
-    btn = document.getElementById("sync-button");
+    placementsAfterAppend = placements.concat(["open-file-button"]);
     simulateItemDrag(btn, panel);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
-  ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders before exiting");
+  is(CustomizableUI.inDefaultState, isInWin8(), "Should only be in default state if on Win8");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
 
   yield endCustomizing();
   yield startCustomizing();
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders after re-entering");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder after re-entering");
 
   let palette = document.getElementById("customization-palette");
   simulateItemDrag(btn, palette);
 
   if (!isInWin8()) {
-    btn = document.getElementById("developer-button");
+    btn = document.getElementById("open-file-button");
     simulateItemDrag(btn, palette);
   }
   ok(CustomizableUI.inDefaultState, "Should be in default state again."); 
@@ -73,31 +70,34 @@ add_task(function() {
 add_task(function() {
   yield startCustomizing();
   let btn = document.getElementById("add-ons-button");
-  let btn2 = document.getElementById("switch-to-metro-button");
+  let btn2 = document.getElementById("developer-button");
+  let btn3 = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
-  let placementsAfterAppend = placements.filter(p => p != btn.id);
+  let placementsAfterAppend = placements.filter(p => p != btn.id && p != btn2.id);
   simulateItemDrag(btn, palette);
+  simulateItemDrag(btn2, palette);
 
   if (isInWin8()) {
-    placementsAfterAppend = placementsAfterAppend.filter(p => p != btn2.id);
-    simulateItemDrag(btn2, palette);
+    placementsAfterAppend = placementsAfterAppend.filter(p => p != btn3.id);
+    simulateItemDrag(btn3, palette);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterAppend);
   ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders before exiting");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder before exiting");
 
   yield endCustomizing();
   yield startCustomizing();
-  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholders after re-entering");
+  is(getVisiblePlaceholderCount(panel), 1, "Should only have 1 visible placeholder after re-entering");
 
   simulateItemDrag(btn, panel);
+  simulateItemDrag(btn2, panel);
 
   if (isInWin8()) {
-    simulateItemDrag(btn2, panel);
+    simulateItemDrag(btn3, panel);
   }
 
   assertAreaPlacements(CustomizableUI.AREA_PANEL, placements);
@@ -108,11 +108,14 @@ add_task(function() {
 add_task(function() {
   yield startCustomizing();
   let btn = document.getElementById("edit-controls");
+  let developerButton = document.getElementById("developer-button");
   let metroBtn = document.getElementById("switch-to-metro-button");
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   let palette = document.getElementById("customization-palette");
   let placements = getAreaWidgetIds(CustomizableUI.AREA_PANEL);
 
+  placements.pop();
+  simulateItemDrag(developerButton, palette);
   if (isInWin8()) {
     // Remove switch-to-metro-button
     placements.pop();
@@ -129,6 +132,7 @@ add_task(function() {
   yield startCustomizing();
   is(getVisiblePlaceholderCount(panel), 3, "Should have 3 visible placeholders after re-entering");
 
+  simulateItemDrag(developerButton, panel);
   if (isInWin8()) {
     simulateItemDrag(metroBtn, panel);
   }
@@ -137,10 +141,10 @@ add_task(function() {
   ok(CustomizableUI.inDefaultState, "Should be in default state again.");
 });
 
-// The default placements should have three placeholders at the bottom (or 2 in win8).
+// The default placements should have two placeholders at the bottom (or 1 in win8).
 add_task(function() {
   yield startCustomizing();
-  let numPlaceholders = isInWin8() ? 2 : 3;
+  let numPlaceholders = isInWin8() ? 1 : 2;
   let panel = document.getElementById(CustomizableUI.AREA_PANEL);
   ok(CustomizableUI.inDefaultState, "Should be in default state.");
   is(getVisiblePlaceholderCount(panel), numPlaceholders, "Should have " + numPlaceholders + " visible placeholders before exiting");

From 78a4a1d39edbb7c0878da0ce8dbeeb3819d652f1 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Thu, 19 Dec 2013 22:59:34 +0200
Subject: [PATCH 26/78] Bug 952194 - The #tracer-message doesn't need
 !important and the 22px min-width doesn't make sense, r=fitzgen

---
 browser/themes/linux/devtools/debugger.css   | 3 ++-
 browser/themes/osx/devtools/debugger.css     | 3 ++-
 browser/themes/windows/devtools/debugger.css | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/browser/themes/linux/devtools/debugger.css b/browser/themes/linux/devtools/debugger.css
index 37cd936a7a75..91702e692992 100644
--- a/browser/themes/linux/devtools/debugger.css
+++ b/browser/themes/linux/devtools/debugger.css
@@ -107,7 +107,8 @@
 }
 
 #clear-tracer {
-  min-width: 22px !important;
+  /* Make this button as narrow as the text inside it. */
+  min-width: 1px;
 }
 
 #tracer-message {
diff --git a/browser/themes/osx/devtools/debugger.css b/browser/themes/osx/devtools/debugger.css
index 75394596de72..453355ce7621 100644
--- a/browser/themes/osx/devtools/debugger.css
+++ b/browser/themes/osx/devtools/debugger.css
@@ -109,7 +109,8 @@
 }
 
 #clear-tracer {
-  min-width: 22px !important;
+  /* Make this button as narrow as the text inside it. */
+  min-width: 1px;
 }
 
 #tracer-message {
diff --git a/browser/themes/windows/devtools/debugger.css b/browser/themes/windows/devtools/debugger.css
index 0f8d879342e1..322fa29c1157 100644
--- a/browser/themes/windows/devtools/debugger.css
+++ b/browser/themes/windows/devtools/debugger.css
@@ -107,7 +107,8 @@
 }
 
 #clear-tracer {
-  min-width: 22px !important;
+  /* Make this button as narrow as the text inside it. */
+  min-width: 1px;
 }
 
 #tracer-message {

From d4c5435e34d694bb269a0e2ac43986846001554b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 19 Dec 2013 22:16:10 +0100
Subject: [PATCH 27/78] Bug 723951 - Popup notification does not continue when
 the tab move to other window, r=felipe.

---
 browser/base/content/browser.js               |   3 -
 browser/base/content/popup-notifications.inc  |   1 +
 .../test/general/browser_popupNotification.js |  46 +++++++
 browser/modules/webrtcUI.jsm                  | 126 ++++++++++--------
 toolkit/content/widgets/browser.xml           |   4 +
 toolkit/modules/PopupNotifications.jsm        |  66 ++++++++-
 6 files changed, 187 insertions(+), 59 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index c9082d3ee68d..ee622ab69dc4 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6463,9 +6463,6 @@ var gIdentityHandler = {
     if (PopupNotifications.getNotification("mixed-content-blocked", gBrowser.selectedBrowser))
       return;
 
-    let helplink = document.getElementById("mixed-content-blocked-helplink");
-    helplink.setAttribute("onclick", "openHelpLink('mixed-content');");
-
     let brandBundle = document.getElementById("bundle_brand");
     let brandShortName = brandBundle.getString("brandShortName");
     let messageString = gNavigatorBundle.getFormattedString("mixedContentBlocked.message", [brandShortName]);
diff --git a/browser/base/content/popup-notifications.inc b/browser/base/content/popup-notifications.inc
index 7a4f3e2227e7..1492870d8afa 100644
--- a/browser/base/content/popup-notifications.inc
+++ b/browser/base/content/popup-notifications.inc
@@ -62,6 +62,7 @@
         <description id="mixed-content-blocked-moreinfo">&mixedContentBlocked.moreinfo;</description>
         <separator/>
         <label id="mixed-content-blocked-helplink" class="text-link"
+               onclick="openHelpLink('mixed-content');"
                value="&mixedContentBlocked.helplink;"/>
       </popupnotificationcontent>
     </popupnotification>
diff --git a/browser/base/content/test/general/browser_popupNotification.js b/browser/base/content/test/general/browser_popupNotification.js
index 4c194d79b566..b85f02ca95d4 100644
--- a/browser/base/content/test/general/browser_popupNotification.js
+++ b/browser/base/content/test/general/browser_popupNotification.js
@@ -146,6 +146,9 @@ function basicNotification() {
         case "removed":
           self.removedCallbackTriggered = true;
           break;
+        case "swapping":
+          self.swappingCallbackTriggered = true;
+          break;
       }
     }
   };
@@ -978,6 +981,49 @@ var tests = [
       triggerMainCommand(popup);
     },
     onHidden: function() { }
+  },
+  { // Test #31 - Moving a tab to a new window should remove non-swappable
+    // notifications.
+    run: function() {
+      gBrowser.selectedTab = gBrowser.addTab("about:blank");
+      let notifyObj = new basicNotification();
+      showNotification(notifyObj);
+      let win = gBrowser.replaceTabWithWindow(gBrowser.selectedTab);
+      whenDelayedStartupFinished(win, function() {
+        let [tab] = win.gBrowser.tabs;
+        let anchor = win.document.getElementById("default-notification-icon");
+        win.PopupNotifications._reshowNotifications(anchor);
+        ok(win.PopupNotifications.panel.childNodes.length == 0,
+           "no notification displayed in new window");
+        ok(notifyObj.swappingCallbackTriggered, "the swapping callback was triggered");
+        ok(notifyObj.removedCallbackTriggered, "the removed callback was triggered");
+        win.close();
+        goNext();
+      });
+    }
+  },
+  { // Test #32 - Moving a tab to a new window should preserve swappable notifications.
+    run: function() {
+      gBrowser.selectedTab = gBrowser.addTab("about:blank");
+      let notifyObj = new basicNotification();
+      let originalCallback = notifyObj.options.eventCallback;
+        notifyObj.options.eventCallback = function (eventName) {
+          originalCallback(eventName);
+          return eventName == "swapping";
+        };
+
+      showNotification(notifyObj);
+      let win = gBrowser.replaceTabWithWindow(gBrowser.selectedTab);
+      whenDelayedStartupFinished(win, function() {
+        let [tab] = win.gBrowser.tabs;
+        let anchor = win.document.getElementById("default-notification-icon");
+        win.PopupNotifications._reshowNotifications(anchor);
+        checkPopup(win.PopupNotifications.panel, notifyObj);
+        ok(notifyObj.swappingCallbackTriggered, "the swapping callback was triggered");
+        win.close();
+        goNext();
+      });
+    }
   }
 ];
 
diff --git a/browser/modules/webrtcUI.jsm b/browser/modules/webrtcUI.jsm
index b28c8708618c..346903938ba1 100644
--- a/browser/modules/webrtcUI.jsm
+++ b/browser/modules/webrtcUI.jsm
@@ -128,62 +128,14 @@ function prompt(aWindowID, aCallID, aAudioRequested, aVideoRequested, aDevices)
   let message = stringBundle.getFormattedString("getUserMedia.share" + requestType + ".message",
                                                 [ host ]);
 
-  function listDevices(menupopup, devices) {
-    while (menupopup.lastChild)
-      menupopup.removeChild(menupopup.lastChild);
-
-    let deviceIndex = 0;
-    for (let device of devices) {
-      addDeviceToList(menupopup, device.name, deviceIndex);
-      deviceIndex++;
-    }
-  }
-
-  function addDeviceToList(menupopup, deviceName, deviceIndex) {
-    let menuitem = chromeDoc.createElement("menuitem");
-    menuitem.setAttribute("value", deviceIndex);
-    menuitem.setAttribute("label", deviceName);
-    menuitem.setAttribute("tooltiptext", deviceName);
-    menupopup.appendChild(menuitem);
-  }
-
-  chromeDoc.getElementById("webRTC-selectCamera").hidden = !videoDevices.length;
-  chromeDoc.getElementById("webRTC-selectMicrophone").hidden = !audioDevices.length;
-
-  let camMenupopup = chromeDoc.getElementById("webRTC-selectCamera-menupopup");
-  let micMenupopup = chromeDoc.getElementById("webRTC-selectMicrophone-menupopup");
-  listDevices(camMenupopup, videoDevices);
-  listDevices(micMenupopup, audioDevices);
-  if (requestType == "CameraAndMicrophone") {
-    addDeviceToList(camMenupopup, stringBundle.getString("getUserMedia.noVideo.label"), "-1");
-    addDeviceToList(micMenupopup, stringBundle.getString("getUserMedia.noAudio.label"), "-1");
-  }
-
   let mainAction = {
     label: PluralForm.get(requestType == "CameraAndMicrophone" ? 2 : 1,
                           stringBundle.getString("getUserMedia.shareSelectedDevices.label")),
     accessKey: stringBundle.getString("getUserMedia.shareSelectedDevices.accesskey"),
-    callback: function () {
-      let allowedDevices = Cc["@mozilla.org/supports-array;1"]
-                             .createInstance(Ci.nsISupportsArray);
-      if (videoDevices.length) {
-        let videoDeviceIndex = chromeDoc.getElementById("webRTC-selectCamera-menulist").value;
-        if (videoDeviceIndex != "-1")
-          allowedDevices.AppendElement(videoDevices[videoDeviceIndex]);
-      }
-      if (audioDevices.length) {
-        let audioDeviceIndex = chromeDoc.getElementById("webRTC-selectMicrophone-menulist").value;
-        if (audioDeviceIndex != "-1")
-          allowedDevices.AppendElement(audioDevices[audioDeviceIndex]);
-      }
-
-      if (allowedDevices.Count() == 0) {
-        denyRequest(aCallID);
-        return;
-      }
-
-      Services.obs.notifyObservers(allowedDevices, "getUserMedia:response:allow", aCallID);
-    }
+    // The real callback will be set during the "showing" event. The
+    // empty function here is so that PopupNotifications.show doesn't
+    // reject the action.
+    callback: function() {}
   };
 
   let secondaryActions = [{
@@ -194,7 +146,72 @@ function prompt(aWindowID, aCallID, aAudioRequested, aVideoRequested, aDevices)
     }
   }];
 
-  let options = null;
+  let options = {
+    eventCallback: function(aTopic, aNewBrowser) {
+      if (aTopic == "swapping")
+        return true;
+
+      if (aTopic != "showing")
+        return false;
+
+      let chromeDoc = this.browser.ownerDocument;
+
+      function listDevices(menupopup, devices) {
+        while (menupopup.lastChild)
+          menupopup.removeChild(menupopup.lastChild);
+
+        let deviceIndex = 0;
+        for (let device of devices) {
+          addDeviceToList(menupopup, device.name, deviceIndex);
+          deviceIndex++;
+        }
+      }
+
+      function addDeviceToList(menupopup, deviceName, deviceIndex) {
+        let menuitem = chromeDoc.createElement("menuitem");
+        menuitem.setAttribute("value", deviceIndex);
+        menuitem.setAttribute("label", deviceName);
+        menuitem.setAttribute("tooltiptext", deviceName);
+        menupopup.appendChild(menuitem);
+      }
+
+      chromeDoc.getElementById("webRTC-selectCamera").hidden = !videoDevices.length;
+      chromeDoc.getElementById("webRTC-selectMicrophone").hidden = !audioDevices.length;
+
+      let camMenupopup = chromeDoc.getElementById("webRTC-selectCamera-menupopup");
+      let micMenupopup = chromeDoc.getElementById("webRTC-selectMicrophone-menupopup");
+      listDevices(camMenupopup, videoDevices);
+      listDevices(micMenupopup, audioDevices);
+      if (requestType == "CameraAndMicrophone") {
+        let stringBundle = chromeDoc.defaultView.gNavigatorBundle;
+        addDeviceToList(camMenupopup, stringBundle.getString("getUserMedia.noVideo.label"), "-1");
+        addDeviceToList(micMenupopup, stringBundle.getString("getUserMedia.noAudio.label"), "-1");
+      }
+
+      this.mainAction.callback = function() {
+        let allowedDevices = Cc["@mozilla.org/supports-array;1"]
+                               .createInstance(Ci.nsISupportsArray);
+        if (videoDevices.length) {
+          let videoDeviceIndex = chromeDoc.getElementById("webRTC-selectCamera-menulist").value;
+          if (videoDeviceIndex != "-1")
+            allowedDevices.AppendElement(videoDevices[videoDeviceIndex]);
+        }
+        if (audioDevices.length) {
+          let audioDeviceIndex = chromeDoc.getElementById("webRTC-selectMicrophone-menulist").value;
+          if (audioDeviceIndex != "-1")
+            allowedDevices.AppendElement(audioDevices[audioDeviceIndex]);
+        }
+
+        if (allowedDevices.Count() == 0) {
+          denyRequest(aCallID);
+          return;
+        }
+
+        Services.obs.notifyObservers(allowedDevices, "getUserMedia:response:allow", aCallID);
+      };
+      return true;
+    }
+  };
 
   chromeWin.PopupNotifications.show(browser, "webRTC-shareDevices", message,
                                     "webRTC-shareDevices-notification-icon", mainAction,
@@ -237,7 +254,8 @@ function showBrowserSpecificIndicator(aBrowser) {
   let mainAction = null;
   let secondaryActions = null;
   let options = {
-    dismissed: true
+    dismissed: true,
+    eventCallback: function(aTopic) aTopic == "swapping"
   };
   chromeWin.PopupNotifications.show(aBrowser, "webRTC-sharingDevices", message,
                                     "webRTC-sharingDevices-notification-icon", mainAction,
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index 7a4d21cd0008..e00f43fd9893 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -1154,6 +1154,10 @@
             ourFieldValues[field] = this[field];
             otherFieldValues[field] = aOtherBrowser[field];
           }
+
+          if (window.PopupNotifications)
+            PopupNotifications._swapBrowserNotifications(aOtherBrowser, this);
+
           this.QueryInterface(Components.interfaces.nsIFrameLoaderOwner)
               .swapFrameLoaders(aOtherBrowser);
 
diff --git a/toolkit/modules/PopupNotifications.jsm b/toolkit/modules/PopupNotifications.jsm
index bce068834846..dff170749881 100644
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@@ -12,6 +12,7 @@ const NOTIFICATION_EVENT_DISMISSED = "dismissed";
 const NOTIFICATION_EVENT_REMOVED = "removed";
 const NOTIFICATION_EVENT_SHOWING = "showing";
 const NOTIFICATION_EVENT_SHOWN = "shown";
+const NOTIFICATION_EVENT_SWAPPING = "swapping";
 
 const ICON_SELECTOR = ".notification-anchor-icon";
 const ICON_ATTRIBUTE_SHOWING = "showing";
@@ -224,9 +225,23 @@ PopupNotifications.prototype = {
    *                                  tabs)
    *                     "removed": notification has been removed (due to
    *                                location change or user action)
+   *                     "showing": notification is about to be shown
+   *                                (this can be fired multiple times as
+   *                                 notifications are dismissed and re-shown)
    *                     "shown": notification has been shown (this can be fired
    *                              multiple times as notifications are dismissed
    *                              and re-shown)
+   *                     "swapping": the docshell of the browser that created
+   *                                 the notification is about to be swapped to
+   *                                 another browser. A second parameter contains
+   *                                 the browser that is receiving the docshell,
+   *                                 so that the event callback can transfer stuff
+   *                                 specific to this notification.
+   *                                 If the callback returns true, the notification
+   *                                 will be moved to the new browser.
+   *                                 If the callback isn't implemented, returns false,
+   *                                 or doesn't return any value, the notification
+   *                                 will be removed.
    *        neverShow:   Indicate that no popup should be shown for this
    *                     notification. Useful for just showing the anchor icon.
    *        removeOnDismissal:
@@ -747,13 +762,60 @@ PopupNotifications.prototype = {
     this._update(notifications, anchor);
   },
 
-  _fireCallback: function PopupNotifications_fireCallback(n, event) {
+  _swapBrowserNotifications: function PopupNotifications_swapBrowserNoficications(ourBrowser, otherBrowser) {
+    // When swaping browser docshells (e.g. dragging tab to new window) we need
+    // to update our notification map.
+
+    let ourNotifications = this._getNotificationsForBrowser(ourBrowser);
+    let other = otherBrowser.ownerDocument.defaultView.PopupNotifications;
+    if (!other) {
+      if (ourNotifications.length > 0)
+        Cu.reportError("unable to swap notifications: otherBrowser doesn't support notifications");
+      return;
+    }
+    let otherNotifications = other._getNotificationsForBrowser(otherBrowser);
+    if (ourNotifications.length < 1 && otherNotifications.length < 1) {
+      // No notification to swap.
+      return;
+    }
+
+    otherNotifications = otherNotifications.filter(n => {
+      if (this._fireCallback(n, NOTIFICATION_EVENT_SWAPPING, ourBrowser)) {
+        n.browser = ourBrowser;
+        n.owner = this;
+        return true;
+      }
+      other._fireCallback(n, NOTIFICATION_EVENT_REMOVED);
+      return false;
+    });
+
+    ourNotifications = ourNotifications.filter(n => {
+      if (this._fireCallback(n, NOTIFICATION_EVENT_SWAPPING, otherBrowser)) {
+        n.browser = otherBrowser;
+        n.owner = other;
+        return true;
+      }
+      this._fireCallback(n, NOTIFICATION_EVENT_REMOVED);
+      return false;
+    });
+
+    this._setNotificationsForBrowser(otherBrowser, ourNotifications);
+    other._setNotificationsForBrowser(ourBrowser, otherNotifications);
+
+    if (otherNotifications.length > 0)
+      this._update(otherNotifications, otherNotifications[0].anchorElement);
+    if (ourNotifications.length > 0)
+      other._update(ourNotifications, ourNotifications[0].anchorElement);
+  },
+
+  _fireCallback: function PopupNotifications_fireCallback(n, event, ...args) {
     try {
       if (n.options.eventCallback)
-        n.options.eventCallback.call(n, event);
+        return n.options.eventCallback.call(n, event, ...args);
     } catch (error) {
       Cu.reportError(error);
     }
+    return undefined;
   },
 
   _onPopupHidden: function PopupNotifications_onPopupHidden(event) {

From 00df9e2632ca64676a36d9d5b62c11b2067ad38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 19 Dec 2013 22:16:50 +0100
Subject: [PATCH 28/78] Bug 952166 - Package content_webrtc.xpt on Firefox
 Desktop so that add-on authors can experiment with tab sharing, r=jesup.

---
 browser/installer/package-manifest.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 0f475cf1a095..8e8ea8595f27 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -183,6 +183,9 @@
 @BINPATH@/components/content_canvas.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
+#ifdef MOZ_WEBRTC
+@BINPATH@/components/content_webrtc.xpt
+#endif
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/cookie.xpt
 @BINPATH@/components/directory.xpt

From 4226b33524bb8fb61b6ddc278883def852fb1bca Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 19 Dec 2013 16:46:39 -0500
Subject: [PATCH 29/78] Bug 952180 - [Australis] BrowserUITelemetry is mostly
 returning empty toolbar data. r=jaws.

---
 browser/modules/BrowserUITelemetry.jsm | 34 ++++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/browser/modules/BrowserUITelemetry.jsm b/browser/modules/BrowserUITelemetry.jsm
index f78d9277df95..25e2acf0b074 100644
--- a/browser/modules/BrowserUITelemetry.jsm
+++ b/browser/modules/BrowserUITelemetry.jsm
@@ -184,7 +184,17 @@ this.BrowserUITelemetry = {
     }
   },
 
+  _firstWindowMeasurements: null,
   _registerWindow: function(aWindow) {
+    // We'll gather measurements on the first non-popup window that opens
+    // after it has painted. We do this here instead of waiting for
+    // UITelemetry to ask for our measurements because at that point
+    // all browser windows have probably been closed, since the vast
+    // majority of saved-session pings are gathered during shutdown.
+    if (!this._firstWindowMeasurements && aWindow.toolbar.visible) {
+      this._firstWindowMeasurements = this._getWindowMeasurements(aWindow);
+    }
+
     aWindow.addEventListener("unload", this);
     let document = aWindow.document;
 
@@ -311,20 +321,8 @@ this.BrowserUITelemetry = {
     }
   },
 
-  getToolbarMeasures: function() {
-    // Grab the most recent non-popup, non-private browser window for us to
-    // analyze the toolbars in...
-    let win = RecentWindow.getMostRecentBrowserWindow({
-      private: false,
-      allowPopups: false
-    });
-
-    // If there are no such windows, we're out of luck. :(
-    if (!win) {
-      return {};
-    }
-
-    let document = win.document;
+  _getWindowMeasurements: function(aWindow) {
+    let document = aWindow.document;
     let result = {};
 
     // Determine if the Bookmarks bar is currently visible
@@ -364,7 +362,7 @@ this.BrowserUITelemetry = {
     // Now go through the items in the palette to see what default
     // items are in there.
     let paletteItems =
-      CustomizableUI.getUnusedWidgets(win.gNavToolbox.palette);
+      CustomizableUI.getUnusedWidgets(aWindow.gNavToolbox.palette);
     let defaultRemoved = [item.id for (item of paletteItems)
                           if (DEFAULT_ITEMS.indexOf(item.id) != -1)];
 
@@ -373,8 +371,12 @@ this.BrowserUITelemetry = {
     result.nondefaultAdded = nondefaultAdded;
     result.defaultRemoved = defaultRemoved;
 
-    result.countableEvents = this._countableEvents;
+    return result;
+  },
 
+  getToolbarMeasures: function() {
+    let result = this._firstWindowMeasurements || {};
+    result.countableEvents = this._countableEvents;
     return result;
   },
 };

From e9101adf37b9e6c86d8bb265f602db8001619f72 Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Thu, 19 Dec 2013 16:38:35 -0500
Subject: [PATCH 30/78] Bug 878935, Part 1: Add a "freeze" counter to
 nsRefreshDriver to keep track of how many times it was frozen. r=dbaron

--HG--
extra : rebase_source : 135e5d52fc7fe38bdf57ca2d103ff372d9011873
---
 layout/base/nsRefreshDriver.cpp | 37 +++++++++++++++++++--------------
 layout/base/nsRefreshDriver.h   | 13 ++++++++----
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 963bfad6815f..82419d1ecf01 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -681,7 +681,7 @@ nsRefreshDriver::ChooseTimer() const
 nsRefreshDriver::nsRefreshDriver(nsPresContext* aPresContext)
   : mActiveTimer(nullptr),
     mPresContext(aPresContext),
-    mFrozen(false),
+    mFreezeCount(0),
     mThrottled(false),
     mTestControllingRefreshes(false),
     mViewManagerFlushIsPending(false),
@@ -826,7 +826,7 @@ nsRefreshDriver::EnsureTimerStarted(bool aAdjustingTimer)
   if (mActiveTimer && !aAdjustingTimer)
     return;
 
-  if (mFrozen || !mPresContext) {
+  if (IsFrozen() || !mPresContext) {
     // If we don't want to start it now, or we've been disconnected.
     StopTimer();
     return;
@@ -999,7 +999,7 @@ NS_IMPL_ISUPPORTS1(nsRefreshDriver, nsISupports)
 void
 nsRefreshDriver::DoTick()
 {
-  NS_PRECONDITION(!mFrozen, "Why are we notified while frozen?");
+  NS_PRECONDITION(!IsFrozen(), "Why are we notified while frozen?");
   NS_PRECONDITION(mPresContext, "Why are we notified after disconnection?");
   NS_PRECONDITION(!nsContentUtils::GetCurrentJSContext(),
                   "Shouldn't have a JSContext on the stack");
@@ -1037,7 +1037,7 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
   // We're either frozen or we were disconnected (likely in the middle
   // of a tick iteration).  Just do nothing here, since our
   // prescontext went away.
-  if (mFrozen || !mPresContext) {
+  if (IsFrozen() || !mPresContext) {
     return;
   }
 
@@ -1293,23 +1293,28 @@ nsRefreshDriver::StartTableRefresh(const uint32_t& aDelay,
 void
 nsRefreshDriver::Freeze()
 {
-  NS_ASSERTION(!mFrozen, "Freeze called on already-frozen refresh driver");
   StopTimer();
-  mFrozen = true;
+  mFreezeCount++;
 }
 
 void
 nsRefreshDriver::Thaw()
 {
-  NS_ASSERTION(mFrozen, "Thaw called on an unfrozen refresh driver");
-  mFrozen = false;
-  if (ObserverCount() || ImageRequestCount()) {
-    // FIXME: This isn't quite right, since our EnsureTimerStarted call
-    // updates our mMostRecentRefresh, but the DoRefresh call won't run
-    // and notify our observers until we get back to the event loop.
-    // Thus MostRecentRefresh() will lie between now and the DoRefresh.
-    NS_DispatchToCurrentThread(NS_NewRunnableMethod(this, &nsRefreshDriver::DoRefresh));
-    EnsureTimerStarted(false);
+  NS_ASSERTION(mFreezeCount > 0, "Thaw() called on an unfrozen refresh driver");
+
+  if (mFreezeCount > 0) {
+    mFreezeCount--;
+  }
+
+  if (mFreezeCount == 0) {
+    if (ObserverCount() || ImageRequestCount()) {
+      // FIXME: This isn't quite right, since our EnsureTimerStarted call
+      // updates our mMostRecentRefresh, but the DoRefresh call won't run
+      // and notify our observers until we get back to the event loop.
+      // Thus MostRecentRefresh() will lie between now and the DoRefresh.
+      NS_DispatchToCurrentThread(NS_NewRunnableMethod(this, &nsRefreshDriver::DoRefresh));
+      EnsureTimerStarted(false);
+    }
   }
 }
 
@@ -1330,7 +1335,7 @@ void
 nsRefreshDriver::DoRefresh()
 {
   // Don't do a refresh unless we're in a state where we should be refreshing.
-  if (!mFrozen && mPresContext && mActiveTimer) {
+  if (!IsFrozen() && mPresContext && mActiveTimer) {
     DoTick();
   }
 }
diff --git a/layout/base/nsRefreshDriver.h b/layout/base/nsRefreshDriver.h
index 72021c58f09f..fcfd2b2522d4 100644
--- a/layout/base/nsRefreshDriver.h
+++ b/layout/base/nsRefreshDriver.h
@@ -213,15 +213,20 @@ public:
     mPresContext = nullptr;
   }
 
+  bool IsFrozen() { return mFreezeCount > 0; }
+
   /**
    * Freeze the refresh driver.  It should stop delivering future
-   * refreshes until thawed.
+   * refreshes until thawed. Note that the number of calls to Freeze() must
+   * match the number of calls to Thaw() in order for the refresh driver to
+   * be un-frozen.
    */
   void Freeze();
 
   /**
-   * Thaw the refresh driver.  If needed, it should start delivering
-   * refreshes again.
+   * Thaw the refresh driver.  If the number of calls to Freeze() matches the
+   * number of calls to this function, the refresh driver should start
+   * delivering refreshes again.
    */
   void Thaw();
 
@@ -299,7 +304,7 @@ private:
   nsPresContext *mPresContext; // weak; pres context passed in constructor
                                // and unset in Disconnect
 
-  bool mFrozen;
+  uint32_t mFreezeCount;
   bool mThrottled;
   bool mTestControllingRefreshes;
   bool mViewManagerFlushIsPending;

From 08a18e025e3f6f013c3b3e3230ae6d5e604e760b Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Tue, 1 Oct 2013 14:52:13 -0500
Subject: [PATCH 31/78] Bug 878935, Part 2: Pause painting while reflow-on-zoom
 is in progress to provide a better user experience. r=kats,dbaron

--HG--
extra : rebase_source : 7eb13d00208cef8e696ec6e9a1cdc2739a994d9a
---
 docshell/base/nsIMarkupDocumentViewer.idl |  12 ++
 layout/base/nsDocumentViewer.cpp          |  42 ++++++-
 layout/base/nsIPresShell.h                |  21 +++-
 layout/base/nsPresShell.cpp               |  31 +++++-
 layout/base/nsPresShell.h                 |   3 +
 mobile/android/chrome/content/browser.js  | 130 ++++++++++++++++------
 6 files changed, 198 insertions(+), 41 deletions(-)

diff --git a/docshell/base/nsIMarkupDocumentViewer.idl b/docshell/base/nsIMarkupDocumentViewer.idl
index 342f741435c1..27eef2b62611 100644
--- a/docshell/base/nsIMarkupDocumentViewer.idl
+++ b/docshell/base/nsIMarkupDocumentViewer.idl
@@ -82,6 +82,18 @@ interface nsIMarkupDocumentViewer : nsISupports
    */
   void changeMaxLineBoxWidth(in int32_t maxLineBoxWidth);
 
+  /**
+   * Instruct the refresh driver to discontinue painting until further
+   * notice.
+   */
+  void pausePainting();
+
+  /**
+   * Instruct the refresh driver to resume painting after a previous call to
+   * pausePainting().
+   */
+  void resumePainting();
+
   /*
    * Render the document as if being viewed on a device with the specified
    * media type. This will cause a reflow.
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 885c8444d2da..35da30644759 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2700,6 +2700,17 @@ struct LineBoxInfo
   nscoord mMaxLineBoxWidth;
 };
 
+static void
+ChangeChildPaintingEnabled(nsIMarkupDocumentViewer* aChild, void* aClosure)
+{
+  bool* enablePainting = (bool*) aClosure;
+  if (*enablePainting) {
+    aChild->ResumePainting();
+  } else {
+    aChild->PausePainting();
+  }
+}
+
 static void
 ChangeChildMaxLineBoxWidth(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
@@ -3126,7 +3137,36 @@ NS_IMETHODIMP nsDocumentViewer::AppendSubtree(nsTArray<nsCOMPtr<nsIMarkupDocumen
   return NS_OK;
 }
 
-NS_IMETHODIMP nsDocumentViewer::ChangeMaxLineBoxWidth(int32_t aMaxLineBoxWidth)
+nsresult
+nsDocumentViewer::PausePainting()
+{
+  bool enablePaint = false;
+  CallChildren(ChangeChildPaintingEnabled, &enablePaint);
+
+  nsIPresShell* presShell = GetPresShell();
+  if (presShell) {
+    presShell->PausePainting();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsDocumentViewer::ResumePainting()
+{
+  bool enablePaint = true;
+  CallChildren(ChangeChildPaintingEnabled, &enablePaint);
+
+  nsIPresShell* presShell = GetPresShell();
+  if (presShell) {
+    presShell->ResumePainting();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+nsDocumentViewer::ChangeMaxLineBoxWidth(int32_t aMaxLineBoxWidth)
 {
   // Change the max line box width for all children.
   struct LineBoxInfo lbi = { aMaxLineBoxWidth };
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 30d4f6025165..db9470f7b921 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -129,10 +129,10 @@ typedef struct CapturingContentInfo {
 } CapturingContentInfo;
 
 
-// f5b542a9-eaf0-4560-a656-37a9d379864c
+// 0e4f2b36-7ab8-43c5-b912-5c311566297c
 #define NS_IPRESSHELL_IID \
-{ 0xf5b542a9, 0xeaf0, 0x4560, \
-  { 0x37, 0xa9, 0xd3, 0x79, 0x86, 0x4c } }
+{ 0xde498c49, 0xf83f, 0x47bf, \
+  {0x8c, 0xc6, 0x8f, 0xf8, 0x74, 0x62, 0x22, 0x23 } }
 
 // debug VerifyReflow flags
 #define VERIFY_REFLOW_ON                    0x01
@@ -836,6 +836,20 @@ public:
    */
   bool IsPaintingSuppressed() const { return mPaintingSuppressed; }
 
+  /**
+   * Pause painting by freezing the refresh driver of this and all parent
+   * presentations. This may not have the desired effect if this pres shell
+   * has its own refresh driver.
+   */
+  virtual void PausePainting() = 0;
+
+  /**
+   * Resume painting by thawing the refresh driver of this and all parent
+   * presentations. This may not have the desired effect if this pres shell
+   * has its own refresh driver.
+   */
+  virtual void ResumePainting() = 0;
+
   /**
    * Unsuppress painting.
    */
@@ -1601,6 +1615,7 @@ protected:
   bool mFontSizeInflationForceEnabled;
   bool mFontSizeInflationDisabledInMasterProcess;
   bool mFontSizeInflationEnabled;
+  bool mPaintingIsFrozen;
 
   // Dirty bit indicating that mFontSizeInflationEnabled needs to be recomputed.
   bool mFontSizeInflationEnabledIsDirty;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index a600299c2b9f..f2e513ce358c 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -724,6 +724,8 @@ PresShell::PresShell()
                                  "layout.reflow.synthMouseMove", true);
     addedSynthMouseMove = true;
   }
+
+  mPaintingIsFrozen = false;
 }
 
 NS_IMPL_ISUPPORTS7(PresShell, nsIPresShell, nsIDocumentObserver,
@@ -744,6 +746,13 @@ PresShell::~PresShell()
                mLastCallbackEventRequest == nullptr,
                "post-reflow queues not empty.  This means we're leaking");
 
+  // Verify that if painting was frozen, but we're being removed from the tree,
+  // that we now re-enable painting on our refresh driver, since it may need to
+  // be re-used by another presentation.
+  if (mPaintingIsFrozen) {
+    mPresContext->RefreshDriver()->Thaw();
+  }
+
 #ifdef DEBUG
   MOZ_ASSERT(mPresArenaAllocCount == 0,
              "Some pres arena objects were not freed");
@@ -9920,7 +9929,7 @@ nsIPresShell::FontSizeInflationEnabled()
   return mFontSizeInflationEnabled;
 }
 
-void
+NS_IMETHODIMP
 nsIPresShell::SetMaxLineBoxWidth(nscoord aMaxLineBoxWidth)
 {
   NS_ASSERTION(aMaxLineBoxWidth >= 0, "attempting to set max line box width to a negative value");
@@ -9931,3 +9940,23 @@ nsIPresShell::SetMaxLineBoxWidth(nscoord aMaxLineBoxWidth)
     FrameNeedsReflow(GetRootFrame(), eResize, NS_FRAME_HAS_DIRTY_CHILDREN);
   }
 }
+
+NS_IMETHODIMP
+PresShell::PausePainting()
+{
+  if (GetPresContext()->RefreshDriver()->PresContext() != GetPresContext())
+    return;
+
+  mPaintingIsFrozen = true;
+  GetPresContext()->RefreshDriver()->Freeze();
+}
+
+NS_IMETHODIMP
+PresShell::ResumePainting()
+{
+  if (GetPresContext()->RefreshDriver()->PresContext() != GetPresContext())
+    return;
+
+  mPaintingIsFrozen = false;
+  GetPresContext()->RefreshDriver()->Thaw();
+}
diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h
index 8e14e4d8eef7..932f9662bb75 100644
--- a/layout/base/nsPresShell.h
+++ b/layout/base/nsPresShell.h
@@ -689,6 +689,9 @@ protected:
   virtual void ThemeChanged() MOZ_OVERRIDE { mPresContext->ThemeChanged(); }
   virtual void BackingScaleFactorChanged() MOZ_OVERRIDE { mPresContext->UIResolutionChanged(); }
 
+  virtual void PausePainting() MOZ_OVERRIDE;
+  virtual void ResumePainting() MOZ_OVERRIDE;
+
   void UpdateImageVisibility();
 
   nsRevocableEventPtr<nsRunnableMethod<PresShell> > mUpdateImageVisibilityEvent;
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 6e6b640b19a4..32e4b872992d 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -182,6 +182,11 @@ function doChangeMaxLineBoxWidth(aWidth) {
 
   if (range) {
     BrowserEventHandler._zoomInAndSnapToRange(range);
+  } else {
+    // In this case, we actually didn't zoom into a specific range. It probably
+    // happened from a page load reflow-on-zoom event, so we need to make sure
+    // painting is re-enabled.
+    BrowserApp.selectedTab.clearReflowOnZoomPendingActions();
   }
 }
 
@@ -2744,6 +2749,7 @@ Tab.prototype = {
     this.browser.addEventListener("MozApplicationManifest", this, true);
 
     Services.obs.addObserver(this, "before-first-paint", false);
+    Services.obs.addObserver(this, "after-viewport-change", false);
     Services.prefs.addObserver("browser.ui.zoom.force-user-scalable", this, false);
 
     if (aParams.delayLoad) {
@@ -2803,21 +2809,58 @@ Tab.prototype = {
     return minFontSize / this.getInflatedFontSizeFor(aElement);
   },
 
+  clearReflowOnZoomPendingActions: function() {
+    // Reflow was completed, so now re-enable painting.
+    let webNav = BrowserApp.selectedTab.window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation);
+    let docShell = webNav.QueryInterface(Ci.nsIDocShell);
+    let docViewer = docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
+    docViewer.resumePainting();
+
+    BrowserApp.selectedTab._mReflozPositioned = false;
+  },
+
+  /**
+   * Reflow on zoom consists of a few different sub-operations:
+   *
+   * 1. When a double-tap event is seen, we verify that the correct preferences
+   *    are enabled and perform the pre-position handling calculation. We also
+   *    signal that reflow-on-zoom should be performed at this time, and pause
+   *    painting.
+   * 2. During the next call to setViewport(), which is in the Tab prototype,
+   *    we detect that a call to changeMaxLineBoxWidth should be performed. If
+   *    we're zooming out, then the max line box width should be reset at this
+   *    time. Otherwise, we call performReflowOnZoom.
+   *   2a. PerformReflowOnZoom() and resetMaxLineBoxWidth() schedule a call to
+   *       doChangeMaxLineBoxWidth, based on a timeout specified in preferences.
+   * 3. doChangeMaxLineBoxWidth changes the line box width (which also
+   *    schedules a reflow event), and then calls _zoomInAndSnapToRange.
+   * 4. _zoomInAndSnapToRange performs the positioning of reflow-on-zoom and
+   *    then re-enables painting.
+   *
+   * Some of the events happen synchronously, while others happen asynchronously.
+   * The following is a rough sketch of the progression of events:
+   *
+   * double tap event seen -> onDoubleTap() -> ... asynchronous ...
+   *   -> setViewport() -> performReflowOnZoom() -> ... asynchronous ...
+   *   -> doChangeMaxLineBoxWidth() -> _zoomInAndSnapToRange()
+   *   -> ... asynchronous ... -> setViewport() -> Observe('after-viewport-change')
+   *   -> resumePainting()
+   */
   performReflowOnZoom: function(aViewport) {
-      let zoom = this._drawZoom ? this._drawZoom : aViewport.zoom;
+    let zoom = this._drawZoom ? this._drawZoom : aViewport.zoom;
 
-      let viewportWidth = gScreenWidth / zoom;
-      let reflozTimeout = Services.prefs.getIntPref("browser.zoom.reflowZoom.reflowTimeout");
+    let viewportWidth = gScreenWidth / zoom;
+    let reflozTimeout = Services.prefs.getIntPref("browser.zoom.reflowZoom.reflowTimeout");
 
-      if (gReflowPending) {
-        clearTimeout(gReflowPending);
-      }
+    if (gReflowPending) {
+      clearTimeout(gReflowPending);
+    }
 
-      // We add in a bit of fudge just so that the end characters
-      // don't accidentally get clipped. 15px is an arbitrary choice.
-      gReflowPending = setTimeout(doChangeMaxLineBoxWidth,
-                                  reflozTimeout,
-                                  viewportWidth - 15);
+    // We add in a bit of fudge just so that the end characters
+    // don't accidentally get clipped. 15px is an arbitrary choice.
+    gReflowPending = setTimeout(doChangeMaxLineBoxWidth,
+                                reflozTimeout,
+                                viewportWidth - 15);
   },
 
   /** 
@@ -2889,6 +2932,7 @@ Tab.prototype = {
     this.browser.removeEventListener("MozApplicationManifest", this, true);
 
     Services.obs.removeObserver(this, "before-first-paint");
+    Services.obs.removeObserver(this, "after-viewport-change");
     Services.prefs.removeObserver("browser.ui.zoom.force-user-scalable", this);
 
     // Make sure the previously selected panel remains selected. The selected panel of a deck is
@@ -3175,6 +3219,7 @@ Tab.prototype = {
       // In this case, the user pinch-zoomed in, so we don't want to
       // preserve position as we would with reflow-on-zoom.
       BrowserApp.selectedTab.probablyNeedRefloz = false;
+      BrowserApp.selectedTab.clearReflowOnZoomPendingActions();
       BrowserApp.selectedTab._mReflozPoint = null;
     }
 
@@ -4166,6 +4211,11 @@ Tab.prototype = {
           BrowserApp.selectedTab.performReflowOnZoom(vp);
         }
         break;
+      case "after-viewport-change":
+        if (BrowserApp.selectedTab._mReflozPositioned) {
+          BrowserApp.selectedTab.clearReflowOnZoomPendingActions();
+        }
+        break;
       case "nsPref:changed":
         if (aData == "browser.ui.zoom.force-user-scalable")
           ViewportHandler.updateMetadata(this, false);
@@ -4484,13 +4534,23 @@ var BrowserEventHandler = {
     if (BrowserEventHandler.mReflozPref &&
        !BrowserApp.selectedTab._mReflozPoint &&
        !this._shouldSuppressReflowOnZoom(element)) {
-     let data = JSON.parse(aData);
-     let zoomPointX = data.x;
-     let zoomPointY = data.y;
 
-     BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
-       range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
-       BrowserApp.selectedTab.probablyNeedRefloz = true;
+      // See comment above performReflowOnZoom() for a detailed description of
+      // the events happening in the reflow-on-zoom operation.
+      let data = JSON.parse(aData);
+      let zoomPointX = data.x;
+      let zoomPointY = data.y;
+
+      BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
+        range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
+
+      // Before we perform a reflow on zoom, let's disable painting.
+      let webNav = BrowserApp.selectedTab.window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation);
+      let docShell = webNav.QueryInterface(Ci.nsIDocShell);
+      let docViewer = docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
+      docViewer.pausePainting();
+
+      BrowserApp.selectedTab.probablyNeedRefloz = true;
     }
 
     if (!element) {
@@ -4590,11 +4650,7 @@ var BrowserEventHandler = {
   },
 
   _zoomInAndSnapToRange: function(aRange) {
-    if (!aRange) {
-      Cu.reportError("aRange is null in zoomInAndSnapToRange. Unable to maintain position.");
-      return;
-    }
-
+    // aRange is always non-null here, since a check happened previously.
     let viewport = BrowserApp.selectedTab.getViewport();
     let fudge = 15; // Add a bit of fudge.
     let boundingElement = aRange.offsetNode;
@@ -4617,6 +4673,8 @@ var BrowserEventHandler = {
     let leftAdjustment = parseInt(boundingStyle.paddingLeft) +
                          parseInt(boundingStyle.borderLeftWidth);
 
+    BrowserApp.selectedTab._mReflozPositioned = true;
+
     rect.type = "Browser:ZoomToRect";
     rect.x = Math.max(viewport.cssPageLeft, rect.x  - fudge + leftAdjustment);
     rect.y = Math.max(topPos, viewport.cssPageTop);
@@ -4625,22 +4683,22 @@ var BrowserEventHandler = {
 
     sendMessageToJava(rect);
     BrowserApp.selectedTab._mReflozPoint = null;
-   },
+  },
 
-   onPinchFinish: function(aData) {
-     let data = {};
-     try {
-       data = JSON.parse(aData);
-     } catch(ex) {
-       console.log(ex);
-       return;
-     }
+  onPinchFinish: function(aData) {
+    let data = {};
+    try {
+      data = JSON.parse(aData);
+    } catch(ex) {
+      console.log(ex);
+      return;
+    }
 
-     if (BrowserEventHandler.mReflozPref &&
-         data.zoomDelta < 0.0) {
-       BrowserEventHandler.resetMaxLineBoxWidth();
-     }
-   },
+    if (BrowserEventHandler.mReflozPref &&
+        data.zoomDelta < 0.0) {
+      BrowserEventHandler.resetMaxLineBoxWidth();
+    }
+  },
 
   _shouldZoomToElement: function(aElement) {
     let win = aElement.ownerDocument.defaultView;

From c6a4317e0ff0c0d7a22cf2981edee7a4f403c5a3 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Wed, 18 Dec 2013 23:05:24 -0800
Subject: [PATCH 32/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0445fcd57874
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14256 from huchengtw-moz/gallery/Bug_877521_the_warning_message_of_pick_is_wrong

Bug 877521 - [Contacts][UX] The warning message of add picture is wrong., r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/f9383043f94e
Author: John Hu <johu@mozilla.com>
Desc: Bug 877521 - [Contacts][UX] The warning message of add picture is wrong.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e80ba4e990fb..8da23eafe052 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "c6aeaa41977d9410b9baac23ccea6909f796fd1f", 
+    "revision": "0445fcd57874f607dbba2395195c9b595aaf8a8a", 
     "repo_path": "/integration/gaia-central"
 }

From be0f61b915b53a71d238a70ef5c48ae320ec7769 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 00:05:24 -0800
Subject: [PATCH 33/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3e924f3b2ffe
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #14610 from crdlc/bug-948934

Bug 948934 - [Download Manager] The downloading icon is not displayed du...

========

https://hg.mozilla.org/integration/gaia-central/rev/285ad848f079
Author: crdlc <crdlc@tid.es>
Desc: Bug 948934 - [Download Manager] The downloading icon is not displayed during the download
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 8da23eafe052..25353e38243e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "0445fcd57874f607dbba2395195c9b595aaf8a8a", 
+    "revision": "3e924f3b2ffee0c39a2bc1566508f003f6e7244d", 
     "repo_path": "/integration/gaia-central"
 }

From 4b0234cec32258d9a67cda7ba764ff4d7e94c50b Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 00:55:24 -0800
Subject: [PATCH 34/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/f46b625940b8
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #14777 from gtorodelvalle/contacts-bug-948817-enter-clears-custom-tag

Bug 948817 - [fugu][buri][contact] tap on 'enter' on keyboard will clear all input in custom label (r=jmcanterafonseca)

========

https://hg.mozilla.org/integration/gaia-central/rev/826f317dfd6c
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 948817 - [fugu][buri][contact] tap on 'enter' on keyboard will clear all input in custom label
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 25353e38243e..9e4180ab3735 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "3e924f3b2ffee0c39a2bc1566508f003f6e7244d", 
+    "revision": "f46b625940b8a7619e9ae72f865f69c5da62861a", 
     "repo_path": "/integration/gaia-central"
 }

From 3366fc3a6237f40d9797a47a1de51ebdaf5f2832 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 01:20:24 -0800
Subject: [PATCH 35/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a384d0c712fc
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #14683 from snowmantw/issue945601

Bug 945601 - [LockScreen] The acceleration mode of LockScreen should be more smooth

========

https://hg.mozilla.org/integration/gaia-central/rev/5068ccf8638f
Author: Greg Weng (snowmantw) <gweng@mozilla.com>
Desc: Bug 945601 - [LockScreen] The acceleration mode of LockScreen should be more smooth
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 9e4180ab3735..c36d1aeab3c0 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "f46b625940b8a7619e9ae72f865f69c5da62861a", 
+    "revision": "a384d0c712fcd8063267c09cdf430a87969948df", 
     "repo_path": "/integration/gaia-central"
 }

From 6e31ce70c1e080df1db5356b29a52563f2bdbdad Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 01:35:24 -0800
Subject: [PATCH 36/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/7725ca500b74
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Merge pull request #14831 from mpizza/Bug_937487_handle_activity

Bug 937487 - Keyboard won't disappear after focusing an input and then l... r=alive.

========

https://hg.mozilla.org/integration/gaia-central/rev/df2fb59f6372
Author: mpizza <mmm198219@gmail.com>
Desc: Bug 937487 - Keyboard won't disappear after focusing an input and then launch an activity
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c36d1aeab3c0..d7a4b489a84e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "a384d0c712fcd8063267c09cdf430a87969948df", 
+    "revision": "7725ca500b74da11277068eb670575a59d279081", 
     "repo_path": "/integration/gaia-central"
 }

From 657538c3112ac693a4354ada15ae52831597adfe Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 02:45:25 -0800
Subject: [PATCH 37/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f299a464ccbb
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #14639 from crh0716/913326

Bug 913326 - Set voice privacy mode at startup r=alive, jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/43f6981acc53
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 913326 - Set voice privacy mode at startup
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index d7a4b489a84e..1711aa12f8a9 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "7725ca500b74da11277068eb670575a59d279081", 
+    "revision": "f299a464ccbb8c6d1b66faaeed7232a9339f8766", 
     "repo_path": "/integration/gaia-central"
 }

From c24ec70f79b898dd9bb93275c4eec3913e30a52b Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 03:00:24 -0800
Subject: [PATCH 38/78] Bumping gaia.json for 4 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b6654a95fe1c
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14827 from bobsilverberg/persona_frames

Bug 937336 - Remove where possible explicit frame switching

========

https://hg.mozilla.org/integration/gaia-central/rev/35fc70e3442c
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 937336 - Remove where possible explicit frame switching

Change to Persona test

========

https://hg.mozilla.org/integration/gaia-central/rev/7b7dde8a85e7
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14826 from bobsilverberg/kb_frames

Bug 937336 - Remove where possible explicit frame switching

========

https://hg.mozilla.org/integration/gaia-central/rev/f1ed0aa660bb
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 937336 - Remove where possible explicit frame switching

Remove explicit frame switching from keyboard tests
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 1711aa12f8a9..5c8fd89305a9 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "f299a464ccbb8c6d1b66faaeed7232a9339f8766", 
+    "revision": "b6654a95fe1cc66f8fecc14c8a72f7b075845891", 
     "repo_path": "/integration/gaia-central"
 }

From e641eda400b40b26a254a5581f1c60febcfc2c2e Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 03:10:24 -0800
Subject: [PATCH 39/78] Bumping gaia.json for 6 gaia-central revision(s)
 a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/5dac5b9a59b4
Author: Carmen Jiménez <cjc@tid.es>
Desc: Merge pull request #14803 from mcjimenez/bug951552

Bug 951552 - Incorrect behavior when first boot is run with a pin locked SIM (and no PIN is entered)

========

https://hg.mozilla.org/integration/gaia-central/rev/5898eab7c7b8
Author: Carmen Jimenez Cabezas <cjc@tid.es>
Desc: Bug 951552 - Incorrect behavior when first boot is run with a pin locked SIM (and no PIN is entered)

========

https://hg.mozilla.org/integration/gaia-central/rev/8408e2616d93
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #14536 from borjasalguero/dm_demo_editmode

Bug 935100 - [Download Manager] Download list edit mode r=kaze, arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/91ea06f3c3b7
Author: borjasalguero <fbsc@tid.es>
Desc: Bug 935100 - [Download Manager] Download list edit mode r=kaze, arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/9db43d4417bd
Author: AndreiH <andrei.hutusoru@gmail.com>
Desc: Merge pull request #14830 from askeing/951985

Bug 951985 - Unxfail test_gallery_crop_photo.py and test_browser_play_yo...

========

https://hg.mozilla.org/integration/gaia-central/rev/0ac7cc8c05fb
Author: askeing <askeing@gmail.com>
Desc: Bug 951985 - Unxfail test_gallery_crop_photo.py and test_browser_play_youtube_video.py
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 5c8fd89305a9..7be48bba2c0e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "b6654a95fe1cc66f8fecc14c8a72f7b075845891", 
+    "revision": "5dac5b9a59b4d382b63707383bcd3cfb729e57ff", 
     "repo_path": "/integration/gaia-central"
 }

From 9519cb0b5847ef3193921ffab8abb9e33aff4535 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 04:00:23 -0800
Subject: [PATCH 40/78] Bumping gaia.json for 3 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2fa554a9d4ab
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14728 from etiennesegonzac/bug-947863-basic-dialer-marionette-js

Bug 947863 - Sanity marionette JS integration tests for the Dialer r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/389f42e62170
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 947863 - Sanity marionette JS integration tests for the Dialer
(keypad and tab navigation)

========

https://hg.mozilla.org/integration/gaia-central/rev/d855b1859bca
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Revert "Bug 951570 - Disable persona tests they failing because of http://personatestuser.org/"

This reverts commit 04af8c92f3539454135fb59f5cc85f6a3fb4b64a.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 7be48bba2c0e..3d53dabfce97 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "5dac5b9a59b4d382b63707383bcd3cfb729e57ff", 
+    "revision": "2fa554a9d4ab5f268e5844a814525758cfe0a1bc", 
     "repo_path": "/integration/gaia-central"
 }

From 47efbe801fe3ff692a0e80853fc66d8f5d5f3d01 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 04:15:28 -0800
Subject: [PATCH 41/78] Bumping gaia.json for 4 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c1474e9b2766
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #14396 from jmcanterafonseca/fix_sms_fb_photos

Bug 907740 - [messages] sending message to Facebook contacts results in ...

========

https://hg.mozilla.org/integration/gaia-central/rev/ec4a4e09026a
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 907740 - [messages] sending message to Facebook contacts results in phone number not contact name being displayed

========

https://hg.mozilla.org/integration/gaia-central/rev/d3bb7d41cacc
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14823 from bobsilverberg/video_frames

Bug 937336 - Remove where possible explicit frame switching

========

https://hg.mozilla.org/integration/gaia-central/rev/510c0bfeecb3
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 937336 - Remove where possible explicit frame switching

Remove explicit frame switching *and* unneeded locators from videoplayer app
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 3d53dabfce97..520c52507b5d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "2fa554a9d4ab5f268e5844a814525758cfe0a1bc", 
+    "revision": "c1474e9b276699c6ecb2d6336e9e3f27dbb46cc3", 
     "repo_path": "/integration/gaia-central"
 }

From 2fa0946bff2844612cb86a9243996b1a9c47a65c Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 04:35:24 -0800
Subject: [PATCH 42/78] Bumping gaia.json for 4 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8dd8d8a8d987
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14825 from bobsilverberg/ftu_frames

Bug 937336 - Remove where possible explicit frame switching

========

https://hg.mozilla.org/integration/gaia-central/rev/976214918eb6
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 937336 - Remove where possible explicit frame switching

Replace calls to marionette.switch_to_frame(self.app.frame) in FTU test with apps.switch_to_displayed_app()

========

https://hg.mozilla.org/integration/gaia-central/rev/e127a5af0224
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14820 from bobsilverberg/contacts_frames

Bug 937336 - Remove where possible explicit frame switching

========

https://hg.mozilla.org/integration/gaia-central/rev/1ed9189786ae
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 937336 - Remove where possible explicit frame switching

Changes to Contacts app, where possible
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 520c52507b5d..6f10c3d028e2 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "c1474e9b276699c6ecb2d6336e9e3f27dbb46cc3", 
+    "revision": "8dd8d8a8d9871a38addc04c623f1e417ce8cdebc", 
     "repo_path": "/integration/gaia-central"
 }

From 204dd07d1bdf76a071af6ab5180e1982b3df103d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez?= <ferjmoreno@gmail.com>
Date: Thu, 19 Dec 2013 13:42:22 +0100
Subject: [PATCH 43/78] Bug 947860 - Expose data SIM information instead of
 first SIM in the WebPaymentProvider API. r=fabrice

---
 b2g/chrome/content/payment.js | 77 ++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/b2g/chrome/content/payment.js b/b2g/chrome/content/payment.js
index ba1b43b8d858..2eb3cbb5c973 100644
--- a/b2g/chrome/content/payment.js
+++ b/b2g/chrome/content/payment.js
@@ -51,7 +51,14 @@ XPCOMUtils.defineLazyServiceGetter(this, "smsService",
                                    "@mozilla.org/sms/smsservice;1",
                                    "nsISmsService");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gSettingsService",
+                                   "@mozilla.org/settingsService;1",
+                                   "nsISettingsService");
+
 const kSilentSmsReceivedTopic = "silent-sms-received";
+const kMozSettingsChangedObserverTopic = "mozsettings-changed";
+
+const kRilDefaultDataServiceId = "ril.data.defaultServiceId";
 
 const MOBILEMESSAGECALLBACK_CID =
   Components.ID("{b484d8c9-6be4-4f94-ab60-c9c7ebcc853d}");
@@ -61,6 +68,7 @@ const MOBILEMESSAGECALLBACK_CID =
 // from JS.
 function SilentSmsRequest() {
 }
+
 SilentSmsRequest.prototype = {
   __exposedProps__: {
     onsuccess: 'rw',
@@ -80,19 +88,70 @@ SilentSmsRequest.prototype = {
   },
 
   notifyMessageSent: function notifyMessageSent(aMessage) {
-    if (_DEBUG) {
-      _debug("Silent message successfully sent");
+    if (_debug) {
+      LOG("Silent message successfully sent");
     }
     this._onsuccess(aMessage);
   },
 
   notifySendMessageFailed: function notifySendMessageFailed(aError) {
-    if (_DEBUG) {
-      _debug("Error sending silent message " + aError);
+    if (_debug) {
+      LOG("Error sending silent message " + aError);
     }
     this._onerror(aError);
   }
 };
+
+function PaymentSettings() {
+  this.dataServiceId = 0;
+  Services.obs.addObserver(this, kMozSettingsChangedObserverTopic, false);
+  gSettingsService.createLock().get(kRilDefaultDataServiceId, this);
+}
+
+PaymentSettings.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISettingsServiceCallback,
+                                         Ci.nsIObserver]),
+
+  handle: function(aName, aValue) {
+    if (aName != kRilDefaultDataServiceId) {
+      return;
+    }
+
+    this.dataServiceId = aValue;
+
+    if (_debug) {
+      LOG("dataServiceId " + this.dataServiceId);
+    }
+  },
+
+  observe: function(aSubject, aTopic, aData) {
+    if (aTopic != kMozSettingsChangedObserverTopic) {
+      return;
+    }
+
+    try {
+      let setting = JSON.parse(aData);
+      if (!setting.key || setting.key !== kRilDefaultDataServiceId) {
+        return;
+      }
+
+      this.dataServiceId = setting.value;
+
+      if (_debug) {
+        LOG("dataServiceId " + setting.value);
+      }
+    } catch (e) {
+      if (_debug) {
+        LOG(e);
+      }
+    }
+
+  },
+
+  cleanup: function() {
+    Services.obs.removeObserver(this, kMozSettingsChangedObserverTopic);
+  }
+};
 #endif
 
 const kClosePaymentFlowEvent = "close-payment-flow-dialog";
@@ -120,6 +179,12 @@ let PaymentProvider = {
   },
 #endif
 
+  _init: function _init() {
+#ifdef MOZ_B2G_RIL
+    this._settings = new PaymentSettings();
+#endif
+  },
+
   _closePaymentFlowDialog: function _closePaymentFlowDialog(aCallback) {
     // After receiving the payment provider confirmation about the
     // successful or failed payment flow, we notify the UI to close the
@@ -194,7 +259,7 @@ let PaymentProvider = {
   // Bug 938993. Support Multi-SIM for Payments.
   get iccInfo() {
     delete this.iccInfo;
-    return this.iccInfo = iccProvider.getIccInfo(0);
+    return this.iccInfo = iccProvider.getIccInfo(this._settings.dataServiceId);
   },
 
   get iccIds() {
@@ -304,6 +369,7 @@ let PaymentProvider = {
     }
     this._silentNumbers = null;
     this._silentSmsObservers = null;
+    this._settings.cleanup();
     Services.obs.removeObserver(this._onSilentSms, kSilentSmsReceivedTopic);
   }
 #endif
@@ -313,6 +379,7 @@ let PaymentProvider = {
 // of the payment flow to the appropriate content process.
 addMessageListener("Payment:LoadShim", function receiveMessage(aMessage) {
   gRequestId = aMessage.json.requestId;
+  PaymentProvider._init();
 });
 
 addEventListener("DOMWindowCreated", function(e) {

From 518846479f3dfab70cd7feedcf19191f67eb9452 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 04:50:23 -0800
Subject: [PATCH 44/78] Bumping gaia.json for 4 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/dca5b1968d52
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #14659 from gasolin/issue-950080

Bug 950080 - add jsdoc generator to gaia, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/a8f580858033
Author: gasolin <gasolin@gmail.com>
Desc: Bug 950080 - add jsdoc generator to gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/a382eadb472f
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13701 from viorelaioia/bug-932723

Bug 932723 - Add a test to verify that received SMS are notified to the user

========

https://hg.mozilla.org/integration/gaia-central/rev/41e10935117e
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 932723 - Add a test to verify that received SMS are notified to the user
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 6f10c3d028e2..05735159db57 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "8dd8d8a8d9871a38addc04c623f1e417ce8cdebc", 
+    "revision": "dca5b1968d528f745848e6b383392e377878b5e6", 
     "repo_path": "/integration/gaia-central"
 }

From 237ff92ac13cef9a06836d0d475bc98f06df70f3 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 05:01:24 -0800
Subject: [PATCH 45/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d8b00e25a044
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14816 from bobsilverberg/mozdevice

Bug 949730 - Investigate test_cleanup_scard unittest failure

========

https://hg.mozilla.org/integration/gaia-central/rev/396b0121b249
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 949730 - Investigate test_cleanup_scard unittest failure

Updating to mozbase 0.31 resolves this issue
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 05735159db57..764bbd27a06f 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "dca5b1968d528f745848e6b383392e377878b5e6", 
+    "revision": "d8b00e25a044b4d5cc003b3f641888628bf79f83", 
     "repo_path": "/integration/gaia-central"
 }

From bb8080b321bd6ba46e80fd74b6cfdf9fcc89c0cc Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 05:40:23 -0800
Subject: [PATCH 46/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/accc7ace2d01
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #14805 from viorelaioia/bug_951122

Bug 951122 - Merge test_fmradio_find_station tests

========

https://hg.mozilla.org/integration/gaia-central/rev/7560bb230735
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 951122 - Merge test_fmradio_find_station tests
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 764bbd27a06f..f6bf24d58dc4 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "d8b00e25a044b4d5cc003b3f641888628bf79f83", 
+    "revision": "accc7ace2d016aa2d403c781422d9086a5e6ea40", 
     "repo_path": "/integration/gaia-central"
 }

From 47f11ec472408a97edabed2642b2a2c952278cc6 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 06:55:24 -0800
Subject: [PATCH 47/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/88106831512f
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #14846 from AndreiH/bug949467

Bug 949467 - Fix intermittent fail in test_homescreen_delete_app

========

https://hg.mozilla.org/integration/gaia-central/rev/054646e91744
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 949467 - Fix intermittent fail in test_homescreen_delete_app
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index f6bf24d58dc4..a646442906d6 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "accc7ace2d016aa2d403c781422d9086a5e6ea40", 
+    "revision": "88106831512f2323b99fa85e701c8e87a27ed813", 
     "repo_path": "/integration/gaia-central"
 }

From 34d8b0ff9bcedabfedf250144d4a1aa68175a43d Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 07:15:24 -0800
Subject: [PATCH 48/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/47840abc782b
Author: John Ford <john@johnford.info>
Desc: Merge pull request #14453 from arroway/bug-945111

Bug 945111 - [settings] Update permissions_table to match PermissionsTab...

========

https://hg.mozilla.org/integration/gaia-central/rev/b03506352d01
Author: Stephanie Ouillon <arroway@mozilla.com>
Desc: [settings] Update permissions_table to match PermissionsTable.jsm
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a646442906d6..c164b07993ed 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "88106831512f2323b99fa85e701c8e87a27ed813", 
+    "revision": "47840abc782b71ca2340a13a9203f657f7c72069", 
     "repo_path": "/integration/gaia-central"
 }

From 2288861b6876432596face5149d5a908c123d317 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 07:21:24 -0800
Subject: [PATCH 49/78] Bumping gaia.json for 24 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ca9192135fb8
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/b46e91c2a2ee
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14844 from comoyo/952086

Bug 952086 - Load forms.js in desktop helper r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/c404986c86a9
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 952086 - Load forms.js in desktop helper

========

https://hg.mozilla.org/integration/gaia-central/rev/40772fe0b247
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 949730 - Investigate test_cleanup_scard unittest failure for breaking gaia ui tests"

This reverts commit f916c32b344bb66135c540a0f083454a3e6aab68.

========

https://hg.mozilla.org/integration/gaia-central/rev/720244c42304
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #14839 from KevinGrandon/rocketbar2

Bug 946452 - Rocketbar Search App

========

https://hg.mozilla.org/integration/gaia-central/rev/e236dc95d16f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 946533 - [Rocketbar] Follow-up, update tests r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/95862adfdb92
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 951242 - [Rocketbar] Eme followup, make links work r=amir

========

https://hg.mozilla.org/integration/gaia-central/rev/451b83237080
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 951242 - [Rocketbar] E.me should show result icons [r=kgrandon]

========

https://hg.mozilla.org/integration/gaia-central/rev/0cb0d539981b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 951711 - [Rocketbar] Style results, fix entrypoints r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/c99e4dd8e0b3
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 951721 - Search when entering invalid url. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/ee45c0d07b55
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 948302 - [Rocketbar] Entering URL launches browser frame r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/7581f2c97fc5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 951179 - [Rocketbar] Gaia ui tests failing for E.me launch r=amir

========

https://hg.mozilla.org/integration/gaia-central/rev/7f91e7a1f572
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 951217 - [Rocketbar] Enable both rocketbar and utilities when pref is enabled r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/bdbf21135297
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 951140 - [Rocketbar] Input content and visual tweaks r=amir

========

https://hg.mozilla.org/integration/gaia-central/rev/bf8fde6075dc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 950668 - [Rocketbar] Allow other apps to activate Rocketbar r=ran

========

https://hg.mozilla.org/integration/gaia-central/rev/22f91fceefa0
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 950720 - [Rocketbar] [e.me] Rocketbar should show E.me results [r=kgrandon]

========

https://hg.mozilla.org/integration/gaia-central/rev/911e79500d9d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 950686 - [Rocketbar] Search app transition cleanup r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/7c69bf3db916
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 950615 - [Rocketbar] Add submit key indication [r=kevin]

========

https://hg.mozilla.org/integration/gaia-central/rev/4c8e9559747d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 948461 - [Rocketbar] Create port between search results and E.me r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/d0514887f9ac
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 950569 - [Rocketbar] Use IACHandler for inter-app communication r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/6ca80ae9919b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 946533 - [Rocketbar] Add some tests r=jugglinmike

========

https://hg.mozilla.org/integration/gaia-central/rev/60e1f57f989d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 946884 - [Rocketbar] Implement preference for search app url r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/0da22462323f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 946455 - [Rocketbar] Add local app search to rocketbar r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/a1593f508413
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 942175 - [Rocketbar] Add a search bar at the system level r=vingtetun
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c164b07993ed..82c9deba4eb8 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "47840abc782b71ca2340a13a9203f657f7c72069", 
+    "revision": "ca9192135fb8852cab1dadde6f685c959177f27a", 
     "repo_path": "/integration/gaia-central"
 }

From 69468dcba7bb24820838d222c5c20909979d65be Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 07:30:24 -0800
Subject: [PATCH 50/78] Bumping gaia.json for 4 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a0fe79aab4bb
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #14766 from comoyo/dutch_apostroph

Bug 951190 - Remove ' from Dutch keyboard. r=rlu

========

https://hg.mozilla.org/integration/gaia-central/rev/1431692a3f68
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 951190 - Remove ' from Dutch keyboard

========

https://hg.mozilla.org/integration/gaia-central/rev/87c44b7e37ec
Author: Askeing Yen (fyen) <askeing@gmail.com>
Desc: Merge pull request #14791 from askeing/951516

Bug 951516 - Intermittent of email tests

========

https://hg.mozilla.org/integration/gaia-central/rev/a9b3b4e52484
Author: askeing <askeing@gmail.com>
Desc: Bug 951516 - Intermittent of email tests
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 82c9deba4eb8..ee29effacdee 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "ca9192135fb8852cab1dadde6f685c959177f27a", 
+    "revision": "a0fe79aab4bbb2046d5386046ec34234a24ebaf8", 
     "repo_path": "/integration/gaia-central"
 }

From d2d7c07e2ee34589dd25813150d6262d30f1a05b Mon Sep 17 00:00:00 2001
From: Yuan Xulei <xyuan@mozilla.com>
Date: Thu, 19 Dec 2013 11:05:12 -0500
Subject: [PATCH 51/78] Bug 932145 - Mochitest support for Keyboard/IME API.
 r=fabrice

---
 dom/inputmethod/Keyboard.jsm                  |  24 ++--
 dom/inputmethod/mochitest/file_test_app.html  |  10 ++
 .../mochitest/inputmethod_common.js           |  32 +++++
 dom/inputmethod/mochitest/mochitest.ini       |   7 +
 dom/inputmethod/mochitest/moz.build           |   8 ++
 dom/inputmethod/mochitest/test_basic.html     | 134 ++++++++++++++++++
 dom/inputmethod/moz.build                     |   2 +
 testing/mochitest/android.json                |   1 +
 testing/mochitest/androidx86.json             |   1 +
 9 files changed, 211 insertions(+), 8 deletions(-)
 create mode 100644 dom/inputmethod/mochitest/file_test_app.html
 create mode 100644 dom/inputmethod/mochitest/inputmethod_common.js
 create mode 100644 dom/inputmethod/mochitest/mochitest.ini
 create mode 100644 dom/inputmethod/mochitest/moz.build
 create mode 100644 dom/inputmethod/mochitest/test_basic.html

diff --git a/dom/inputmethod/Keyboard.jsm b/dom/inputmethod/Keyboard.jsm
index 14b56041be66..a0e5bde5707a 100644
--- a/dom/inputmethod/Keyboard.jsm
+++ b/dom/inputmethod/Keyboard.jsm
@@ -103,7 +103,12 @@ this.Keyboard = {
         return;
       }
 
-      if (!mm.assertPermission("input")) {
+      let testing = false;
+      try {
+        testing = Services.prefs.getBoolPref("dom.mozInputMethod.testing");
+      } catch (e) {
+      }
+      if (!testing && !mm.assertPermission("input")) {
         dump("Keyboard message " + msg.name +
         " from a content process with no 'input' privileges.");
         return;
@@ -180,11 +185,9 @@ this.Keyboard = {
   handleFocusChange: function keyboardHandleFocusChange(msg) {
     this.forwardEvent('Keyboard:FocusChange', msg);
 
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-
     // Chrome event, used also to render value selectors; that's why we need
     // the info about choices / min / max here as well...
-    browser.shell.sendChromeEvent({
+    this.sendChromeEvent({
       type: 'inputmethod-contextchange',
       inputType: msg.data.type,
       value: msg.data.value,
@@ -219,15 +222,13 @@ this.Keyboard = {
   },
 
   showInputMethodPicker: function keyboardShowInputMethodPicker() {
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-    browser.shell.sendChromeEvent({
+    this.sendChromeEvent({
       type: "inputmethod-showall"
     });
   },
 
   switchToNextInputMethod: function keyboardSwitchToNextInputMethod() {
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-    browser.shell.sendChromeEvent({
+    this.sendChromeEvent({
       type: "inputmethod-next"
     });
   },
@@ -267,6 +268,13 @@ this.Keyboard = {
     this._layouts = layouts;
 
     ppmm.broadcastAsyncMessage('Keyboard:LayoutsChange', layouts);
+  },
+
+  sendChromeEvent: function(event) {
+    let browser = Services.wm.getMostRecentWindow("navigator:browser");
+    if (browser && browser.shell) {
+      browser.shell.sendChromeEvent(event);;
+    }
   }
 };
 
diff --git a/dom/inputmethod/mochitest/file_test_app.html b/dom/inputmethod/mochitest/file_test_app.html
new file mode 100644
index 000000000000..8cecee853338
--- /dev/null
+++ b/dom/inputmethod/mochitest/file_test_app.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<input id="test-input" type="text" value="Yuan" x-inputmode="verbatim" lang="zh"/>
+<script type="application/javascript;version=1.7">
+  let input = document.getElementById('test-input');
+  input.focus();
+</script>
+</body>
+</html>
diff --git a/dom/inputmethod/mochitest/inputmethod_common.js b/dom/inputmethod/mochitest/inputmethod_common.js
new file mode 100644
index 000000000000..f5b3a90d68fc
--- /dev/null
+++ b/dom/inputmethod/mochitest/inputmethod_common.js
@@ -0,0 +1,32 @@
+function inputmethod_setup(callback) {
+  SimpleTest.waitForExplicitFinish();
+  let appInfo = SpecialPowers.Cc['@mozilla.org/xre/app-info;1']
+                .getService(SpecialPowers.Ci.nsIXULAppInfo);
+  if (appInfo.name != 'B2G') {
+    SpecialPowers.Cu.import("resource://gre/modules/Keyboard.jsm", this);
+  }
+
+  let permissions = [];
+  ['input-manage', 'browser'].forEach(function(name) {
+    permissions.push({
+      type: name,
+      allow: true,
+      context: document
+    });
+  });
+
+  SpecialPowers.pushPermissions(permissions, function() {
+    let prefs = [
+      ['dom.mozBrowserFramesEnabled', true],
+      // Enable navigator.mozInputMethod.
+      ['dom.mozInputMethod.enabled', true],
+      // Bypass the permission check for mozInputMethod API.
+      ['dom.mozInputMethod.testing', true]
+    ];
+    SpecialPowers.pushPrefEnv({set: prefs}, callback);
+  });
+}
+
+function inputmethod_cleanup() {
+  SimpleTest.finish();
+}
diff --git a/dom/inputmethod/mochitest/mochitest.ini b/dom/inputmethod/mochitest/mochitest.ini
new file mode 100644
index 000000000000..84c391c2eb68
--- /dev/null
+++ b/dom/inputmethod/mochitest/mochitest.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+  inputmethod_common.js
+  file_test_app.html
+
+[test_basic.html]
+
diff --git a/dom/inputmethod/mochitest/moz.build b/dom/inputmethod/mochitest/moz.build
new file mode 100644
index 000000000000..3cf16eb0cfe8
--- /dev/null
+++ b/dom/inputmethod/mochitest/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+MOCHITEST_MANIFESTS += ['mochitest.ini']
+
diff --git a/dom/inputmethod/mochitest/test_basic.html b/dom/inputmethod/mochitest/test_basic.html
new file mode 100644
index 000000000000..e673ebaaa93b
--- /dev/null
+++ b/dom/inputmethod/mochitest/test_basic.html
@@ -0,0 +1,134 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=932145
+-->
+<head>
+  <title>Basic test for InputMethod API.</title>
+  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.7" src="inputmethod_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=932145">Mozilla Bug 932145</a>
+<p id="display"></p>
+<pre id="test">
+<script class="testbody" type="application/javascript;version=1.7">
+
+// The input context.
+var gContext = null;
+
+inputmethod_setup(function() {
+  runTest();
+});
+
+function runTest() {
+  let im = navigator.mozInputMethod;
+
+  im.oninputcontextchange = function() {
+    ok(true, 'inputcontextchange event was fired.');
+    im.oninputcontextchange = null;
+
+    gContext = im.inputcontext;
+    if (!gContext) {
+      ok(false, 'Should have a non-null inputcontext.');
+      inputmethod_cleanup();
+      return;
+    }
+
+    todo_is(gContext.type, 'input', 'The input context type should match.');
+    is(gContext.inputType, 'text', 'The inputType should match.');
+    is(gContext.inputMode, 'verbatim', 'The input mode should match.');
+    is(gContext.lang, 'zh', 'The language should match.');
+    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yuan',
+       'Should get the text around the cursor.');
+
+    test_setSelectionRange();
+  };
+
+  // Set current page as an input method.
+  SpecialPowers.wrap(im).setActive(true);
+
+  let iframe = document.createElement('iframe');
+  iframe.src = 'file_test_app.html';
+  iframe.setAttribute('mozbrowser', true);
+  document.body.appendChild(iframe);
+}
+
+function test_setSelectionRange() {
+  // Move cursor position to 2.
+  gContext.setSelectionRange(2, 0).then(function() {
+    is(gContext.selectionStart, 2, 'selectionStart was set successfully.');
+    is(gContext.selectionEnd, 2, 'selectionEnd was set successfully.');
+    test_sendKey();
+  }, function(e) {
+    ok(false, 'setSelectionRange failed:' + e.name);
+    inputmethod_cleanup();
+  });
+}
+
+function test_sendKey() {
+  // Add '-' to current cursor posistion and move the cursor position to 3.
+  gContext.sendKey(0, '-'.charCodeAt(0), 0).then(function() {
+    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yu-an',
+       'sendKey should changed the input field correctly.');
+    test_deleteSurroundingText();
+  }, function(e) {
+    ok(false, 'sendKey failed:' + e.name);
+    inputmethod_cleanup();
+  });
+}
+
+function test_deleteSurroundingText() {
+  // Remove one character before current cursor position and move the cursor
+  // position back to 2.
+  gContext.deleteSurroundingText(1, 0).then(function() {
+    ok(true, 'deleteSurroundingText finished');
+    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yuan',
+       'deleteSurroundingText should changed the input field correctly.');
+    test_replaceSurroundingText();
+  }, function(e) {
+    ok(false, 'deleteSurroundingText failed:' + e.name);
+    inputmethod_cleanup();
+  });
+}
+
+function test_replaceSurroundingText() {
+  // Replace 'Yuan' with 'Xulei'.
+  gContext.replaceSurroundingText('Xulei', 2, 2).then(function() {
+    ok(true, 'replaceSurroundingText finished');
+    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Xulei',
+       'replaceSurroundingText changed the input field correctly.');
+    test_setComposition();
+  }, function(e) {
+    ok(false, 'replaceSurroundingText failed: ' + e.name);
+    inputmethod_cleanup();
+  });
+}
+
+function test_setComposition() {
+  gContext.setComposition('XXX').then(function() {
+    ok(true, 'setComposition finished');
+    test_endComposition();
+  }, function(e) {
+    ok(false, 'setComposition failed: ' + e.name);
+    inputmethod_cleanup();
+  });
+}
+
+function test_endComposition() {
+  gContext.endComposition('2013').then(function() {
+    todo_is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Xulei2013',
+       'endComposition changed the input field correctly.');
+    inputmethod_cleanup();
+  }, function (e) {
+    ok(false, 'endComposition failed: ' + e.name);
+    inputmethod_cleanup();
+  });
+}
+
+</script>
+</pre>
+</body>
+</html>
+
diff --git a/dom/inputmethod/moz.build b/dom/inputmethod/moz.build
index e798c584285b..3f68aa509c43 100644
--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@@ -4,6 +4,8 @@
 # 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/.
 
+TEST_DIRS += ['mochitest']
+
 XPIDL_SOURCES += [
     'nsIB2GKeyboard.idl',
 ]
diff --git a/testing/mochitest/android.json b/testing/mochitest/android.json
index 41ff12af9b4d..8e5febcb1b8e 100644
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -138,6 +138,7 @@
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_inproc.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_oop.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_oop_inproc.html": "No test app installed",
+ "dom/inputmethod": "Not supported on Android",
  "dom/network/tests/test_network_basics.html": "",
  "dom/permission/tests/test_permission_basics.html": "",
  "dom/mobilemessage/tests/test_sms_basics.html": "Bug 909036",
diff --git a/testing/mochitest/androidx86.json b/testing/mochitest/androidx86.json
index d093569dee54..aa9e15edf074 100644
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -215,6 +215,7 @@
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_inproc.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_oop.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_oop_inproc.html": "No test app installed",
+ "dom/inputmethod": "Not supported on Android",
  "dom/media/tests/ipc/test_ipc.html": "x86 only bug 936226",
  "dom/network/tests/test_network_basics.html": "",
  "dom/permission/tests/test_permission_basics.html": "",

From b00a679c4b31a4cd31fe6f5d527c5b796a7359ed Mon Sep 17 00:00:00 2001
From: Gabriele Svelto <gsvelto@mozilla.com>
Date: Wed, 18 Dec 2013 17:19:42 +0100
Subject: [PATCH 52/78] Bug 950105 - Escape reserved characters when converting
 a WBXML document to XML. r=vicamo, r=chucklee

---
 dom/wappush/src/gonk/WbxmlPduHelper.jsm | 37 +++++++++++++++++++++++--
 dom/wappush/tests/test_si_pdu_helper.js | 29 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/dom/wappush/src/gonk/WbxmlPduHelper.jsm b/dom/wappush/src/gonk/WbxmlPduHelper.jsm
index f58577b2e9b4..69e154af4159 100644
--- a/dom/wappush/src/gonk/WbxmlPduHelper.jsm
+++ b/dom/wappush/src/gonk/WbxmlPduHelper.jsm
@@ -93,6 +93,35 @@ this.WbxmlEnd = {
   },
 };
 
+/**
+ * Escape XML reserved characters &, <, >, " and ' which may appear in the
+ * WBXML-encoded strings in their original form.
+ *
+ * @param str
+ *        A string with potentially unescaped characters
+ *
+ * @return A string with the &, <, >, " and ' characters turned into XML
+ *         character entitites
+ *
+ * @see WAP-192-WBXML-20010725-A, clause 6.1
+ */
+this.escapeReservedCharacters = function escape_reserved_characters(str) {
+  let dst = "";
+
+  for (var i = 0; i < str.length; i++) {
+    switch (str[i]) {
+      case '&' : dst += "&amp;" ; break;
+      case '<' : dst += "&lt;"  ; break;
+      case '>' : dst += "&gt;"  ; break;
+      case '"' : dst += "&quot;"; break;
+      case '\'': dst += "&apos;"; break;
+      default  : dst += str[i];
+    }
+  }
+
+  return dst;
+}
+
 /**
  * Handle string table in WBXML message.
  *
@@ -118,7 +147,9 @@ this.readStringTable = function decode_wbxml_read_string_table(start, stringTabl
 this.WbxmlStringTable = {
   decode: function decode_wbxml_string_table(data, decodeInfo) {
     let start = WSP.Octet.decode(data);
-    return readStringTable(start, decodeInfo.stringTable, decodeInfo.charset);
+    let str = readStringTable(start, decodeInfo.stringTable, decodeInfo.charset);
+
+    return escapeReservedCharacters(str);
   }
 };
 
@@ -142,7 +173,9 @@ this.WbxmlInlineString = {
       charCode = WSP.Octet.decode(data);
     }
 
-    return WSP.PduHelper.decodeStringContent(stringData, decodeInfo.charset);
+    let str = WSP.PduHelper.decodeStringContent(stringData, decodeInfo.charset);
+
+    return escapeReservedCharacters(str);
   },
 };
 
diff --git a/dom/wappush/tests/test_si_pdu_helper.js b/dom/wappush/tests/test_si_pdu_helper.js
index 6c070265f96e..9ac74343a826 100644
--- a/dom/wappush/tests/test_si_pdu_helper.js
+++ b/dom/wappush/tests/test_si_pdu_helper.js
@@ -110,6 +110,33 @@ add_test(function test_si_parse_wbxml_with_href() {
   run_next_test();
 });
 
+/**
+ * SI compressed by WBXML with href attribute containing reserved XML character
+ */
+add_test(function test_si_parse_wbxml_with_href_reserved_char() {
+  let msg = {};
+  let contentType = "";
+  let data = {};
+
+  contentType = "application/vnd.wap.sic";
+  data.array = new Uint8Array([
+                  0x02, 0x05, 0x6A, 0x00, 0x45, 0xC6, 0x0D, 0x03,
+                  0x6F, 0x72, 0x65, 0x69, 0x6C, 0x6C, 0x79, 0x00,
+                  0x85, 0x03, 0x66, 0x6F, 0x6F, 0x26, 0x62, 0x61,
+                  0x72, 0x00, 0x01, 0x03, 0x43, 0x68, 0x65, 0x63,
+                  0x6B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x77,
+                  0x65, 0x62, 0x73, 0x69, 0x74, 0x65, 0x00, 0x01,
+                  0x01
+                ]);
+  data.offset = 0;
+  let result = "<si><indication href=\"http://www.oreilly.com/foo&amp;bar\">" +
+               "Check this website</indication></si>";
+  let msg = SI.PduHelper.parse(data, contentType);
+  do_check_eq(msg.content, result);
+
+  run_next_test();
+});
+
 /**
  * SI compressed by WBXML with href and date attribute
  */
@@ -170,4 +197,4 @@ add_test(function test_si_parse_wbxml_with_attr_string_table() {
   do_check_eq(msg.content, result);
 
   run_next_test();
-});
\ No newline at end of file
+});

From 81df5dcb28cfe61d21f0e6ca480cf021e2707c5c Mon Sep 17 00:00:00 2001
From: Jessica Jong <jjong@mozilla.com>
Date: Thu, 19 Dec 2013 11:07:14 -0500
Subject: [PATCH 53/78] Bug 951958 - B2G RIL: set/get preferred network type
 error message is not set accordingly. r=hsinyi

---
 dom/system/gonk/ril_worker.js | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 9395424b1fd1..42506dcb16b4 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -5880,21 +5880,30 @@ RIL[REQUEST_SET_PREFERRED_NETWORK_TYPE] = function REQUEST_SET_PREFERRED_NETWORK
     return;
   }
 
-  options.success = (options.rilRequestError == ERROR_SUCCESS);
+  if (options.rilRequestError) {
+    options.success = false;
+    options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
+  } else {
+    options.success = true;
+  }
   this.sendChromeMessage(options);
 };
 RIL[REQUEST_GET_PREFERRED_NETWORK_TYPE] = function REQUEST_GET_PREFERRED_NETWORK_TYPE(length, options) {
-  let networkType;
-  if (!options.rilRequestError) {
-    networkType = RIL_PREFERRED_NETWORK_TYPE_TO_GECKO.indexOf(GECKO_PREFERRED_NETWORK_TYPE_DEFAULT);
-    let responseLen = Buf.readInt32(); // Number of INT32 responsed.
-    if (responseLen) {
-      this.preferredNetworkType = networkType = Buf.readInt32();
-    }
-    options.networkType = networkType;
+  if (options.rilRequestError) {
+    options.success = false;
+    options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
+    this.sendChromeMessage(options);
+    return;
   }
 
-  options.success = (options.rilRequestError == ERROR_SUCCESS);
+  let networkType = RIL_PREFERRED_NETWORK_TYPE_TO_GECKO.indexOf(GECKO_PREFERRED_NETWORK_TYPE_DEFAULT);
+  let responseLen = Buf.readInt32(); // Number of INT32 responsed.
+  if (responseLen) {
+    this.preferredNetworkType = networkType = Buf.readInt32();
+  }
+  options.networkType = networkType;
+  options.success = true;
+
   this.sendChromeMessage(options);
 };
 RIL[REQUEST_GET_NEIGHBORING_CELL_IDS] = null;

From 0e1da61f1859e4ca4fc09ab4c413dbeaf2871c2b Mon Sep 17 00:00:00 2001
From: EKR <ekr@rtfm.com>
Date: Thu, 19 Dec 2013 09:31:35 -0500
Subject: [PATCH 54/78] Bug 952103 - Fix VideoConduit unit tests. r=jesup

---
 media/webrtc/signaling/test/mediaconduit_unittests.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/media/webrtc/signaling/test/mediaconduit_unittests.cpp b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
index 96be17dc13ab..96d19f560f6b 100644
--- a/media/webrtc/signaling/test/mediaconduit_unittests.cpp
+++ b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
@@ -584,11 +584,7 @@ class TransportConduitTest : public ::testing::Test
 
     err = mVideoSession->ConfigureSendMediaCodec(&cinst1);
     ASSERT_EQ(mozilla::kMediaConduitNoError, err);
-    err = mVideoSession->ConfigureRecvMediaCodecs(rcvCodecList);
-    ASSERT_EQ(mozilla::kMediaConduitNoError, err);
 
-    err = mVideoSession2->ConfigureSendMediaCodec(&cinst1);
-    ASSERT_EQ(mozilla::kMediaConduitNoError, err);
     err = mVideoSession2->ConfigureRecvMediaCodecs(rcvCodecList);
     ASSERT_EQ(mozilla::kMediaConduitNoError, err);
 
@@ -613,8 +609,9 @@ class TransportConduitTest : public ::testing::Test
     cerr << "    Done With The Testing  " << endl;
 
     cerr << "   **************************************************" << endl;
-
-
+    ASSERT_EQ(0, vidStatsGlobal.numFramesRenderedWrongly);
+    ASSERT_EQ(vidStatsGlobal.numRawFramesInserted,
+        vidStatsGlobal.numFramesRenderedSuccessfully);
   }
 
  void TestVideoConduitCodecAPI()

From bbd26b496fd35c15ba8130d050cbb4104794f7ea Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 19 Dec 2013 11:09:57 -0500
Subject: [PATCH 55/78] Backed out changeset 2504e03f6eec (bug 952102) for
 landing with the wrong bug number.

---
 media/webrtc/signaling/test/mediaconduit_unittests.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/media/webrtc/signaling/test/mediaconduit_unittests.cpp b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
index 96d19f560f6b..96be17dc13ab 100644
--- a/media/webrtc/signaling/test/mediaconduit_unittests.cpp
+++ b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
@@ -584,7 +584,11 @@ class TransportConduitTest : public ::testing::Test
 
     err = mVideoSession->ConfigureSendMediaCodec(&cinst1);
     ASSERT_EQ(mozilla::kMediaConduitNoError, err);
+    err = mVideoSession->ConfigureRecvMediaCodecs(rcvCodecList);
+    ASSERT_EQ(mozilla::kMediaConduitNoError, err);
 
+    err = mVideoSession2->ConfigureSendMediaCodec(&cinst1);
+    ASSERT_EQ(mozilla::kMediaConduitNoError, err);
     err = mVideoSession2->ConfigureRecvMediaCodecs(rcvCodecList);
     ASSERT_EQ(mozilla::kMediaConduitNoError, err);
 
@@ -609,9 +613,8 @@ class TransportConduitTest : public ::testing::Test
     cerr << "    Done With The Testing  " << endl;
 
     cerr << "   **************************************************" << endl;
-    ASSERT_EQ(0, vidStatsGlobal.numFramesRenderedWrongly);
-    ASSERT_EQ(vidStatsGlobal.numRawFramesInserted,
-        vidStatsGlobal.numFramesRenderedSuccessfully);
+
+
   }
 
  void TestVideoConduitCodecAPI()

From cba8b59afa8be3d3e9c595a56581d67d147b2a0f Mon Sep 17 00:00:00 2001
From: EKR <ekr@rtfm.com>
Date: Thu, 19 Dec 2013 09:31:35 -0500
Subject: [PATCH 56/78] Bug 952102 - Fix VideoConduit unit tests. r=jesup
 DONTBUILD

---
 media/webrtc/signaling/test/mediaconduit_unittests.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/media/webrtc/signaling/test/mediaconduit_unittests.cpp b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
index 96be17dc13ab..96d19f560f6b 100644
--- a/media/webrtc/signaling/test/mediaconduit_unittests.cpp
+++ b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
@@ -584,11 +584,7 @@ class TransportConduitTest : public ::testing::Test
 
     err = mVideoSession->ConfigureSendMediaCodec(&cinst1);
     ASSERT_EQ(mozilla::kMediaConduitNoError, err);
-    err = mVideoSession->ConfigureRecvMediaCodecs(rcvCodecList);
-    ASSERT_EQ(mozilla::kMediaConduitNoError, err);
 
-    err = mVideoSession2->ConfigureSendMediaCodec(&cinst1);
-    ASSERT_EQ(mozilla::kMediaConduitNoError, err);
     err = mVideoSession2->ConfigureRecvMediaCodecs(rcvCodecList);
     ASSERT_EQ(mozilla::kMediaConduitNoError, err);
 
@@ -613,8 +609,9 @@ class TransportConduitTest : public ::testing::Test
     cerr << "    Done With The Testing  " << endl;
 
     cerr << "   **************************************************" << endl;
-
-
+    ASSERT_EQ(0, vidStatsGlobal.numFramesRenderedWrongly);
+    ASSERT_EQ(vidStatsGlobal.numRawFramesInserted,
+        vidStatsGlobal.numFramesRenderedSuccessfully);
   }
 
  void TestVideoConduitCodecAPI()

From d6349f15211ee79d1bbe945f1123e0a64620c217 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 08:20:23 -0800
Subject: [PATCH 57/78] Bumping gaia.json for 4 gaia-central revision(s)
 a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/1485522e1298
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14806 from gtorodelvalle/contacts-bug-949470-ben-kelly-patch

Bug 949470 - [Contacts] Broken image links when entering the search mode

========

https://hg.mozilla.org/integration/gaia-central/rev/c09076a30327
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 949470 - [Contacts] Broken image links when entering the search mode

========

https://hg.mozilla.org/integration/gaia-central/rev/214fe26e8f61
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #14583 from nbp/marionette-with-serial

Bug 948992 - Give deviceSerial number to ADB's device manager.

========

https://hg.mozilla.org/integration/gaia-central/rev/434ea62282dc
Author: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Desc: Bug 948992 - Give deviceSerial number to ADB's device manager. r=mdas
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ee29effacdee..e04b0e31f434 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "a0fe79aab4bbb2046d5386046ec34234a24ebaf8", 
+    "revision": "1485522e12985eb8a2fc7de6c33f0ae705ee587e", 
     "repo_path": "/integration/gaia-central"
 }

From f107953aba6baa37a6171852736237cdefe043ae Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 08:45:24 -0800
Subject: [PATCH 58/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2c8ad9bb0ecf
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #14751 from TheoChevalier/call-waiting-switch-fix

Bug 951123 - [Settings] Call waiting switch on "Confirm Call waiting", r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/6fb9727f76f0
Author: TheoChevalier <theo.chevalier11@gmail.com>
Desc: Bug 951123 - [Settings] Call waiting switch on "Confirm Call waiting" screen is broken
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e04b0e31f434..15be523359f3 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "1485522e12985eb8a2fc7de6c33f0ae705ee587e", 
+    "revision": "2c8ad9bb0ecf5184c950c8b94793c55d47962b5c", 
     "repo_path": "/integration/gaia-central"
 }

From dcff32c351c2065c8d0662c086e095033cf66231 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 19 Dec 2013 12:07:28 -0500
Subject: [PATCH 59/78] Backed out changeset f9b9eae77c66 (bug 932145) for
 desktop B2G mochitest orange.

---
 dom/inputmethod/Keyboard.jsm                  |  24 ++--
 dom/inputmethod/mochitest/file_test_app.html  |  10 --
 .../mochitest/inputmethod_common.js           |  32 -----
 dom/inputmethod/mochitest/mochitest.ini       |   7 -
 dom/inputmethod/mochitest/moz.build           |   8 --
 dom/inputmethod/mochitest/test_basic.html     | 134 ------------------
 dom/inputmethod/moz.build                     |   2 -
 testing/mochitest/android.json                |   1 -
 testing/mochitest/androidx86.json             |   1 -
 9 files changed, 8 insertions(+), 211 deletions(-)
 delete mode 100644 dom/inputmethod/mochitest/file_test_app.html
 delete mode 100644 dom/inputmethod/mochitest/inputmethod_common.js
 delete mode 100644 dom/inputmethod/mochitest/mochitest.ini
 delete mode 100644 dom/inputmethod/mochitest/moz.build
 delete mode 100644 dom/inputmethod/mochitest/test_basic.html

diff --git a/dom/inputmethod/Keyboard.jsm b/dom/inputmethod/Keyboard.jsm
index a0e5bde5707a..14b56041be66 100644
--- a/dom/inputmethod/Keyboard.jsm
+++ b/dom/inputmethod/Keyboard.jsm
@@ -103,12 +103,7 @@ this.Keyboard = {
         return;
       }
 
-      let testing = false;
-      try {
-        testing = Services.prefs.getBoolPref("dom.mozInputMethod.testing");
-      } catch (e) {
-      }
-      if (!testing && !mm.assertPermission("input")) {
+      if (!mm.assertPermission("input")) {
         dump("Keyboard message " + msg.name +
         " from a content process with no 'input' privileges.");
         return;
@@ -185,9 +180,11 @@ this.Keyboard = {
   handleFocusChange: function keyboardHandleFocusChange(msg) {
     this.forwardEvent('Keyboard:FocusChange', msg);
 
+    let browser = Services.wm.getMostRecentWindow("navigator:browser");
+
     // Chrome event, used also to render value selectors; that's why we need
     // the info about choices / min / max here as well...
-    this.sendChromeEvent({
+    browser.shell.sendChromeEvent({
       type: 'inputmethod-contextchange',
       inputType: msg.data.type,
       value: msg.data.value,
@@ -222,13 +219,15 @@ this.Keyboard = {
   },
 
   showInputMethodPicker: function keyboardShowInputMethodPicker() {
-    this.sendChromeEvent({
+    let browser = Services.wm.getMostRecentWindow("navigator:browser");
+    browser.shell.sendChromeEvent({
       type: "inputmethod-showall"
     });
   },
 
   switchToNextInputMethod: function keyboardSwitchToNextInputMethod() {
-    this.sendChromeEvent({
+    let browser = Services.wm.getMostRecentWindow("navigator:browser");
+    browser.shell.sendChromeEvent({
       type: "inputmethod-next"
     });
   },
@@ -268,13 +267,6 @@ this.Keyboard = {
     this._layouts = layouts;
 
     ppmm.broadcastAsyncMessage('Keyboard:LayoutsChange', layouts);
-  },
-
-  sendChromeEvent: function(event) {
-    let browser = Services.wm.getMostRecentWindow("navigator:browser");
-    if (browser && browser.shell) {
-      browser.shell.sendChromeEvent(event);;
-    }
   }
 };
 
diff --git a/dom/inputmethod/mochitest/file_test_app.html b/dom/inputmethod/mochitest/file_test_app.html
deleted file mode 100644
index 8cecee853338..000000000000
--- a/dom/inputmethod/mochitest/file_test_app.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body>
-<input id="test-input" type="text" value="Yuan" x-inputmode="verbatim" lang="zh"/>
-<script type="application/javascript;version=1.7">
-  let input = document.getElementById('test-input');
-  input.focus();
-</script>
-</body>
-</html>
diff --git a/dom/inputmethod/mochitest/inputmethod_common.js b/dom/inputmethod/mochitest/inputmethod_common.js
deleted file mode 100644
index f5b3a90d68fc..000000000000
--- a/dom/inputmethod/mochitest/inputmethod_common.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function inputmethod_setup(callback) {
-  SimpleTest.waitForExplicitFinish();
-  let appInfo = SpecialPowers.Cc['@mozilla.org/xre/app-info;1']
-                .getService(SpecialPowers.Ci.nsIXULAppInfo);
-  if (appInfo.name != 'B2G') {
-    SpecialPowers.Cu.import("resource://gre/modules/Keyboard.jsm", this);
-  }
-
-  let permissions = [];
-  ['input-manage', 'browser'].forEach(function(name) {
-    permissions.push({
-      type: name,
-      allow: true,
-      context: document
-    });
-  });
-
-  SpecialPowers.pushPermissions(permissions, function() {
-    let prefs = [
-      ['dom.mozBrowserFramesEnabled', true],
-      // Enable navigator.mozInputMethod.
-      ['dom.mozInputMethod.enabled', true],
-      // Bypass the permission check for mozInputMethod API.
-      ['dom.mozInputMethod.testing', true]
-    ];
-    SpecialPowers.pushPrefEnv({set: prefs}, callback);
-  });
-}
-
-function inputmethod_cleanup() {
-  SimpleTest.finish();
-}
diff --git a/dom/inputmethod/mochitest/mochitest.ini b/dom/inputmethod/mochitest/mochitest.ini
deleted file mode 100644
index 84c391c2eb68..000000000000
--- a/dom/inputmethod/mochitest/mochitest.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-support-files =
-  inputmethod_common.js
-  file_test_app.html
-
-[test_basic.html]
-
diff --git a/dom/inputmethod/mochitest/moz.build b/dom/inputmethod/mochitest/moz.build
deleted file mode 100644
index 3cf16eb0cfe8..000000000000
--- a/dom/inputmethod/mochitest/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/dom/inputmethod/mochitest/test_basic.html b/dom/inputmethod/mochitest/test_basic.html
deleted file mode 100644
index e673ebaaa93b..000000000000
--- a/dom/inputmethod/mochitest/test_basic.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=932145
--->
-<head>
-  <title>Basic test for InputMethod API.</title>
-  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript;version=1.7" src="inputmethod_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=932145">Mozilla Bug 932145</a>
-<p id="display"></p>
-<pre id="test">
-<script class="testbody" type="application/javascript;version=1.7">
-
-// The input context.
-var gContext = null;
-
-inputmethod_setup(function() {
-  runTest();
-});
-
-function runTest() {
-  let im = navigator.mozInputMethod;
-
-  im.oninputcontextchange = function() {
-    ok(true, 'inputcontextchange event was fired.');
-    im.oninputcontextchange = null;
-
-    gContext = im.inputcontext;
-    if (!gContext) {
-      ok(false, 'Should have a non-null inputcontext.');
-      inputmethod_cleanup();
-      return;
-    }
-
-    todo_is(gContext.type, 'input', 'The input context type should match.');
-    is(gContext.inputType, 'text', 'The inputType should match.');
-    is(gContext.inputMode, 'verbatim', 'The input mode should match.');
-    is(gContext.lang, 'zh', 'The language should match.');
-    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yuan',
-       'Should get the text around the cursor.');
-
-    test_setSelectionRange();
-  };
-
-  // Set current page as an input method.
-  SpecialPowers.wrap(im).setActive(true);
-
-  let iframe = document.createElement('iframe');
-  iframe.src = 'file_test_app.html';
-  iframe.setAttribute('mozbrowser', true);
-  document.body.appendChild(iframe);
-}
-
-function test_setSelectionRange() {
-  // Move cursor position to 2.
-  gContext.setSelectionRange(2, 0).then(function() {
-    is(gContext.selectionStart, 2, 'selectionStart was set successfully.');
-    is(gContext.selectionEnd, 2, 'selectionEnd was set successfully.');
-    test_sendKey();
-  }, function(e) {
-    ok(false, 'setSelectionRange failed:' + e.name);
-    inputmethod_cleanup();
-  });
-}
-
-function test_sendKey() {
-  // Add '-' to current cursor posistion and move the cursor position to 3.
-  gContext.sendKey(0, '-'.charCodeAt(0), 0).then(function() {
-    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yu-an',
-       'sendKey should changed the input field correctly.');
-    test_deleteSurroundingText();
-  }, function(e) {
-    ok(false, 'sendKey failed:' + e.name);
-    inputmethod_cleanup();
-  });
-}
-
-function test_deleteSurroundingText() {
-  // Remove one character before current cursor position and move the cursor
-  // position back to 2.
-  gContext.deleteSurroundingText(1, 0).then(function() {
-    ok(true, 'deleteSurroundingText finished');
-    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Yuan',
-       'deleteSurroundingText should changed the input field correctly.');
-    test_replaceSurroundingText();
-  }, function(e) {
-    ok(false, 'deleteSurroundingText failed:' + e.name);
-    inputmethod_cleanup();
-  });
-}
-
-function test_replaceSurroundingText() {
-  // Replace 'Yuan' with 'Xulei'.
-  gContext.replaceSurroundingText('Xulei', 2, 2).then(function() {
-    ok(true, 'replaceSurroundingText finished');
-    is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Xulei',
-       'replaceSurroundingText changed the input field correctly.');
-    test_setComposition();
-  }, function(e) {
-    ok(false, 'replaceSurroundingText failed: ' + e.name);
-    inputmethod_cleanup();
-  });
-}
-
-function test_setComposition() {
-  gContext.setComposition('XXX').then(function() {
-    ok(true, 'setComposition finished');
-    test_endComposition();
-  }, function(e) {
-    ok(false, 'setComposition failed: ' + e.name);
-    inputmethod_cleanup();
-  });
-}
-
-function test_endComposition() {
-  gContext.endComposition('2013').then(function() {
-    todo_is(gContext.textBeforeCursor + gContext.textAfterCursor, 'Xulei2013',
-       'endComposition changed the input field correctly.');
-    inputmethod_cleanup();
-  }, function (e) {
-    ok(false, 'endComposition failed: ' + e.name);
-    inputmethod_cleanup();
-  });
-}
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/dom/inputmethod/moz.build b/dom/inputmethod/moz.build
index 3f68aa509c43..e798c584285b 100644
--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@@ -4,8 +4,6 @@
 # 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/.
 
-TEST_DIRS += ['mochitest']
-
 XPIDL_SOURCES += [
     'nsIB2GKeyboard.idl',
 ]
diff --git a/testing/mochitest/android.json b/testing/mochitest/android.json
index 8e5febcb1b8e..41ff12af9b4d 100644
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -138,7 +138,6 @@
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_inproc.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_oop.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_oop_inproc.html": "No test app installed",
- "dom/inputmethod": "Not supported on Android",
  "dom/network/tests/test_network_basics.html": "",
  "dom/permission/tests/test_permission_basics.html": "",
  "dom/mobilemessage/tests/test_sms_basics.html": "Bug 909036",
diff --git a/testing/mochitest/androidx86.json b/testing/mochitest/androidx86.json
index aa9e15edf074..d093569dee54 100644
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -215,7 +215,6 @@
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_inproc.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_inproc_oop.html": "No test app installed",
  "dom/indexedDB/test/test_webapp_clearBrowserData_oop_inproc.html": "No test app installed",
- "dom/inputmethod": "Not supported on Android",
  "dom/media/tests/ipc/test_ipc.html": "x86 only bug 936226",
  "dom/network/tests/test_network_basics.html": "",
  "dom/permission/tests/test_permission_basics.html": "",

From e711c463da9795e1de8a7388c5fe3d37f78eaf30 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 09:20:24 -0800
Subject: [PATCH 60/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/e29ffa8b1f3a
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #14840 from gtorodelvalle/contacts-bug-946260-broken-links-when-scrolling

Bug 946260 - [Contacts] Broken link image shown for contacts when scrolling instead of their photo

========

https://hg.mozilla.org/integration/gaia-central/rev/5030d022841e
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 946260 - [Contacts] Broken link image shown for contacts when scrolling instead of their photo
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 15be523359f3..177ae2267f36 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "2c8ad9bb0ecf5184c950c8b94793c55d47962b5c", 
+    "revision": "e29ffa8b1f3a46307e4b181b86260be768cf2a77", 
     "repo_path": "/integration/gaia-central"
 }

From a1a0eea188f6a6130b0da24c8c4cd5aeedc433dc Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 16 Dec 2013 14:53:02 -0500
Subject: [PATCH 61/78] Bug 946408 - Small refactoring for readability. r=tn

---
 layout/generic/nsGfxScrollFrame.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index d053119a48b8..5a11d93ab2df 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2394,10 +2394,12 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   } else {
     nsRect scrollRange = GetScrollRange();
     ScrollbarStyles styles = GetScrollbarStylesFromFrame();
-    bool hasScrollableOverflow =
-      (scrollRange.width > 0 || scrollRange.height > 0) &&
-      ((styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN && mHScrollbarBox) ||
-       (styles.mVertical   != NS_STYLE_OVERFLOW_HIDDEN && mVScrollbarBox));
+    bool isVScrollable = (scrollRange.height > 0)
+                      && (styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN);
+    bool isHScrollable = (scrollRange.width > 0)
+                      && (styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN);
+    bool wantLayerV = isVScrollable && mVScrollbarBox;
+    bool wantLayerH = isHScrollable && mHScrollbarBox;
     // TODO Turn this on for inprocess OMTC on all platforms
     bool wantSubAPZC = (XRE_GetProcessType() == GeckoProcessType_Content);
 #ifdef XP_WIN
@@ -2407,7 +2409,7 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 #endif
     shouldBuildLayer =
       wantSubAPZC &&
-      hasScrollableOverflow &&
+      (wantLayerV || wantLayerH) &&
       (!mIsRoot || !mOuter->PresContext()->IsRootContentDocument());
   }
 

From 7951bd2cf873e9c6d78c7596b6511e7f5c560acd Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 16 Dec 2013 14:53:06 -0500
Subject: [PATCH 62/78] Bug 946408 - Always layerize a scrollable element if
 it's focused. r=kats,tn

---
 layout/generic/nsGfxScrollFrame.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 5a11d93ab2df..88287eec4d44 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2252,6 +2252,19 @@ ScrollFrameHelper::ExpandRect(const nsRect& aRect) const
   return rect;
 }
 
+static bool IsFocused(nsIContent* aContent)
+{
+  // Some content elements, like the GetContent() of a scroll frame
+  // for a text input field, are inside anonymous subtrees, but the focus
+  // manager always reports a non-anonymous element as the focused one, so
+  // walk up the tree until we reach a non-anonymous element.
+  while (aContent && aContent->IsInAnonymousSubtree()) {
+    aContent = aContent->GetParent();
+  }
+
+  return aContent ? nsContentUtils::IsFocusedContent(aContent) : false;
+}
+
 void
 ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                                         const nsRect&           aDirtyRect,
@@ -2394,12 +2407,16 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   } else {
     nsRect scrollRange = GetScrollRange();
     ScrollbarStyles styles = GetScrollbarStylesFromFrame();
+    bool isFocused = IsFocused(mOuter->GetContent());
     bool isVScrollable = (scrollRange.height > 0)
                       && (styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN);
     bool isHScrollable = (scrollRange.width > 0)
                       && (styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN);
-    bool wantLayerV = isVScrollable && mVScrollbarBox;
-    bool wantLayerH = isHScrollable && mHScrollbarBox;
+    // The check for scroll bars was added in bug 825692 to prevent layerization
+    // of text inputs for performance reasons. However, if a text input is
+    // focused we want to layerize it so we can async scroll it (bug 946408).
+    bool wantLayerV = isVScrollable && (mVScrollbarBox || isFocused);
+    bool wantLayerH = isHScrollable && (mHScrollbarBox || isFocused);
     // TODO Turn this on for inprocess OMTC on all platforms
     bool wantSubAPZC = (XRE_GetProcessType() == GeckoProcessType_Content);
 #ifdef XP_WIN

From 41fe6e9a08cf18e41b1802b5a1c8737d4e01ddee Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 19 Dec 2013 12:49:52 -0800
Subject: [PATCH 63/78] Bug 952183 - reuseGlobal doesn't account for scripts
 being recycled (r=mrbkap,khuey)

---
 js/xpconnect/loader/mozJSComponentLoader.cpp | 16 ++++++++++++++--
 js/xpconnect/loader/mozJSComponentLoader.h   |  6 ++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index 9428d817f0cf..5c4e465ec997 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -421,7 +421,7 @@ mozJSComponentLoader::LoadModule(FileLocation &aFile)
 
     JSAutoRequest ar(mContext);
     RootedValue dummy(mContext);
-    rv = ObjectForLocation(file, uri, &entry->obj,
+    rv = ObjectForLocation(file, uri, &entry->obj, &entry->thisObjectKey,
                            &entry->location, false, &dummy);
     if (NS_FAILED(rv)) {
         return nullptr;
@@ -742,6 +742,7 @@ nsresult
 mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile,
                                         nsIURI *aURI,
                                         JSObject **aObject,
+                                        JSScript **aTableScript,
                                         char **aLocation,
                                         bool aPropagateExceptions,
                                         MutableHandleValue aException)
@@ -991,12 +992,17 @@ mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile,
     // See bug 384168.
     *aObject = obj;
 
-    JSScript* tableScript = script;
+    RootedScript tableScript(cx, script);
     if (!tableScript) {
         tableScript = JS_GetFunctionScript(cx, function);
         MOZ_ASSERT(tableScript);
     }
 
+    *aTableScript = tableScript;
+
+    // tableScript stays in the table until shutdown. To avoid it being
+    // collected and another script getting the same address, we root
+    // tableScript lower down in this function.
     mThisObjects.Put(tableScript, obj);
     bool ok = false;
 
@@ -1018,6 +1024,8 @@ mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile,
             JS_ClearPendingException(cx);
         }
         *aObject = nullptr;
+        *aTableScript = nullptr;
+        mThisObjects.Remove(tableScript);
         return NS_ERROR_FAILURE;
     }
 
@@ -1025,10 +1033,13 @@ mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile,
     *aLocation = ToNewCString(nativePath);
     if (!*aLocation) {
         *aObject = nullptr;
+        *aTableScript = nullptr;
+        mThisObjects.Remove(tableScript);
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
     JS_AddNamedObjectRoot(cx, aObject, *aLocation);
+    JS_AddNamedScriptRoot(cx, aTableScript, *aLocation);
     return NS_OK;
 }
 
@@ -1217,6 +1228,7 @@ mozJSComponentLoader::ImportInto(const nsACString &aLocation,
 
         RootedValue exception(callercx);
         rv = ObjectForLocation(sourceLocalFile, resURI, &newEntry->obj,
+                               &newEntry->thisObjectKey,
                                &newEntry->location, true, &exception);
 
         mInProgressImports.Remove(key);
diff --git a/js/xpconnect/loader/mozJSComponentLoader.h b/js/xpconnect/loader/mozJSComponentLoader.h
index 86d2207143d8..68cad21b7203 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.h
+++ b/js/xpconnect/loader/mozJSComponentLoader.h
@@ -73,6 +73,7 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
     nsresult ObjectForLocation(nsIFile* aComponentFile,
                                nsIURI *aComponent,
                                JSObject **aObject,
+                               JSScript **aTableScript,
                                char **location,
                                bool aCatchException,
                                JS::MutableHandleValue aException);
@@ -102,6 +103,7 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
             unloadProc = nullptr;
 
             obj = nullptr;
+            thisObjectKey = nullptr;
             location = nullptr;
         }
 
@@ -119,12 +121,15 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
 
                 JS_SetAllNonReservedSlotsToUndefined(sSelf->mContext, obj);
                 JS_RemoveObjectRoot(sSelf->mContext, &obj);
+                if (thisObjectKey)
+                    JS_RemoveScriptRoot(sSelf->mContext, &thisObjectKey);
             }
 
             if (location)
                 NS_Free(location);
 
             obj = nullptr;
+            thisObjectKey = nullptr;
             location = nullptr;
         }
 
@@ -135,6 +140,7 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
 
         nsCOMPtr<xpcIJSGetFactory> getfactoryobj;
         JSObject            *obj;
+        JSScript            *thisObjectKey;
         char                *location;
     };
 

From af4eec9820a606a0bcfb24f7879f6811884a8b2b Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 18 Dec 2013 13:42:14 -0800
Subject: [PATCH 64/78] Bug 631842 (part 1) - Clone the PGO profile test script
 and data for use in the Valgrind test.  r=ted.

--HG--
rename : build/pgo/profileserver.py => build/valgrind/valgrind_test.py
extra : rebase_source : bef17f3e49e9e94883897dfb75a986cb10dc6105
---
 build/valgrind/valgrind_test.py | 77 +++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 build/valgrind/valgrind_test.py

diff --git a/build/valgrind/valgrind_test.py b/build/valgrind/valgrind_test.py
new file mode 100644
index 000000000000..cc43d8f88c4e
--- /dev/null
+++ b/build/valgrind/valgrind_test.py
@@ -0,0 +1,77 @@
+#!/usr/bin/python
+#
+# 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/.
+
+from mozprofile import FirefoxProfile, Profile, Preferences
+from mozprofile.permissions import ServerLocations
+from mozrunner import FirefoxRunner, CLI
+from mozhttpd import MozHttpd
+import json
+import socket
+import threading
+import os
+import sys
+import shutil
+import tempfile
+from datetime import datetime
+from mozbuild.base import MozbuildObject
+
+PORT = 8888
+
+if __name__ == '__main__':
+  cli = CLI()
+  debug_args, interactive = cli.debugger_arguments()
+
+  build = MozbuildObject.from_environment()
+  # XXX: currently we just use the PGO inputs for Valgrind runs.  This may
+  # change in the future.
+  httpd = MozHttpd(port=PORT,
+                   docroot=os.path.join(build.topsrcdir, "build", "pgo"))
+  httpd.start(block=False)
+
+  locations = ServerLocations()
+  locations.add_host(host='127.0.0.1',
+                     port=PORT,
+                     options='primary,privileged')
+
+  #TODO: mozfile.TemporaryDirectory
+  profilePath = tempfile.mkdtemp()
+  try:
+    #TODO: refactor this into mozprofile
+    prefpath = os.path.join(build.topsrcdir, "testing", "profiles", "prefs_general.js")
+    prefs = {}
+    prefs.update(Preferences.read_prefs(prefpath))
+    interpolation = { "server": "%s:%d" % httpd.httpd.server_address,
+                      "OOP": "false"}
+    prefs = json.loads(json.dumps(prefs) % interpolation)
+    for pref in prefs:
+      prefs[pref] = Preferences.cast(prefs[pref])
+    profile = FirefoxProfile(profile=profilePath,
+                             preferences=prefs,
+                             addons=[os.path.join(build.distdir, 'xpi-stage', 'quitter')],
+                             locations=locations)
+
+    env = os.environ.copy()
+    env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
+    env["XPCOM_DEBUG_BREAK"] = "warn"
+    jarlog = os.getenv("JARLOG_FILE")
+    if jarlog:
+      env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
+      print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"]
+
+    cmdargs = ["http://localhost:%d/index.html" % PORT]
+    runner = FirefoxRunner(profile=profile,
+                           binary=build.get_binary_path(),
+                           cmdargs=cmdargs,
+                           env=env)
+    runner.start(debug_args=debug_args, interactive=interactive)
+    status = runner.wait()
+    httpd.stop()
+    if status != 0:
+        status = 1      # normalize status, in case it's larger than 127
+
+    sys.exit(status)
+  finally:
+    shutil.rmtree(profilePath)

From cb93cef678874c606655156fbce91d79352cd707 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 18 Dec 2013 17:36:08 -0800
Subject: [PATCH 65/78] Bug 631842 (part 2) - Implement |mach valgrind-test|. 
 r=gps.

---
 build/mach_bootstrap.py         |  1 +
 build/valgrind/mach_commands.py | 76 +++++++++++++++++++++++++++++++++
 testing/mach_commands.py        |  5 +++
 3 files changed, 82 insertions(+)
 create mode 100644 build/valgrind/mach_commands.py

diff --git a/build/mach_bootstrap.py b/build/mach_bootstrap.py
index 500646dd1ba2..ded809c3e6fd 100644
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -62,6 +62,7 @@ SEARCH_PATHS = [
 # Individual files providing mach commands.
 MACH_MODULES = [
     'addon-sdk/mach_commands.py',
+    'build/valgrind/mach_commands.py',
     'dom/bindings/mach_commands.py',
     'layout/tools/reftest/mach_commands.py',
     'python/mach_commands.py',
diff --git a/build/valgrind/mach_commands.py b/build/valgrind/mach_commands.py
new file mode 100644
index 000000000000..1f0cd026729a
--- /dev/null
+++ b/build/valgrind/mach_commands.py
@@ -0,0 +1,76 @@
+# 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/.
+
+from __future__ import print_function, unicode_literals
+
+import os
+import subprocess
+
+from mozbuild.base import (
+    MachCommandBase,
+    MachCommandConditions as conditions,
+)
+
+from mach.decorators import (
+    CommandProvider,
+    Command,
+)
+
+
+@CommandProvider
+class MachCommands(MachCommandBase):
+    '''
+    Easily run Valgrind tests.
+    '''
+    def __init__(self, context):
+        MachCommandBase.__init__(self, context)
+
+    @Command('valgrind-test', category='testing',
+        conditions=[conditions.is_firefox],
+        description='Run the Valgrind test job.')
+    def valgrind_test(self):
+        defines = self.config_environment.defines
+        if 'MOZ_VALGRIND' not in defines or 'MOZ_MEMORY' in defines:
+            print("sorry, this command requires a build configured with\n"
+                  "--enable-valgrind and --disable-jemalloc build")
+            return 1
+
+        debugger_args = [
+            '--error-exitcode=1',
+            '--smc-check=all-non-file',
+            '--vex-iropt-register-updates=allregs-at-each-insn',
+            '--gen-suppressions=all',
+            '--num-callers=20',
+            '--leak-check=full',
+            '--show-possibly-lost=no',
+            '--track-origins=yes'
+        ]
+
+        build_dir = os.path.join(self.topsrcdir, 'build')
+        supps_dir = os.path.join(build_dir, 'valgrind')
+        debugger_args.append('--suppressions=' + os.path.join(supps_dir, 'cross-architecture.sup'))
+
+        # MACHTYPE is an odd bash-only environment variable that doesn't show
+        # up in os.environ, so we have to get it another way.
+        machtype = subprocess.check_output(['bash', '-c', 'echo $MACHTYPE']).rstrip()
+        arch_specific_supps_file = os.path.join(supps_dir, machtype + '.sup')
+        if os.path.isfile(arch_specific_supps_file):
+            debugger_args += ' --suppressions=' + os.path.join(supps_dir, arch_specific_supps_file)
+            print('Using platform-specific suppression file: ',
+                  arch_specific_supps_file + '\n')
+        else:
+            print('Warning: could not find a platform-specific suppression file\n')
+
+        env = os.environ.copy()
+        env['G_SLICE'] = 'always-malloc'
+        env['XPCOM_CC_RUN_DURING_SHUTDOWN'] = '1'
+
+        script = os.path.join(build_dir, 'valgrind', 'valgrind_test.py')
+
+
+        return subprocess.call([self.virtualenv_manager.python_path, script,
+                                '--debugger=valgrind',
+                                '--debugger-args=' + ' '.join(debugger_args) + ''],
+                                env=env)
+
diff --git a/testing/mach_commands.py b/testing/mach_commands.py
index 2227f5edc369..8e585ff692a6 100644
--- a/testing/mach_commands.py
+++ b/testing/mach_commands.py
@@ -87,6 +87,11 @@ TEST_SUITES = {
         'mach_command': 'reftest-ipc',
         'kwargs': {'test_file': None},
     },
+    'valgrind': {
+        'aliases': ('V', 'v'),
+        'mach_command': 'valgrind-test',
+        'kwargs': {},
+    },
     'xpcshell': {
         'aliases': ('X', 'x'),
         'mach_command': 'xpcshell-test',

From ea1673f1c80a83c078f539f6c9df7173012da91c Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Wed, 18 Dec 2013 21:42:17 -0800
Subject: [PATCH 66/78] Bug 947772 - Sync adds tracker observers regardless of
 engine enabled state. r=gps

---
 services/sync/modules/engines.js              | 212 ++++++++++++------
 services/sync/modules/engines/addons.js       |  29 +--
 services/sync/modules/engines/bookmarks.js    |  40 ++--
 services/sync/modules/engines/forms.js        |  25 +--
 services/sync/modules/engines/history.js      |  26 +--
 services/sync/modules/engines/passwords.js    |  68 +++---
 services/sync/modules/engines/prefs.js        |  42 ++--
 services/sync/modules/engines/tabs.js         |  62 +++--
 .../sync/tests/unit/test_addons_tracker.js    |   2 +-
 services/sync/tests/unit/test_engine.js       |  37 ++-
 10 files changed, 305 insertions(+), 238 deletions(-)

diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js
index c3e4faa4769d..9b20fc213d3d 100644
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -51,7 +51,11 @@ this.Tracker = function Tracker(name, engine) {
   this.ignoreAll = false;
   this.changedIDs = {};
   this.loadChangedIDs();
-}
+
+  Svc.Obs.add("weave:engine:start-tracking", this);
+  Svc.Obs.add("weave:engine:stop-tracking", this);
+};
+
 Tracker.prototype = {
   /*
    * Score can be called as often as desired to decide which engines to sync
@@ -73,7 +77,7 @@ Tracker.prototype = {
   },
 
   // Should be called by service everytime a sync has been done for an engine
-  resetScore: function T_resetScore() {
+  resetScore: function () {
     this._score = 0;
   },
 
@@ -88,7 +92,7 @@ Tracker.prototype = {
       this._log.debug("Not saving changedIDs.");
       return;
     }
-    Utils.namedTimer(function() {
+    Utils.namedTimer(function () {
       this._log.debug("Saving changed IDs to " + this.file);
       Utils.jsonSave("changes/" + this.file, this, this.changedIDs, cb);
     }, 1000, this, "_lazySave");
@@ -112,39 +116,43 @@ Tracker.prototype = {
   // being processed, or that shouldn't be synced.
   // But note: not persisted to disk
 
-  ignoreID: function T_ignoreID(id) {
+  ignoreID: function (id) {
     this.unignoreID(id);
     this._ignored.push(id);
   },
 
-  unignoreID: function T_unignoreID(id) {
+  unignoreID: function (id) {
     let index = this._ignored.indexOf(id);
     if (index != -1)
       this._ignored.splice(index, 1);
   },
 
-  addChangedID: function addChangedID(id, when) {
+  addChangedID: function (id, when) {
     if (!id) {
       this._log.warn("Attempted to add undefined ID to tracker");
       return false;
     }
-    if (this.ignoreAll || (id in this._ignored))
+
+    if (this.ignoreAll || (id in this._ignored)) {
       return false;
+    }
 
-    // Default to the current time in seconds if no time is provided
-    if (when == null)
+    // Default to the current time in seconds if no time is provided.
+    if (when == null) {
       when = Math.floor(Date.now() / 1000);
+    }
 
-    // Add/update the entry if we have a newer time
+    // Add/update the entry if we have a newer time.
     if ((this.changedIDs[id] || -Infinity) < when) {
       this._log.trace("Adding changed ID: " + id + ", " + when);
       this.changedIDs[id] = when;
       this.saveChangedIDs(this.onSavedChangedIDs);
     }
+
     return true;
   },
 
-  removeChangedID: function T_removeChangedID(id) {
+  removeChangedID: function (id) {
     if (!id) {
       this._log.warn("Attempted to remove undefined ID to tracker");
       return false;
@@ -159,10 +167,64 @@ Tracker.prototype = {
     return true;
   },
 
-  clearChangedIDs: function T_clearChangedIDs() {
+  clearChangedIDs: function () {
     this._log.trace("Clearing changed ID list");
     this.changedIDs = {};
     this.saveChangedIDs();
+  },
+
+  _isTracking: false,
+
+  // Override these in your subclasses.
+  startTracking: function () {
+  },
+
+  stopTracking: function () {
+  },
+
+  engineIsEnabled: function () {
+    if (!this.engine) {
+      // Can't tell -- we must be running in a test!
+      return true;
+    }
+    return this.engine.enabled;
+  },
+
+  onEngineEnabledChanged: function (engineEnabled) {
+    if (engineEnabled == this._isTracking) {
+      return;
+    }
+
+    if (engineEnabled) {
+      this.startTracking();
+      this._isTracking = true;
+    } else {
+      this.stopTracking();
+      this._isTracking = false;
+      this.clearChangedIDs();
+    }
+  },
+
+  observe: function (subject, topic, data) {
+    switch (topic) {
+      case "weave:engine:start-tracking":
+        if (!this.engineIsEnabled()) {
+          return;
+        }
+        this._log.trace("Got start-tracking.");
+        if (!this._isTracking) {
+          this.startTracking();
+          this._isTracking = true;
+        }
+        return;
+      case "weave:engine:stop-tracking":
+        this._log.trace("Got stop-tracking.");
+        if (this._isTracking) {
+          this.stopTracking();
+          this._isTracking = false;
+        }
+        return;
+    }
   }
 };
 
@@ -228,7 +290,7 @@ Store.prototype = {
    * @param  records Array of records to apply
    * @return Array of record IDs which did not apply cleanly
    */
-  applyIncomingBatch: function applyIncomingBatch(records) {
+  applyIncomingBatch: function (records) {
     let failed = [];
     for each (let record in records) {
       try {
@@ -260,7 +322,7 @@ Store.prototype = {
    * @param record
    *        Record to apply
    */
-  applyIncoming: function Store_applyIncoming(record) {
+  applyIncoming: function (record) {
     if (record.deleted)
       this.remove(record);
     else if (!this.itemExists(record.id))
@@ -280,7 +342,7 @@ Store.prototype = {
    * @param record
    *        The store record to create an item from
    */
-  create: function Store_create(record) {
+  create: function (record) {
     throw "override create in a subclass";
   },
 
@@ -293,7 +355,7 @@ Store.prototype = {
    * @param record
    *        The store record to delete an item from
    */
-  remove: function Store_remove(record) {
+  remove: function (record) {
     throw "override remove in a subclass";
   },
 
@@ -306,7 +368,7 @@ Store.prototype = {
    * @param record
    *        The record to use to update an item from
    */
-  update: function Store_update(record) {
+  update: function (record) {
     throw "override update in a subclass";
   },
 
@@ -320,7 +382,7 @@ Store.prototype = {
    *         string record ID
    * @return boolean indicating whether record exists locally
    */
-  itemExists: function Store_itemExists(id) {
+  itemExists: function (id) {
     throw "override itemExists in a subclass";
   },
 
@@ -338,7 +400,7 @@ Store.prototype = {
    *         constructor for the newly-created record.
    * @return record type for this engine
    */
-  createRecord: function Store_createRecord(id, collection) {
+  createRecord: function (id, collection) {
     throw "override createRecord in a subclass";
   },
 
@@ -350,7 +412,7 @@ Store.prototype = {
    * @param  newID
    *         string new record ID
    */
-  changeItemID: function Store_changeItemID(oldID, newID) {
+  changeItemID: function (oldID, newID) {
     throw "override changeItemID in a subclass";
   },
 
@@ -360,7 +422,7 @@ Store.prototype = {
    * @return Object with ID strings as keys and values of true. The values
    *         are ignored.
    */
-  getAllIDs: function Store_getAllIDs() {
+  getAllIDs: function () {
     throw "override getAllIDs in a subclass";
   },
 
@@ -374,7 +436,7 @@ Store.prototype = {
    * can be thought of as clearing out all state and restoring the "new
    * browser" state.
    */
-  wipe: function Store_wipe() {
+  wipe: function () {
     throw "override wipe in a subclass";
   }
 };
@@ -388,14 +450,15 @@ this.EngineManager = function EngineManager(service) {
     "log.logger.service.engines", "Debug")];
 }
 EngineManager.prototype = {
-  get: function get(name) {
+  get: function (name) {
     // Return an array of engines if we have an array of names
     if (Array.isArray(name)) {
       let engines = [];
       name.forEach(function(name) {
         let engine = this.get(name);
-        if (engine)
+        if (engine) {
           engines.push(engine);
+        }
       }, this);
       return engines;
     }
@@ -403,17 +466,18 @@ EngineManager.prototype = {
     let engine = this._engines[name];
     if (!engine) {
       this._log.debug("Could not get engine: " + name);
-      if (Object.keys)
+      if (Object.keys) {
         this._log.debug("Engines are: " + JSON.stringify(Object.keys(this._engines)));
+      }
     }
     return engine;
   },
 
-  getAll: function getAll() {
+  getAll: function () {
     return [engine for ([name, engine] in Iterator(this._engines))];
   },
 
-  getEnabled: function getEnabled() {
+  getEnabled: function () {
     return this.getAll().filter(function(engine) engine.enabled);
   },
 
@@ -425,19 +489,20 @@ EngineManager.prototype = {
    *        Engine object used to get an instance of the engine
    * @return The engine object if anything failed
    */
-  register: function register(engineObject) {
-    if (Array.isArray(engineObject))
+  register: function (engineObject) {
+    if (Array.isArray(engineObject)) {
       return engineObject.map(this.register, this);
+    }
 
     try {
       let engine = new engineObject(this.service);
       let name = engine.name;
-      if (name in this._engines)
+      if (name in this._engines) {
         this._log.error("Engine '" + name + "' is already registered!");
-      else
+      } else {
         this._engines[name] = engine;
-    }
-    catch(ex) {
+      }
+    } catch (ex) {
       this._log.error(CommonUtils.exceptionStr(ex));
 
       let mesg = ex.message ? ex.message : ex;
@@ -452,14 +517,15 @@ EngineManager.prototype = {
     }
   },
 
-  unregister: function unregister(val) {
+  unregister: function (val) {
     let name = val;
-    if (val instanceof Engine)
+    if (val instanceof Engine) {
       name = val.name;
+    }
     delete this._engines[name];
   },
 
-  clear: function clear() {
+  clear: function () {
     for (let name in this._engines) {
       delete this._engines[name];
     }
@@ -493,8 +559,14 @@ Engine.prototype = {
   eEngineAbortApplyIncoming: "error.engine.abort.applyincoming",
 
   get prefName() this.name,
-  get enabled() Svc.Prefs.get("engine." + this.prefName, false),
-  set enabled(val) Svc.Prefs.set("engine." + this.prefName, !!val),
+  get enabled() {
+    return Svc.Prefs.get("engine." + this.prefName, false);
+  },
+
+  set enabled(val) {
+    Svc.Prefs.set("engine." + this.prefName, !!val);
+    this._tracker.onEngineEnabledChanged(val);
+  },
 
   get score() this._tracker.score,
 
@@ -510,27 +582,30 @@ Engine.prototype = {
     return tracker;
   },
 
-  sync: function Engine_sync() {
-    if (!this.enabled)
+  sync: function () {
+    if (!this.enabled) {
       return;
+    }
 
-    if (!this._sync)
+    if (!this._sync) {
       throw "engine does not implement _sync method";
+    }
 
     this._notify("sync", this.name, this._sync)();
   },
 
   /**
-   * Get rid of any local meta-data
+   * Get rid of any local meta-data.
    */
-  resetClient: function Engine_resetClient() {
-    if (!this._resetClient)
+  resetClient: function () {
+    if (!this._resetClient) {
       throw "engine does not implement _resetClient method";
+    }
 
     this._notify("reset-client", this.name, this._resetClient)();
   },
 
-  _wipeClient: function Engine__wipeClient() {
+  _wipeClient: function () {
     this.resetClient();
     this._log.debug("Deleting all local data");
     this._tracker.ignoreAll = true;
@@ -539,7 +614,7 @@ Engine.prototype = {
     this._tracker.clearChangedIDs();
   },
 
-  wipeClient: function Engine_wipeClient() {
+  wipeClient: function () {
     this._notify("wipe-client", this.name, this._wipeClient)();
   }
 };
@@ -606,7 +681,7 @@ SyncEngine.prototype = {
     // Store the value as a string to keep floating point precision
     Svc.Prefs.set(this.name + ".lastSync", value.toString());
   },
-  resetLastSync: function SyncEngine_resetLastSync() {
+  resetLastSync: function () {
     this._log.debug("Resetting " + this.name + " last sync time");
     Svc.Prefs.reset(this.name + ".lastSync");
     Svc.Prefs.set(this.name + ".lastSync", "0");
@@ -625,8 +700,8 @@ SyncEngine.prototype = {
     }, 0, this, "_toFetchDelay");
   },
 
-  loadToFetch: function loadToFetch() {
-    // Initialize to empty if there's no file
+  loadToFetch: function () {
+    // Initialize to empty if there's no file.
     this._toFetch = [];
     Utils.jsonLoad("toFetch/" + this.name, this, function(toFetch) {
       if (toFetch) {
@@ -647,7 +722,7 @@ SyncEngine.prototype = {
     }, 0, this, "_previousFailedDelay");
   },
 
-  loadPreviousFailed: function loadPreviousFailed() {
+  loadPreviousFailed: function () {
     // Initialize to empty if there's no file
     this._previousFailed = [];
     Utils.jsonLoad("failed/" + this.name, this, function(previousFailed) {
@@ -673,12 +748,12 @@ SyncEngine.prototype = {
    * can override this method to bypass the tracker for certain or all
    * changed items.
    */
-  getChangedIDs: function getChangedIDs() {
+  getChangedIDs: function () {
     return this._tracker.changedIDs;
   },
 
-  // Create a new record using the store and add in crypto fields
-  _createRecord: function SyncEngine__createRecord(id) {
+  // Create a new record using the store and add in crypto fields.
+  _createRecord: function (id) {
     let record = this._store.createRecord(id, this.name);
     record.id = id;
     record.collection = this.name;
@@ -686,7 +761,7 @@ SyncEngine.prototype = {
   },
 
   // Any setup that needs to happen at the beginning of each sync.
-  _syncStartup: function SyncEngine__syncStartup() {
+  _syncStartup: function () {
 
     // Determine if we need to wipe on outdated versions
     let metaGlobal = this.service.recordManager.get(this.metaURL);
@@ -1031,11 +1106,11 @@ SyncEngine.prototype = {
    *
    * @return GUID of the similar item; falsy otherwise
    */
-  _findDupe: function _findDupe(item) {
+  _findDupe: function (item) {
     // By default, assume there's no dupe items for the engine
   },
 
-  _deleteId: function _deleteId(id) {
+  _deleteId: function (id) {
     this._tracker.removeChangedID(id);
 
     // Remember this id to delete at the end of sync
@@ -1055,7 +1130,7 @@ SyncEngine.prototype = {
    * @return boolean
    *         Truthy if incoming record should be applied. False if not.
    */
-  _reconcile: function _reconcile(item) {
+  _reconcile: function (item) {
     if (this._log.level <= Log.Level.Trace) {
       this._log.trace("Incoming: " + item);
     }
@@ -1227,8 +1302,8 @@ SyncEngine.prototype = {
     return remoteIsNewer;
   },
 
-  // Upload outgoing records
-  _uploadOutgoing: function SyncEngine__uploadOutgoing() {
+  // Upload outgoing records.
+  _uploadOutgoing: function () {
     this._log.trace("Uploading local changes to server.");
 
     let modifiedIDs = Object.keys(this._modified);
@@ -1298,7 +1373,7 @@ SyncEngine.prototype = {
 
   // Any cleanup necessary.
   // Save the current snapshot so as to calculate changes at next sync
-  _syncFinish: function SyncEngine__syncFinish() {
+  _syncFinish: function () {
     this._log.trace("Finishing up sync");
     this._tracker.resetScore();
 
@@ -1325,9 +1400,10 @@ SyncEngine.prototype = {
     }
   },
 
-  _syncCleanup: function _syncCleanup() {
-    if (!this._modified)
+  _syncCleanup: function () {
+    if (!this._modified) {
       return;
+    }
 
     // Mark failed WBOs as changed again so they are reuploaded next time.
     for (let [id, when] in Iterator(this._modified)) {
@@ -1336,7 +1412,7 @@ SyncEngine.prototype = {
     this._modified = {};
   },
 
-  _sync: function SyncEngine__sync() {
+  _sync: function () {
     try {
       this._syncStartup();
       Observers.notify("weave:engine:sync:status", "process-incoming");
@@ -1349,7 +1425,7 @@ SyncEngine.prototype = {
     }
   },
 
-  canDecrypt: function canDecrypt() {
+  canDecrypt: function () {
     // Report failure even if there's nothing to decrypt
     let canDecrypt = false;
 
@@ -1377,13 +1453,13 @@ SyncEngine.prototype = {
     return canDecrypt;
   },
 
-  _resetClient: function SyncEngine__resetClient() {
+  _resetClient: function () {
     this.resetLastSync();
     this.previousFailed = [];
     this.toFetch = [];
   },
 
-  wipeServer: function wipeServer() {
+  wipeServer: function () {
     let response = this.service.resource(this.engineURL).delete();
     if (response.status != 200 && response.status != 404) {
       throw response;
@@ -1391,7 +1467,7 @@ SyncEngine.prototype = {
     this._resetClient();
   },
 
-  removeClientData: function removeClientData() {
+  removeClientData: function () {
     // Implement this method in engines that store client specific data
     // on the server.
   },
@@ -1412,7 +1488,7 @@ SyncEngine.prototype = {
    *
    * All return values will be part of the kRecoveryStrategy enumeration.
    */
-  handleHMACMismatch: function handleHMACMismatch(item, mayRetry) {
+  handleHMACMismatch: function (item, mayRetry) {
     // By default we either try again, or bail out noisily.
     return (this.service.handleHMACEvent() && mayRetry) ?
            SyncEngine.kRecoveryStrategy.retry :
diff --git a/services/sync/modules/engines/addons.js b/services/sync/modules/engines/addons.js
index d8cf014be0ea..9b0eafbf95b6 100644
--- a/services/sync/modules/engines/addons.js
+++ b/services/sync/modules/engines/addons.js
@@ -655,9 +655,6 @@ AddonsStore.prototype = {
  */
 function AddonsTracker(name, engine) {
   Tracker.call(this, name, engine);
-
-  Svc.Obs.add("weave:engine:start-tracking", this);
-  Svc.Obs.add("weave:engine:stop-tracking", this);
 }
 AddonsTracker.prototype = {
   __proto__: Tracker.prototype,
@@ -691,20 +688,16 @@ AddonsTracker.prototype = {
     this.score += SCORE_INCREMENT_XLARGE;
   },
 
-  observe: function(subject, topic, data) {
-    switch (topic) {
-      case "weave:engine:start-tracking":
-        if (this.engine.enabled) {
-          this.reconciler.startListening();
-        }
-
-        this.reconciler.addChangeListener(this);
-        break;
-
-      case "weave:engine:stop-tracking":
-        this.reconciler.removeChangeListener(this);
-        this.reconciler.stopListening();
-        break;
+  startTracking: function() {
+    if (this.engine.enabled) {
+      this.reconciler.startListening();
     }
-  }
+
+    this.reconciler.addChangeListener(this);
+  },
+
+  stopTracking: function() {
+    this.reconciler.removeChangeListener(this);
+    this.reconciler.stopListening();
+  },
 };
diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js
index 7ef86cc73461..3484dbee46b2 100644
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@@ -1298,34 +1298,28 @@ function BookmarksTracker(name, engine) {
   Tracker.call(this, name, engine);
 
   Svc.Obs.add("places-shutdown", this);
-  Svc.Obs.add("weave:engine:start-tracking", this);
-  Svc.Obs.add("weave:engine:stop-tracking", this);
 }
 BookmarksTracker.prototype = {
   __proto__: Tracker.prototype,
 
-  _enabled: false,
-  observe: function observe(subject, topic, data) {
-    switch (topic) {
-      case "weave:engine:start-tracking":
-        if (!this._enabled) {
-          PlacesUtils.bookmarks.addObserver(this, true);
-          Svc.Obs.add("bookmarks-restore-begin", this);
-          Svc.Obs.add("bookmarks-restore-success", this);
-          Svc.Obs.add("bookmarks-restore-failed", this);
-          this._enabled = true;
-        }
-        break;
-      case "weave:engine:stop-tracking":
-        if (this._enabled) {
-          PlacesUtils.bookmarks.removeObserver(this);
-          Svc.Obs.remove("bookmarks-restore-begin", this);
-          Svc.Obs.remove("bookmarks-restore-success", this);
-          Svc.Obs.remove("bookmarks-restore-failed", this);
-          this._enabled = false;
-        }
-        break;
+  startTracking: function() {
+    PlacesUtils.bookmarks.addObserver(this, true);
+    Svc.Obs.add("bookmarks-restore-begin", this);
+    Svc.Obs.add("bookmarks-restore-success", this);
+    Svc.Obs.add("bookmarks-restore-failed", this);
+  },
 
+  stopTracking: function() {
+    PlacesUtils.bookmarks.removeObserver(this);
+    Svc.Obs.remove("bookmarks-restore-begin", this);
+    Svc.Obs.remove("bookmarks-restore-success", this);
+    Svc.Obs.remove("bookmarks-restore-failed", this);
+  },
+
+  observe: function observe(subject, topic, data) {
+    Tracker.prototype.observe.call(this, subject, topic, data);
+
+    switch (topic) {
       case "bookmarks-restore-begin":
         this._log.debug("Ignoring changes from importing bookmarks.");
         this.ignoreAll = true;
diff --git a/services/sync/modules/engines/forms.js b/services/sync/modules/engines/forms.js
index 944558991ad9..5d9840282077 100644
--- a/services/sync/modules/engines/forms.js
+++ b/services/sync/modules/engines/forms.js
@@ -202,8 +202,6 @@ FormStore.prototype = {
 
 function FormTracker(name, engine) {
   Tracker.call(this, name, engine);
-  Svc.Obs.add("weave:engine:start-tracking", this);
-  Svc.Obs.add("weave:engine:stop-tracking", this);
 }
 FormTracker.prototype = {
   __proto__: Tracker.prototype,
@@ -212,21 +210,18 @@ FormTracker.prototype = {
     Ci.nsIObserver,
     Ci.nsISupportsWeakReference]),
 
-  _enabled: false,
+  startTracking: function() {
+    Svc.Obs.add("satchel-storage-changed", this);
+  },
+
+  stopTracking: function() {
+    Svc.Obs.remove("satchel-storage-changed", this);
+  },
+
   observe: function (subject, topic, data) {
+    Tracker.prototype.observe.call(this, subject, topic, data);
+
     switch (topic) {
-      case "weave:engine:start-tracking":
-        if (!this._enabled) {
-          Svc.Obs.add("satchel-storage-changed", this);
-          this._enabled = true;
-        }
-        break;
-      case "weave:engine:stop-tracking":
-        if (this._enabled) {
-          Svc.Obs.remove("satchel-storage-changed", this);
-          this._enabled = false;
-        }
-        break;
       case "satchel-storage-changed":
         if (data == "formhistory-add" || data == "formhistory-remove") {
           let guid = subject.QueryInterface(Ci.nsISupportsString).toString();
diff --git a/services/sync/modules/engines/history.js b/services/sync/modules/engines/history.js
index 3710273e4d36..6f8d65e2d2b1 100644
--- a/services/sync/modules/engines/history.js
+++ b/services/sync/modules/engines/history.js
@@ -348,28 +348,18 @@ HistoryStore.prototype = {
 
 function HistoryTracker(name, engine) {
   Tracker.call(this, name, engine);
-  Svc.Obs.add("weave:engine:start-tracking", this);
-  Svc.Obs.add("weave:engine:stop-tracking", this);
 }
 HistoryTracker.prototype = {
   __proto__: Tracker.prototype,
 
-  _enabled: false,
-  observe: function observe(subject, topic, data) {
-    switch (topic) {
-      case "weave:engine:start-tracking":
-        if (!this._enabled) {
-          PlacesUtils.history.addObserver(this, true);
-          this._enabled = true;
-        }
-        break;
-      case "weave:engine:stop-tracking":
-        if (this._enabled) {
-          PlacesUtils.history.removeObserver(this);
-          this._enabled = false;
-        }
-        break;
-    }
+  startTracking: function() {
+    this._log.info("Adding Places observer.");
+    PlacesUtils.history.addObserver(this, true);
+  },
+
+  stopTracking: function() {
+    this._log.info("Removing Places observer.");
+    PlacesUtils.history.removeObserver(this);
   },
 
   QueryInterface: XPCOMUtils.generateQI([
diff --git a/services/sync/modules/engines/passwords.js b/services/sync/modules/engines/passwords.js
index 5952b01f3803..42b6e9cc29e1 100644
--- a/services/sync/modules/engines/passwords.js
+++ b/services/sync/modules/engines/passwords.js
@@ -263,49 +263,43 @@ function PasswordTracker(name, engine) {
 PasswordTracker.prototype = {
   __proto__: Tracker.prototype,
 
-  _enabled: false,
-  observe: function PasswordTracker_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "weave:engine:start-tracking":
-        if (!this._enabled) {
-          Svc.Obs.add("passwordmgr-storage-changed", this);
-          this._enabled = true;
-        }
-        return;
-      case "weave:engine:stop-tracking":
-        if (this._enabled) {
-          Svc.Obs.remove("passwordmgr-storage-changed", this);
-          this._enabled = false;
-        }
-        return;
-    }
+  startTracking: function() {
+    Svc.Obs.add("passwordmgr-storage-changed", this);
+  },
 
-    if (this.ignoreAll)
+  stopTracking: function() {
+    Svc.Obs.remove("passwordmgr-storage-changed", this);
+  },
+
+  observe: function(subject, topic, data) {
+    Tracker.prototype.observe.call(this, subject, topic, data);
+
+    if (this.ignoreAll) {
       return;
+    }
 
     // A single add, remove or change or removing all items
     // will trigger a sync for MULTI_DEVICE.
-    switch (aData) {
-    case 'modifyLogin':
-      aSubject = aSubject.QueryInterface(Ci.nsIArray).
-        queryElementAt(1, Ci.nsILoginMetaInfo);
-      // fallthrough
-    case 'addLogin':
-    case 'removeLogin':
-      // Skip over Weave password/passphrase changes
-      aSubject.QueryInterface(Ci.nsILoginMetaInfo).
-        QueryInterface(Ci.nsILoginInfo);
-      if (aSubject.hostname == PWDMGR_HOST)
-        break;
+    switch (data) {
+      case "modifyLogin":
+        subject = subject.QueryInterface(Ci.nsIArray).queryElementAt(1, Ci.nsILoginMetaInfo);
+        // fallthrough
+      case "addLogin":
+      case "removeLogin":
+        // Skip over Weave password/passphrase changes.
+        subject.QueryInterface(Ci.nsILoginMetaInfo).QueryInterface(Ci.nsILoginInfo);
+        if (subject.hostname == PWDMGR_HOST) {
+          break;
+        }
 
-      this.score += SCORE_INCREMENT_XLARGE;
-      this._log.trace(aData + ": " + aSubject.guid);
-      this.addChangedID(aSubject.guid);
-      break;
-    case 'removeAllLogins':
-      this._log.trace(aData);
-      this.score += SCORE_INCREMENT_XLARGE;
-      break;
+        this.score += SCORE_INCREMENT_XLARGE;
+        this._log.trace(data + ": " + subject.guid);
+        this.addChangedID(subject.guid);
+        break;
+      case "removeAllLogins":
+        this._log.trace(data);
+        this.score += SCORE_INCREMENT_XLARGE;
+        break;
     }
   }
 };
diff --git a/services/sync/modules/engines/prefs.js b/services/sync/modules/engines/prefs.js
index 2418cd0dc5be..c124280b6d5d 100644
--- a/services/sync/modules/engines/prefs.js
+++ b/services/sync/modules/engines/prefs.js
@@ -67,7 +67,7 @@ PrefsEngine.prototype = {
 
 function PrefStore(name, engine) {
   Store.call(this, name, engine);
-  Svc.Obs.add("profile-before-change", function() {
+  Svc.Obs.add("profile-before-change", function () {
     this.__prefs = null;
   }, this);
 }
@@ -214,38 +214,36 @@ PrefTracker.prototype = {
 
  __prefs: null,
   get _prefs() {
-    if (!this.__prefs)
+    if (!this.__prefs) {
       this.__prefs = new Preferences();
+    }
     return this.__prefs;
   },
 
-  _enabled: false,
-  observe: function(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "weave:engine:start-tracking":
-        if (!this._enabled) {
-          Cc["@mozilla.org/preferences-service;1"]
-            .getService(Ci.nsIPrefBranch).addObserver("", this, false);
-          this._enabled = true;
-        }
-        break;
-      case "weave:engine:stop-tracking":
-        if (this._enabled)
-          this._enabled = false;
-        // Fall through to clean up.
+  startTracking: function () {
+    Services.prefs.addObserver("", this, false);
+  },
+
+  stopTracking: function () {
+    this.__prefs = null;
+    Services.prefs.removeObserver("", this);
+  },
+
+  observe: function (subject, topic, data) {
+    Tracker.prototype.observe.call(this, subject, topic, data);
+
+    switch (topic) {
       case "profile-before-change":
-        this.__prefs = null;
-        Cc["@mozilla.org/preferences-service;1"]
-          .getService(Ci.nsIPrefBranch).removeObserver("", this);
+        this.stopTracking();
         break;
       case "nsPref:changed":
         // Trigger a sync for MULTI-DEVICE for a change that determines
         // which prefs are synced or a regular pref change.
-        if (aData.indexOf(WEAVE_SYNC_PREFS) == 0 || 
-            this._prefs.get(WEAVE_SYNC_PREFS + aData, false)) {
+        if (data.indexOf(WEAVE_SYNC_PREFS) == 0 ||
+            this._prefs.get(WEAVE_SYNC_PREFS + data, false)) {
           this.score += SCORE_INCREMENT_XLARGE;
           this.modified = true;
-          this._log.trace("Preference " + aData + " changed");
+          this._log.trace("Preference " + data + " changed");
         }
         break;
     }
diff --git a/services/sync/modules/engines/tabs.js b/services/sync/modules/engines/tabs.js
index 24dbf0b2fae2..338b26240d5b 100644
--- a/services/sync/modules/engines/tabs.js
+++ b/services/sync/modules/engines/tabs.js
@@ -83,7 +83,7 @@ TabEngine.prototype = {
    * reappear in the menu.
    */
   locallyOpenTabMatchesURL: function TabEngine_localTabMatches(url) {
-    return this._store.getAllTabs().some(function(tab) {
+    return this._store.getAllTabs().some(function (tab) {
       return tab.urlHistory[0] == url;
     });
   }
@@ -122,11 +122,11 @@ TabStore.prototype = {
 
     let currentState = JSON.parse(Svc.Session.getBrowserState());
     let tabLastUsed = this.tabLastUsed;
-    currentState.windows.forEach(function(window) {
+    currentState.windows.forEach(function (window) {
       if (window.isPrivate) {
         return;
       }
-      window.tabs.forEach(function(tab) {
+      window.tabs.forEach(function (tab) {
         // Make sure there are history entries to look at.
         if (!tab.entries.length)
           return;
@@ -158,7 +158,7 @@ TabStore.prototype = {
     record.clientName = this.engine.service.clientsEngine.localName;
 
     // Sort tabs in descending-used order to grab the most recently used
-    let tabs = this.getAllTabs(true).sort(function(a, b) {
+    let tabs = this.getAllTabs(true).sort(function (a, b) {
       return b.lastUsed - a.lastUsed;
     });
 
@@ -178,7 +178,7 @@ TabStore.prototype = {
     }
 
     this._log.trace("Created tabs " + tabs.length + " of " + origLength);
-    tabs.forEach(function(tab) {
+    tabs.forEach(function (tab) {
       this._log.trace("Wrapping tab: " + JSON.stringify(tab));
     }, this);
 
@@ -283,34 +283,32 @@ TabTracker.prototype = {
     }
   },
 
-  _enabled: false,
-  observe: function TabTracker_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "weave:engine:start-tracking":
-        if (!this._enabled) {
-          Svc.Obs.add("domwindowopened", this);
-          let wins = Services.wm.getEnumerator("navigator:browser");
-          while (wins.hasMoreElements())
-            this._registerListenersForWindow(wins.getNext());
-          this._enabled = true;
-        }
-        break;
-      case "weave:engine:stop-tracking":
-        if (this._enabled) {
-          Svc.Obs.remove("domwindowopened", this);
-          let wins = Services.wm.getEnumerator("navigator:browser");
-          while (wins.hasMoreElements())
-            this._unregisterListenersForWindow(wins.getNext());
-          this._enabled = false;
-        }
-        return;
+  startTracking: function () {
+    Svc.Obs.add("domwindowopened", this);
+    let wins = Services.wm.getEnumerator("navigator:browser");
+    while (wins.hasMoreElements()) {
+      this._registerListenersForWindow(wins.getNext());
+    }
+  },
+
+  stopTracking: function () {
+    Svc.Obs.remove("domwindowopened", this);
+    let wins = Services.wm.getEnumerator("navigator:browser");
+    while (wins.hasMoreElements()) {
+      this._unregisterListenersForWindow(wins.getNext());
+    }
+  },
+
+  observe: function (subject, topic, data) {
+    Tracker.prototype.observe.call(this, subject, topic, data);
+
+    switch (topic) {
       case "domwindowopened":
-        // Add tab listeners now that a window has opened
-        let self = this;
-        aSubject.addEventListener("load", function onLoad(event) {
-          aSubject.removeEventListener("load", onLoad, false);
-          // Only register after the window is done loading to avoid unloads
-          self._registerListenersForWindow(aSubject);
+        // Add tab listeners now that a window has opened.
+        subject.addEventListener("load", (event) => {
+          subject.removeEventListener("load", onLoad, false);
+          // Only register after the window is done loading to avoid unloads.
+          this._registerListenersForWindow(subject);
         }, false);
         break;
     }
diff --git a/services/sync/tests/unit/test_addons_tracker.js b/services/sync/tests/unit/test_addons_tracker.js
index 1d412469d415..690a57d0375c 100644
--- a/services/sync/tests/unit/test_addons_tracker.js
+++ b/services/sync/tests/unit/test_addons_tracker.js
@@ -27,7 +27,7 @@ const addon1ID = "addon1@tests.mozilla.org";
 
 function cleanup_and_advance() {
   Svc.Obs.notify("weave:engine:stop-tracking");
-  tracker.observe(null, "weave:engine:stop-tracking");
+  tracker.stopTracking();
 
   tracker.resetScore();
   tracker.clearChangedIDs();
diff --git a/services/sync/tests/unit/test_engine.js b/services/sync/tests/unit/test_engine.js
index 350f7b5b83d0..f5c473c1e93c 100644
--- a/services/sync/tests/unit/test_engine.js
+++ b/services/sync/tests/unit/test_engine.js
@@ -18,15 +18,15 @@ SteamStore.prototype = {
   }
 };
 
-function SteamTracker(engine) {
-  Tracker.call(this, "Steam", engine);
+function SteamTracker(name, engine) {
+  Tracker.call(this, name || "Steam", engine);
 }
 SteamTracker.prototype = {
   __proto__: Tracker.prototype
 };
 
-function SteamEngine() {
-  Engine.call(this, "Steam", Service);
+function SteamEngine(service) {
+  Engine.call(this, "Steam", service);
   this.wasReset = false;
   this.wasSynced = false;
 }
@@ -186,3 +186,32 @@ add_test(function test_sync() {
     engineObserver.reset();
   }
 });
+
+add_test(function test_disabled_no_track() {
+  _("When an engine is disabled, its tracker is not tracking.");
+  let engine = new SteamEngine(Service);
+  let tracker = engine._tracker;
+  do_check_eq(engine, tracker.engine);
+
+  do_check_false(engine.enabled);
+  do_check_false(tracker._isTracking);
+  do_check_empty(tracker.changedIDs);
+
+  do_check_false(tracker.engineIsEnabled());
+  tracker.observe(null, "weave:engine:start-tracking", null);
+  do_check_false(tracker._isTracking);
+  do_check_empty(tracker.changedIDs);
+
+  engine.enabled = true;
+  tracker.observe(null, "weave:engine:start-tracking", null);
+  do_check_true(tracker._isTracking);
+  do_check_empty(tracker.changedIDs);
+
+  tracker.addChangedID("abcdefghijkl");
+  do_check_true(0 < tracker.changedIDs["abcdefghijkl"]);
+  engine.enabled = false;
+  do_check_false(tracker._isTracking);
+  do_check_empty(tracker.changedIDs);
+
+  run_next_test();
+});

From ea7579cc75530ff885b651e1ecee723c579eecb8 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 10:10:23 -0800
Subject: [PATCH 67/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/af35006eefb4
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14756 from julienw/936369-fix-keyboard-manager

Bug 936369 - [system] Intermittent Travis Unit Test Failure: KeyboardMan...

========

https://hg.mozilla.org/integration/gaia-central/rev/1b2c85cee3bc
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 936369 - [system] Intermittent Travis Unit Test Failure: KeyboardManager Transitions Call showKeyboard against visible keyboard: Error: timeout of 2000ms exceeded r=janjongboom

LOOK MA NO INTERMITTENT!
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 177ae2267f36..83a14f210170 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "e29ffa8b1f3a46307e4b181b86260be768cf2a77", 
+    "revision": "af35006eefb4f2bc593eb8646ec64f660964b86e", 
     "repo_path": "/integration/gaia-central"
 }

From d180512a8d0593a8a48e4d2dbb04f02b5de10d9c Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 19 Dec 2013 11:48:23 -0800
Subject: [PATCH 68/78] Bug 947772 - Follow-up: fix sneaky test (disabled on
 some platforms). r=me

---
 services/sync/tests/unit/test_history_tracker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/sync/tests/unit/test_history_tracker.js b/services/sync/tests/unit/test_history_tracker.js
index dd1ac26854e3..d28c885ba876 100644
--- a/services/sync/tests/unit/test_history_tracker.js
+++ b/services/sync/tests/unit/test_history_tracker.js
@@ -72,7 +72,7 @@ add_test(function test_empty() {
   _("Verify we've got an empty, disabled tracker to work with.");
   do_check_empty(tracker.changedIDs);
   do_check_eq(tracker.score, 0);
-  do_check_false(tracker._enabled);
+  do_check_false(tracker._isTracking);
   run_next_test();
 });
 

From 9d8e5b6035a9f194be784c9ea6e9564aad4c4de6 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 11:50:35 -0800
Subject: [PATCH 69/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6cbf012fc0dc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14862 from KevinGrandon/rocketbar_disable_failing_test

Bug 946452 - Disable rocketbar failing tests r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/7792734c96f2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 946452 - Disable rocketbar failing tests r=me
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 83a14f210170..21660d4e0c59 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "af35006eefb4f2bc593eb8646ec64f660964b86e", 
+    "revision": "6cbf012fc0dc39ab000e57b145c2a3f4812c035d", 
     "repo_path": "/integration/gaia-central"
 }

From be6004cbfb242e8b60168c8bd556a72d334e5aae Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 12:31:24 -0800
Subject: [PATCH 70/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6d1addb30556
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #14860 from gaye/bug-952168

Bug 952168 - Edges gestures tests are failing on TBPL

========

https://hg.mozilla.org/integration/gaia-central/rev/9ec730114e20
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 952168 - Edges gestures tests are failing on TBPL
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 21660d4e0c59..38383f575c1a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "6cbf012fc0dc39ab000e57b145c2a3f4812c035d", 
+    "revision": "6d1addb30556306570a40bb8b3fc21e7f82576cc", 
     "repo_path": "/integration/gaia-central"
 }

From e690bf6459d129495ddc67ca385a16111ad85ece Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 13:05:24 -0800
Subject: [PATCH 71/78] Bumping gaia.json for 2 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3fb358a794fd
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #14725 from mcav/fix-pop3-header

Bug 950200 - [Email][V1.3][POP3] Please change the "SettingS" of POP3 configuration page to "Settings"

========

https://hg.mozilla.org/integration/gaia-central/rev/bb8c822e483f
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 950200 - [Email][V1.3][POP3] Please change the "SettingS" of POP3 configuration page to "Settings"
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 38383f575c1a..5e01612bc2e8 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "6d1addb30556306570a40bb8b3fc21e7f82576cc", 
+    "revision": "3fb358a794fddc4199194aae247e29b7dbb990dc", 
     "repo_path": "/integration/gaia-central"
 }

From f2ac3eca2c4c5ef2fec8755aae6be3a1e9e8b36a Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Thu, 19 Dec 2013 13:57:26 -0800
Subject: [PATCH 72/78] Bumping gaia.json for 14 gaia-central revision(s)
 a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c8f56fb9f988
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 950914 - [Messages][Drafts] Replace existing draft when hiding app while showing unsent, existing draft content

========

https://hg.mozilla.org/integration/gaia-central/rev/d7ad364d6bc7
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 943395 - [Messages][Drafts] Replace existing Draft layer needed when replacing draft

========

https://hg.mozilla.org/integration/gaia-central/rev/76fdef6bd081
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 947211 - [Messages][Drafts] Thread message/draft status (preview, styling and icon) is not accurate for various cases r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=947211
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/1779875de904
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 917639 r=julienw

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/4b8b74f147e3
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 949524 - [Messages][Drafts] TypeError: record/draft.content.find is not a function r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=949524

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/112567463dcc
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 949140 - [Messages][Drafts] Thread list doesn't discard new draft thread that is discarded via menu

========

https://hg.mozilla.org/integration/gaia-central/rev/69f300d0e26b
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 949137 - [Messages][Drafts] Composer doesn't clear after sending a new draft r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/e3ab3fe0a372
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 947215 - [Messages][Drafts] Do not try to match an existing thread when saving a threadless draft r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/41e19646ad57
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 946989 - [Messages][Drafts] Duplicate threadless drafts get saved r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/c672f0347c25
Author: Adam Hyland <protonk@gmail.com>
Desc: Bug 946995 - [Messages][Drafts] MMS Drafts don't restore correctly after app closes/restarts r=rwaldron

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/fa0437fc000f
Author: Adam Hyland <protonk@gmail.com>
Desc: Bug 936648 - [Messages][Drafts] Draft display and interaction within a thread r=rwaldron

========

https://hg.mozilla.org/integration/gaia-central/rev/67b009977bc7
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 936647 - [Messages][Drafts] Preview drafts threads in thread list r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=936647

- index.html:
  - messages-thread-tmpl
    - Adds "icon-draft" class to "icon icon-read" classes
    - Adds data-l10n-id="no-receipient"
    - Adds data-list=draft|thread

- js/desktop-only/mobilemessage.js
  - Updates Draft bootstrapping data

- js/drafts.js
  - Adds read-once and cache to Drafts.request
  - Adds unique id mechanism
  - Updates Drafts.delete to allow deleting all drafts for a threadId
  - Renames Drafts.byId => Drafts.byThreadId
  - Adds Drafts.get(draftId)
  - Updates Drafts.request to abide a local isCached flag.
    - Only load from storage when isCached is false.
  - Updates Drafts.request to revive stored Draft objects as actual Draft objects
  - Adds Draft.List.prototype.latest that points at the latest draft in a Draft.List (ie. for a specified threadId or null key)
  - Adds function guid for creating quasi-unique ids

- js/message_manager.js
  - Adds `draft` property to hold draft object to coordinate with New Message view
  - Calls Drafts.request() from init
  - Calls ThreadListUI.renderDrafts() from onHashChange when hash = #thread-list

- js/thread_list_ui.js
  - Wraps contents in IIFE
  - Adds draftLinks property to map DOM nodes to draftId
  - Updates setContact to include lookup from draft
  - Updates handleEvent to capture draft object on click. Stops looking at 'threads-container'
  - Updates delete to create two lists of deletable items from the selectedInputs array. List is determined by data-list property value.
    - Drafts are deleted similarly to Threads, but will exit immediately if no Threads are to be deleted
    - Drafts.store() is called upon completing delete operation
  - Adds ThreadListUI.renderDrafts to create "Thread List Items" from Draft objects that do not have their own thread
  - Calls ThreadListUI.renderDrafts from ThreadListUI.renderThreads
  - Updates ThreadListUI.createThread to create a "Thread List Item" from a Draft object, or to mark a Thread that has a draft.
  - Updates rendered markup for "Thread List Item"
  - Updates timestamp handling in ThreadListUI.appendThread

- js/thread_ui.js
  - Updates ThreadUI.saveMessageDraft new or replacement drafts

- js/threads.js
  - Expose Thread constructor
  - Adds Thread.prototype.drafts accessor to Drafts.byThreadId(this.id);
  - Adds Thread.prototype.hasDrafts accessor as short hand

- Adds tests to:
  - test/unit/compose_test.js
  - test/unit/drafts_test.js
  - test/unit/media/pixel.jpg
  - test/unit/message_manager_test.js
  - test/unit/mock_async_storage.js
  - test/unit/mock_drafts.js
  - test/unit/mock_navigatormoz_sms.js
  - test/unit/thread_list_ui_test.js
  - test/unit/thread_ui_test.js
  - test/unit/threads_test.js

- Passing both lint and hint

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/a0f8e3d0efc0
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 936641 - [Messages][Drafts] Create message drafts upon user interaction

========

https://hg.mozilla.org/integration/gaia-central/rev/bb759ce17d5a
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 935177 - [Messages][Drafts] Update "discard message" confirmation prompt to options menu/dialog; add "save draft" no-op r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=935177

- New strings:
  - save-as-draft      = Save as Draft
  - discard-message = Discard
- Removes window.confirm mechanism
- Implements Multi-option prompt with OptionMenu
- Basic tests to assert the correct operations are performed by the option handlers

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 5e01612bc2e8..9f98d0b95bdf 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "3fb358a794fddc4199194aae247e29b7dbb990dc", 
+    "revision": "c8f56fb9f9888d4f4e7f55a52a639b9271b8d207", 
     "repo_path": "/integration/gaia-central"
 }

From bdfab24d3efd8f71d27ef9d13c891439a3e3bf66 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Thu, 19 Dec 2013 17:49:05 -0500
Subject: [PATCH 73/78] Backed out changeset 93d8c8703f4d

---
 docshell/base/nsIMarkupDocumentViewer.idl |  12 --
 layout/base/nsDocumentViewer.cpp          |  42 +------
 layout/base/nsIPresShell.h                |  21 +---
 layout/base/nsPresShell.cpp               |  31 +-----
 layout/base/nsPresShell.h                 |   3 -
 mobile/android/chrome/content/browser.js  | 130 ++++++----------------
 6 files changed, 41 insertions(+), 198 deletions(-)

diff --git a/docshell/base/nsIMarkupDocumentViewer.idl b/docshell/base/nsIMarkupDocumentViewer.idl
index 27eef2b62611..342f741435c1 100644
--- a/docshell/base/nsIMarkupDocumentViewer.idl
+++ b/docshell/base/nsIMarkupDocumentViewer.idl
@@ -82,18 +82,6 @@ interface nsIMarkupDocumentViewer : nsISupports
    */
   void changeMaxLineBoxWidth(in int32_t maxLineBoxWidth);
 
-  /**
-   * Instruct the refresh driver to discontinue painting until further
-   * notice.
-   */
-  void pausePainting();
-
-  /**
-   * Instruct the refresh driver to resume painting after a previous call to
-   * pausePainting().
-   */
-  void resumePainting();
-
   /*
    * Render the document as if being viewed on a device with the specified
    * media type. This will cause a reflow.
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 35da30644759..885c8444d2da 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2700,17 +2700,6 @@ struct LineBoxInfo
   nscoord mMaxLineBoxWidth;
 };
 
-static void
-ChangeChildPaintingEnabled(nsIMarkupDocumentViewer* aChild, void* aClosure)
-{
-  bool* enablePainting = (bool*) aClosure;
-  if (*enablePainting) {
-    aChild->ResumePainting();
-  } else {
-    aChild->PausePainting();
-  }
-}
-
 static void
 ChangeChildMaxLineBoxWidth(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
@@ -3137,36 +3126,7 @@ NS_IMETHODIMP nsDocumentViewer::AppendSubtree(nsTArray<nsCOMPtr<nsIMarkupDocumen
   return NS_OK;
 }
 
-nsresult
-nsDocumentViewer::PausePainting()
-{
-  bool enablePaint = false;
-  CallChildren(ChangeChildPaintingEnabled, &enablePaint);
-
-  nsIPresShell* presShell = GetPresShell();
-  if (presShell) {
-    presShell->PausePainting();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsDocumentViewer::ResumePainting()
-{
-  bool enablePaint = true;
-  CallChildren(ChangeChildPaintingEnabled, &enablePaint);
-
-  nsIPresShell* presShell = GetPresShell();
-  if (presShell) {
-    presShell->ResumePainting();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-nsDocumentViewer::ChangeMaxLineBoxWidth(int32_t aMaxLineBoxWidth)
+NS_IMETHODIMP nsDocumentViewer::ChangeMaxLineBoxWidth(int32_t aMaxLineBoxWidth)
 {
   // Change the max line box width for all children.
   struct LineBoxInfo lbi = { aMaxLineBoxWidth };
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index db9470f7b921..30d4f6025165 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -129,10 +129,10 @@ typedef struct CapturingContentInfo {
 } CapturingContentInfo;
 
 
-// 0e4f2b36-7ab8-43c5-b912-5c311566297c
+// f5b542a9-eaf0-4560-a656-37a9d379864c
 #define NS_IPRESSHELL_IID \
-{ 0xde498c49, 0xf83f, 0x47bf, \
-  {0x8c, 0xc6, 0x8f, 0xf8, 0x74, 0x62, 0x22, 0x23 } }
+{ 0xf5b542a9, 0xeaf0, 0x4560, \
+  { 0x37, 0xa9, 0xd3, 0x79, 0x86, 0x4c } }
 
 // debug VerifyReflow flags
 #define VERIFY_REFLOW_ON                    0x01
@@ -836,20 +836,6 @@ public:
    */
   bool IsPaintingSuppressed() const { return mPaintingSuppressed; }
 
-  /**
-   * Pause painting by freezing the refresh driver of this and all parent
-   * presentations. This may not have the desired effect if this pres shell
-   * has its own refresh driver.
-   */
-  virtual void PausePainting() = 0;
-
-  /**
-   * Resume painting by thawing the refresh driver of this and all parent
-   * presentations. This may not have the desired effect if this pres shell
-   * has its own refresh driver.
-   */
-  virtual void ResumePainting() = 0;
-
   /**
    * Unsuppress painting.
    */
@@ -1615,7 +1601,6 @@ protected:
   bool mFontSizeInflationForceEnabled;
   bool mFontSizeInflationDisabledInMasterProcess;
   bool mFontSizeInflationEnabled;
-  bool mPaintingIsFrozen;
 
   // Dirty bit indicating that mFontSizeInflationEnabled needs to be recomputed.
   bool mFontSizeInflationEnabledIsDirty;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index f2e513ce358c..a600299c2b9f 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -724,8 +724,6 @@ PresShell::PresShell()
                                  "layout.reflow.synthMouseMove", true);
     addedSynthMouseMove = true;
   }
-
-  mPaintingIsFrozen = false;
 }
 
 NS_IMPL_ISUPPORTS7(PresShell, nsIPresShell, nsIDocumentObserver,
@@ -746,13 +744,6 @@ PresShell::~PresShell()
                mLastCallbackEventRequest == nullptr,
                "post-reflow queues not empty.  This means we're leaking");
 
-  // Verify that if painting was frozen, but we're being removed from the tree,
-  // that we now re-enable painting on our refresh driver, since it may need to
-  // be re-used by another presentation.
-  if (mPaintingIsFrozen) {
-    mPresContext->RefreshDriver()->Thaw();
-  }
-
 #ifdef DEBUG
   MOZ_ASSERT(mPresArenaAllocCount == 0,
              "Some pres arena objects were not freed");
@@ -9929,7 +9920,7 @@ nsIPresShell::FontSizeInflationEnabled()
   return mFontSizeInflationEnabled;
 }
 
-NS_IMETHODIMP
+void
 nsIPresShell::SetMaxLineBoxWidth(nscoord aMaxLineBoxWidth)
 {
   NS_ASSERTION(aMaxLineBoxWidth >= 0, "attempting to set max line box width to a negative value");
@@ -9940,23 +9931,3 @@ nsIPresShell::SetMaxLineBoxWidth(nscoord aMaxLineBoxWidth)
     FrameNeedsReflow(GetRootFrame(), eResize, NS_FRAME_HAS_DIRTY_CHILDREN);
   }
 }
-
-NS_IMETHODIMP
-PresShell::PausePainting()
-{
-  if (GetPresContext()->RefreshDriver()->PresContext() != GetPresContext())
-    return;
-
-  mPaintingIsFrozen = true;
-  GetPresContext()->RefreshDriver()->Freeze();
-}
-
-NS_IMETHODIMP
-PresShell::ResumePainting()
-{
-  if (GetPresContext()->RefreshDriver()->PresContext() != GetPresContext())
-    return;
-
-  mPaintingIsFrozen = false;
-  GetPresContext()->RefreshDriver()->Thaw();
-}
diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h
index 932f9662bb75..8e14e4d8eef7 100644
--- a/layout/base/nsPresShell.h
+++ b/layout/base/nsPresShell.h
@@ -689,9 +689,6 @@ protected:
   virtual void ThemeChanged() MOZ_OVERRIDE { mPresContext->ThemeChanged(); }
   virtual void BackingScaleFactorChanged() MOZ_OVERRIDE { mPresContext->UIResolutionChanged(); }
 
-  virtual void PausePainting() MOZ_OVERRIDE;
-  virtual void ResumePainting() MOZ_OVERRIDE;
-
   void UpdateImageVisibility();
 
   nsRevocableEventPtr<nsRunnableMethod<PresShell> > mUpdateImageVisibilityEvent;
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 32e4b872992d..6e6b640b19a4 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -182,11 +182,6 @@ function doChangeMaxLineBoxWidth(aWidth) {
 
   if (range) {
     BrowserEventHandler._zoomInAndSnapToRange(range);
-  } else {
-    // In this case, we actually didn't zoom into a specific range. It probably
-    // happened from a page load reflow-on-zoom event, so we need to make sure
-    // painting is re-enabled.
-    BrowserApp.selectedTab.clearReflowOnZoomPendingActions();
   }
 }
 
@@ -2749,7 +2744,6 @@ Tab.prototype = {
     this.browser.addEventListener("MozApplicationManifest", this, true);
 
     Services.obs.addObserver(this, "before-first-paint", false);
-    Services.obs.addObserver(this, "after-viewport-change", false);
     Services.prefs.addObserver("browser.ui.zoom.force-user-scalable", this, false);
 
     if (aParams.delayLoad) {
@@ -2809,58 +2803,21 @@ Tab.prototype = {
     return minFontSize / this.getInflatedFontSizeFor(aElement);
   },
 
-  clearReflowOnZoomPendingActions: function() {
-    // Reflow was completed, so now re-enable painting.
-    let webNav = BrowserApp.selectedTab.window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation);
-    let docShell = webNav.QueryInterface(Ci.nsIDocShell);
-    let docViewer = docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
-    docViewer.resumePainting();
-
-    BrowserApp.selectedTab._mReflozPositioned = false;
-  },
-
-  /**
-   * Reflow on zoom consists of a few different sub-operations:
-   *
-   * 1. When a double-tap event is seen, we verify that the correct preferences
-   *    are enabled and perform the pre-position handling calculation. We also
-   *    signal that reflow-on-zoom should be performed at this time, and pause
-   *    painting.
-   * 2. During the next call to setViewport(), which is in the Tab prototype,
-   *    we detect that a call to changeMaxLineBoxWidth should be performed. If
-   *    we're zooming out, then the max line box width should be reset at this
-   *    time. Otherwise, we call performReflowOnZoom.
-   *   2a. PerformReflowOnZoom() and resetMaxLineBoxWidth() schedule a call to
-   *       doChangeMaxLineBoxWidth, based on a timeout specified in preferences.
-   * 3. doChangeMaxLineBoxWidth changes the line box width (which also
-   *    schedules a reflow event), and then calls _zoomInAndSnapToRange.
-   * 4. _zoomInAndSnapToRange performs the positioning of reflow-on-zoom and
-   *    then re-enables painting.
-   *
-   * Some of the events happen synchronously, while others happen asynchronously.
-   * The following is a rough sketch of the progression of events:
-   *
-   * double tap event seen -> onDoubleTap() -> ... asynchronous ...
-   *   -> setViewport() -> performReflowOnZoom() -> ... asynchronous ...
-   *   -> doChangeMaxLineBoxWidth() -> _zoomInAndSnapToRange()
-   *   -> ... asynchronous ... -> setViewport() -> Observe('after-viewport-change')
-   *   -> resumePainting()
-   */
   performReflowOnZoom: function(aViewport) {
-    let zoom = this._drawZoom ? this._drawZoom : aViewport.zoom;
+      let zoom = this._drawZoom ? this._drawZoom : aViewport.zoom;
 
-    let viewportWidth = gScreenWidth / zoom;
-    let reflozTimeout = Services.prefs.getIntPref("browser.zoom.reflowZoom.reflowTimeout");
+      let viewportWidth = gScreenWidth / zoom;
+      let reflozTimeout = Services.prefs.getIntPref("browser.zoom.reflowZoom.reflowTimeout");
 
-    if (gReflowPending) {
-      clearTimeout(gReflowPending);
-    }
+      if (gReflowPending) {
+        clearTimeout(gReflowPending);
+      }
 
-    // We add in a bit of fudge just so that the end characters
-    // don't accidentally get clipped. 15px is an arbitrary choice.
-    gReflowPending = setTimeout(doChangeMaxLineBoxWidth,
-                                reflozTimeout,
-                                viewportWidth - 15);
+      // We add in a bit of fudge just so that the end characters
+      // don't accidentally get clipped. 15px is an arbitrary choice.
+      gReflowPending = setTimeout(doChangeMaxLineBoxWidth,
+                                  reflozTimeout,
+                                  viewportWidth - 15);
   },
 
   /** 
@@ -2932,7 +2889,6 @@ Tab.prototype = {
     this.browser.removeEventListener("MozApplicationManifest", this, true);
 
     Services.obs.removeObserver(this, "before-first-paint");
-    Services.obs.removeObserver(this, "after-viewport-change");
     Services.prefs.removeObserver("browser.ui.zoom.force-user-scalable", this);
 
     // Make sure the previously selected panel remains selected. The selected panel of a deck is
@@ -3219,7 +3175,6 @@ Tab.prototype = {
       // In this case, the user pinch-zoomed in, so we don't want to
       // preserve position as we would with reflow-on-zoom.
       BrowserApp.selectedTab.probablyNeedRefloz = false;
-      BrowserApp.selectedTab.clearReflowOnZoomPendingActions();
       BrowserApp.selectedTab._mReflozPoint = null;
     }
 
@@ -4211,11 +4166,6 @@ Tab.prototype = {
           BrowserApp.selectedTab.performReflowOnZoom(vp);
         }
         break;
-      case "after-viewport-change":
-        if (BrowserApp.selectedTab._mReflozPositioned) {
-          BrowserApp.selectedTab.clearReflowOnZoomPendingActions();
-        }
-        break;
       case "nsPref:changed":
         if (aData == "browser.ui.zoom.force-user-scalable")
           ViewportHandler.updateMetadata(this, false);
@@ -4534,23 +4484,13 @@ var BrowserEventHandler = {
     if (BrowserEventHandler.mReflozPref &&
        !BrowserApp.selectedTab._mReflozPoint &&
        !this._shouldSuppressReflowOnZoom(element)) {
+     let data = JSON.parse(aData);
+     let zoomPointX = data.x;
+     let zoomPointY = data.y;
 
-      // See comment above performReflowOnZoom() for a detailed description of
-      // the events happening in the reflow-on-zoom operation.
-      let data = JSON.parse(aData);
-      let zoomPointX = data.x;
-      let zoomPointY = data.y;
-
-      BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
-        range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
-
-      // Before we perform a reflow on zoom, let's disable painting.
-      let webNav = BrowserApp.selectedTab.window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation);
-      let docShell = webNav.QueryInterface(Ci.nsIDocShell);
-      let docViewer = docShell.contentViewer.QueryInterface(Ci.nsIMarkupDocumentViewer);
-      docViewer.pausePainting();
-
-      BrowserApp.selectedTab.probablyNeedRefloz = true;
+     BrowserApp.selectedTab._mReflozPoint = { x: zoomPointX, y: zoomPointY,
+       range: BrowserApp.selectedBrowser.contentDocument.caretPositionFromPoint(zoomPointX, zoomPointY) };
+       BrowserApp.selectedTab.probablyNeedRefloz = true;
     }
 
     if (!element) {
@@ -4650,7 +4590,11 @@ var BrowserEventHandler = {
   },
 
   _zoomInAndSnapToRange: function(aRange) {
-    // aRange is always non-null here, since a check happened previously.
+    if (!aRange) {
+      Cu.reportError("aRange is null in zoomInAndSnapToRange. Unable to maintain position.");
+      return;
+    }
+
     let viewport = BrowserApp.selectedTab.getViewport();
     let fudge = 15; // Add a bit of fudge.
     let boundingElement = aRange.offsetNode;
@@ -4673,8 +4617,6 @@ var BrowserEventHandler = {
     let leftAdjustment = parseInt(boundingStyle.paddingLeft) +
                          parseInt(boundingStyle.borderLeftWidth);
 
-    BrowserApp.selectedTab._mReflozPositioned = true;
-
     rect.type = "Browser:ZoomToRect";
     rect.x = Math.max(viewport.cssPageLeft, rect.x  - fudge + leftAdjustment);
     rect.y = Math.max(topPos, viewport.cssPageTop);
@@ -4683,22 +4625,22 @@ var BrowserEventHandler = {
 
     sendMessageToJava(rect);
     BrowserApp.selectedTab._mReflozPoint = null;
-  },
+   },
 
-  onPinchFinish: function(aData) {
-    let data = {};
-    try {
-      data = JSON.parse(aData);
-    } catch(ex) {
-      console.log(ex);
-      return;
-    }
+   onPinchFinish: function(aData) {
+     let data = {};
+     try {
+       data = JSON.parse(aData);
+     } catch(ex) {
+       console.log(ex);
+       return;
+     }
 
-    if (BrowserEventHandler.mReflozPref &&
-        data.zoomDelta < 0.0) {
-      BrowserEventHandler.resetMaxLineBoxWidth();
-    }
-  },
+     if (BrowserEventHandler.mReflozPref &&
+         data.zoomDelta < 0.0) {
+       BrowserEventHandler.resetMaxLineBoxWidth();
+     }
+   },
 
   _shouldZoomToElement: function(aElement) {
     let win = aElement.ownerDocument.defaultView;

From f6309695e3f62e320b7aedae2b6843e858440be3 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 19 Dec 2013 14:51:09 -0800
Subject: [PATCH 74/78] Bug 941318 - Create content provider to store home
 lists data. r=wesj

---
 mobile/android/base/AndroidManifest.xml.in    |   4 +
 mobile/android/base/db/BrowserContract.java   |  16 +
 .../base/db/HomeListsDatabaseHelper.java      |  48 +++
 mobile/android/base/db/HomeListsProvider.java | 383 ++++++++++++++++++
 mobile/android/base/moz.build                 |   2 +
 5 files changed, 453 insertions(+)
 create mode 100644 mobile/android/base/db/HomeListsDatabaseHelper.java
 create mode 100644 mobile/android/base/db/HomeListsProvider.java

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index dda190a7675c..c5485eeddfef 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -274,6 +274,10 @@
                   android:authorities="@ANDROID_PACKAGE_NAME@.db.tabs"
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
 
+        <provider android:name="org.mozilla.gecko.db.HomeListsProvider"
+                  android:authorities="@ANDROID_PACKAGE_NAME@.db.homelists"
+                  android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
+
         <service
             android:exported="false"
             android:name="org.mozilla.gecko.updater.UpdateService"
diff --git a/mobile/android/base/db/BrowserContract.java b/mobile/android/base/db/BrowserContract.java
index f85a023c9ea9..2589986749df 100644
--- a/mobile/android/base/db/BrowserContract.java
+++ b/mobile/android/base/db/BrowserContract.java
@@ -24,6 +24,9 @@ public class BrowserContract {
     public static final String TABS_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".db.tabs";
     public static final Uri TABS_AUTHORITY_URI = Uri.parse("content://" + TABS_AUTHORITY);
 
+    public static final String HOME_LISTS_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".db.homelists";
+    public static final Uri HOME_LISTS_AUTHORITY_URI = Uri.parse("content://" + HOME_LISTS_AUTHORITY);
+
     public static final String PARAM_PROFILE = "profile";
     public static final String PARAM_PROFILE_PATH = "profilePath";
     public static final String PARAM_LIMIT = "limit";
@@ -284,4 +287,17 @@ public class BrowserContract {
         // timestamp provided by Sync during insertion.
         public static final String LAST_MODIFIED = "last_modified";
     }
+
+    // Data storage for custom lists on about:home
+    @RobocopTarget
+    public static final class HomeListItems implements CommonColumns, URLColumns {
+        private HomeListItems() {}
+        public static final Uri CONTENT_FAKE_URI = Uri.withAppendedPath(HOME_LISTS_AUTHORITY_URI, "items/fake");
+        public static final Uri CONTENT_URI = Uri.withAppendedPath(HOME_LISTS_AUTHORITY_URI, "items");
+
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/homelistitem";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/homelistitem";
+
+        public static final String PROVIDER_ID = "provider_id";
+    }
 }
diff --git a/mobile/android/base/db/HomeListsDatabaseHelper.java b/mobile/android/base/db/HomeListsDatabaseHelper.java
new file mode 100644
index 000000000000..621e0f5b66c4
--- /dev/null
+++ b/mobile/android/base/db/HomeListsDatabaseHelper.java
@@ -0,0 +1,48 @@
+/* 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/. */
+
+package org.mozilla.gecko.db;
+
+import org.mozilla.gecko.GeckoProfile;
+import org.mozilla.gecko.db.BrowserContract.HomeListItems;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+final class HomeListsDatabaseHelper extends SQLiteOpenHelper {
+
+    static final int DATABASE_VERSION = 1;
+    static final String DATABASE_NAME = "homelists.db";
+
+    static final String TABLE_ITEMS = "items";
+
+    public HomeListsDatabaseHelper(Context context, String databasePath) {
+        super(context, databasePath, null, DATABASE_VERSION);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE " + TABLE_ITEMS + "(" +
+                HomeListItems._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
+                HomeListItems.PROVIDER_ID + " TEXT," +
+                HomeListItems.TITLE + " TEXT," +
+                HomeListItems.URL + " TEXT)"
+        );
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        // Unimpelemented
+    }
+
+    @Override
+    public void onOpen(SQLiteDatabase db) {
+        // Unimplemented
+    }
+}
diff --git a/mobile/android/base/db/HomeListsProvider.java b/mobile/android/base/db/HomeListsProvider.java
new file mode 100644
index 000000000000..b758b05040a3
--- /dev/null
+++ b/mobile/android/base/db/HomeListsProvider.java
@@ -0,0 +1,383 @@
+/* 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/. */
+
+package org.mozilla.gecko.db;
+
+import org.mozilla.gecko.db.BrowserContract.HomeListItems;
+import org.mozilla.gecko.db.PerProfileDatabases.DatabaseHelperFactory;
+import org.mozilla.gecko.mozglue.RobocopTarget;
+
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MatrixCursor.RowBuilder;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.net.Uri;
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.Log;
+
+public class HomeListsProvider extends ContentProvider {
+    private static final String LOGTAG = "GeckoHomeListsProvider";
+
+    // Flag to disable DB usage. This prevents us from creating (and later needing to upgrade) a DB.
+    private static final boolean DB_DISABLED = true;
+
+    private PerProfileDatabases<HomeListsDatabaseHelper> mDatabases;
+
+    // Endpoint to return static fake data.
+    static final int ITEMS_FAKE = 100;
+
+    static final int ITEMS = 101;
+    static final int ITEMS_ID = 102;
+
+    static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
+
+    static {
+        URI_MATCHER.addURI(BrowserContract.HOME_LISTS_AUTHORITY, "items/fake", ITEMS_FAKE);
+
+        URI_MATCHER.addURI(BrowserContract.HOME_LISTS_AUTHORITY, "items", ITEMS);
+        URI_MATCHER.addURI(BrowserContract.HOME_LISTS_AUTHORITY, "items/#", ITEMS_ID);
+    }
+
+    private static boolean logDebug   = Log.isLoggable(LOGTAG, Log.DEBUG);
+    private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
+    protected static void trace(String message) {
+        if (logVerbose) {
+            Log.v(LOGTAG, message);
+        }
+    }
+
+    protected static void debug(String message) {
+        if (logDebug) {
+            Log.d(LOGTAG, message);
+        }
+    }
+
+    private boolean isTest(Uri uri) {
+        String isTest = uri.getQueryParameter(BrowserContract.PARAM_IS_TEST);
+        return !TextUtils.isEmpty(isTest);
+    }
+
+    private SQLiteDatabase getReadableDatabase(Uri uri) {
+        if (DB_DISABLED) {
+            throw new UnsupportedOperationException("Database operations are disabled!");
+        }
+
+        String profile = null;
+        if (uri != null) {
+            profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE);
+        }
+        return mDatabases.getDatabaseHelperForProfile(profile, isTest(uri)).getReadableDatabase();
+    }
+
+    private SQLiteDatabase getWritableDatabase(Uri uri) {
+        if (DB_DISABLED) {
+            throw new UnsupportedOperationException("Database operations are disabled!");
+        }
+
+        String profile = null;
+        if (uri != null) {
+            profile = uri.getQueryParameter(BrowserContract.PARAM_PROFILE);
+        }
+        return mDatabases.getDatabaseHelperForProfile(profile, isTest(uri)).getWritableDatabase();
+    }
+
+    @Override
+    public boolean onCreate() {
+        if (DB_DISABLED) {
+            return true;
+        }
+        synchronized (this) {
+            mDatabases = new PerProfileDatabases<HomeListsDatabaseHelper>(getContext(), HomeListsDatabaseHelper.DATABASE_NAME,
+                new DatabaseHelperFactory<HomeListsDatabaseHelper>() {
+                    @Override
+                    public HomeListsDatabaseHelper makeDatabaseHelper(Context context, String databasePath) {
+                        return new HomeListsDatabaseHelper(context, databasePath);
+                    }
+                });
+        }
+        return true;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        trace("Getting URI type: " + uri);
+
+        final int match = URI_MATCHER.match(uri);
+        switch (match) {
+            case ITEMS_FAKE: {
+                trace("URI is ITEMS_FAKE: " + uri);
+                return HomeListItems.CONTENT_TYPE;
+            }
+            case ITEMS: {
+                trace("URI is ITEMS: " + uri);
+                return HomeListItems.CONTENT_TYPE;
+            }
+            case ITEMS_ID: {
+                trace("URI is ITEMS_ID: " + uri);
+                return HomeListItems.CONTENT_ITEM_TYPE;
+            }
+        }
+
+        debug("URI has unrecognized type: " + uri);
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        trace("Calling delete on URI: " + uri);
+
+        final SQLiteDatabase db = getWritableDatabase(uri);
+        int deleted = 0;
+
+        if (Build.VERSION.SDK_INT >= 11) {
+            trace("Beginning delete transaction: " + uri);
+            db.beginTransaction();
+            try {
+                deleted = deleteInTransaction(uri, selection, selectionArgs);
+                db.setTransactionSuccessful();
+                trace("Successful delete transaction: " + uri);
+            } finally {
+                db.endTransaction();
+            }
+        } else {
+            deleted = deleteInTransaction(uri, selection, selectionArgs);
+        }
+
+        if (deleted > 0) {
+            getContext().getContentResolver().notifyChange(uri, null);
+        }
+        return deleted;
+    }
+
+    public int deleteInTransaction(Uri uri, String selection, String[] selectionArgs) {
+        trace("Calling delete in transaction on URI: " + uri);
+
+        final SQLiteDatabase db = getWritableDatabase(uri);
+        int deleted = 0;
+
+        final int match = URI_MATCHER.match(uri);
+        switch (match) {
+            case ITEMS: {
+                trace("Delete on ITEMS: " + uri);
+                deleted = db.delete(HomeListsDatabaseHelper.TABLE_ITEMS, selection, selectionArgs);
+                break;
+            }
+            case ITEMS_ID: {
+                trace("Delete on ITEMS: " + uri);
+                // Not implemented
+                break;
+            }
+            default:
+                throw new UnsupportedOperationException("Unknown delete URI " + uri);
+        }
+
+        debug("Deleted " + deleted + " rows for URI: " + uri);
+        return deleted;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        trace("Calling insert on URI: " + uri);
+
+        final SQLiteDatabase db = getWritableDatabase(uri);
+        Uri result = null;
+
+        if (Build.VERSION.SDK_INT >= 11) {
+            trace("Beginning insert transaction: " + uri);
+            db.beginTransaction();
+            try {
+                result = insertInTransaction(uri, values);
+                db.setTransactionSuccessful();
+                trace("Successful insert transaction: " + uri);
+            } finally {
+                db.endTransaction();
+            }
+        } else {
+            result = insertInTransaction(uri, values);
+        }
+
+        if (result != null) {
+            getContext().getContentResolver().notifyChange(uri, null);
+        }
+        return result;
+    }
+
+    @Override
+    public int bulkInsert(Uri uri, ContentValues[] values) {
+        if (values == null) {
+            return 0;
+        }
+
+        final SQLiteDatabase db = getWritableDatabase(uri);
+        final int numValues = values.length;
+
+        int successes = 0;
+
+        db.beginTransaction();
+        try {
+            for (int i = 0; i < numValues; i++) {
+                try {
+                    insertInTransaction(uri, values[i]);
+                    successes++;
+                } catch (SQLException e) {
+                    Log.e(LOGTAG, "SQLException in bulkInsert", e);
+
+                    // Restart the transaction to continue insertions.
+                    db.setTransactionSuccessful();
+                    db.endTransaction();
+                    db.beginTransaction();
+                }
+            }
+            trace("Flushing DB bulkinsert...");
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
+        }
+
+        if (successes > 0) {
+            getContext().getContentResolver().notifyChange(uri, null);
+        }
+        return successes;
+    }
+
+    public Uri insertInTransaction(Uri uri, ContentValues values) {
+        trace("Calling insert in transaction on URI: " + uri);
+
+        final SQLiteDatabase db = getWritableDatabase(uri);
+        long id = -1;
+
+        final int match = URI_MATCHER.match(uri);
+        switch (match) {
+            case ITEMS: {
+                trace("Insert on ITEMS: " + uri);
+                id = db.insertOrThrow(HomeListsDatabaseHelper.TABLE_ITEMS, null, values);
+                break;
+            }
+            case ITEMS_ID: {
+                trace("Insert on ITEMS_ID: " + uri);
+                // Not implemented
+                break;
+            }
+            default:
+                throw new UnsupportedOperationException("Unknown insert URI " + uri);
+        }
+
+        if (id >= 0) {
+            debug("Inserted ID in database: " + id);
+            return ContentUris.withAppendedId(uri, id);
+        }
+        return null;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        trace("Calling update on URI: " + uri);
+
+        final SQLiteDatabase db = getWritableDatabase(uri);
+        int updated = 0;
+
+        if (Build.VERSION.SDK_INT >= 11) {
+            trace("Beginning update transaction: " + uri);
+            db.beginTransaction();
+            try {
+                updated = updateInTransaction(uri, values, selection, selectionArgs);
+                db.setTransactionSuccessful();
+                trace("Successful update transaction: " + uri);
+            } finally {
+                db.endTransaction();
+            }
+        } else {
+            updated = updateInTransaction(uri, values, selection, selectionArgs);
+        }
+
+        if (updated > 0) {
+            getContext().getContentResolver().notifyChange(uri, null);
+        }
+        return updated;
+    }
+
+
+    public int updateInTransaction(Uri uri, ContentValues values, String selection,
+            String[] selectionArgs) {
+        trace("Calling update in transaction on URI: " + uri);
+
+        final SQLiteDatabase db = getWritableDatabase(uri);
+        int updated = 0;
+
+        final int match = URI_MATCHER.match(uri);
+        switch (match) {
+            case ITEMS: {
+                trace("Update on ITEMS: " + uri);
+                updated = db.update(HomeListsDatabaseHelper.TABLE_ITEMS, values, selection, selectionArgs);
+                break;
+            }
+            case ITEMS_ID: {
+                trace("Update on ITEMS_ID: " + uri);
+                // Not implemented
+                break;
+            }
+            default:
+                throw new UnsupportedOperationException("Unknown update URI " + uri);
+        }
+
+        debug("Updated " + updated + " rows for URI: " + uri);
+        return updated;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        final int match = URI_MATCHER.match(uri);
+
+        // If we're querying the fake items, don't try to get the database.
+        if (match == ITEMS_FAKE) {
+            trace("Query on ITEMS_FAKE: " + uri);
+            return queryFakeItems(uri, projection, selection, selectionArgs, sortOrder);
+        }
+
+        final SQLiteDatabase db = getReadableDatabase(uri);
+        Cursor cursor = null;
+
+        switch (match) {
+            case ITEMS: {
+                trace("Query on ITEMS: " + uri);
+                cursor = db.query(HomeListsDatabaseHelper.TABLE_ITEMS, projection, selection, selectionArgs, null, null, sortOrder, null);
+                break;
+            }
+            case ITEMS_ID: {
+                trace("Query on ITEMS_ID: " + uri);
+                // Not implemented
+                break;
+            }
+            default:
+                throw new UnsupportedOperationException("Unknown query URI " + uri);
+        }
+        return cursor;
+    }
+
+    /**
+     * Returns a cursor populated with static fake data.
+     */
+    private Cursor queryFakeItems(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        final String[] itemsColumns = new String[] {
+            HomeListItems._ID,
+            HomeListItems.PROVIDER_ID,
+            HomeListItems.URL,
+            HomeListItems.TITLE
+        };
+
+        // XXX: Return more items (from JSON file?) and filter fake items by provider specified in selection
+        final MatrixCursor c = new MatrixCursor(itemsColumns);
+        c.addRow(new Object[] { 1, "fake-provider", "http://example.com", "Example" });
+        c.addRow(new Object[] { 2, "fake-provider", "http://mozilla.org", "Mozilla" });
+        return c;
+    }
+}
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 767d7738d7b1..3e091f242722 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -114,6 +114,8 @@ gbjar.sources += [
     'db/BrowserProvider.java',
     'db/DBUtils.java',
     'db/FormHistoryProvider.java',
+    'db/HomeListsDatabaseHelper.java',
+    'db/HomeListsProvider.java',
     'db/LocalBrowserDB.java',
     'db/PasswordsProvider.java',
     'db/PerProfileContentProvider.java',

From 13d370bf176b02427151073d810c83a5e1700dcf Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 19 Dec 2013 14:51:09 -0800
Subject: [PATCH 75/78] Bug 941318 - Tests for HomeListsProvider. r=wesj

---
 mobile/android/base/tests/robocop.ini         |   1 +
 .../base/tests/testHomeListsProvider.java     | 124 ++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 mobile/android/base/tests/testHomeListsProvider.java

diff --git a/mobile/android/base/tests/robocop.ini b/mobile/android/base/tests/robocop.ini
index edcce15659f3..7db548b5f1a9 100644
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -34,6 +34,7 @@ skip-if = processor == "x86"
 [testInputUrlBar]
 [testJarReader]
 [testLinkContextMenu]
+[testHomeListsProvider]
 [testLoad]
 [testMailToContextMenu]
 [testMasterPassword]
diff --git a/mobile/android/base/tests/testHomeListsProvider.java b/mobile/android/base/tests/testHomeListsProvider.java
new file mode 100644
index 000000000000..d44ad5142937
--- /dev/null
+++ b/mobile/android/base/tests/testHomeListsProvider.java
@@ -0,0 +1,124 @@
+package org.mozilla.gecko.tests;
+
+import android.content.ContentValues;
+import android.content.ContentUris;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class testHomeListsProvider extends ContentProviderTest {
+
+    private Uri mItemsFakeUri;
+    private Uri mItemsUri;
+
+    private String mItemsIdCol;
+    private String mItemsProviderIdCol;
+    private String mItemsTitleCol;
+    private String mItemsUrlCol;
+
+    @Override
+    protected int getTestType() {
+        return TEST_MOCHITEST;
+    }
+
+    private void loadContractInfo() throws Exception {
+        mItemsFakeUri = getUriColumn("HomeListItems", "CONTENT_FAKE_URI");
+        mItemsUri = getContentUri("HomeListItems");
+
+        mItemsIdCol = getStringColumn("HomeListItems", "_ID");
+        mItemsProviderIdCol = getStringColumn("HomeListItems", "PROVIDER_ID");
+        mItemsTitleCol = getStringColumn("HomeListItems", "TITLE");
+        mItemsUrlCol = getStringColumn("HomeListItems", "URL");
+    }
+
+    private void ensureEmptyDatabase() throws Exception {
+        // Delete all the list entries.
+        mProvider.delete(mItemsUri, null, null);
+
+        final Cursor c = mProvider.query(mItemsUri, null, null, null, null);
+        mAsserter.is(c.getCount(), 0, "All list entries were deleted");
+        c.close();
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp("org.mozilla.gecko.db.HomeListsProvider", "AUTHORITY", "homelists.db");
+        loadContractInfo();
+
+        mTests.add(new TestFakeItems());
+
+        // Disabled until database support lands
+        //mTests.add(new TestInsertItem());
+    }
+
+    public void testListsProvider() throws Exception {
+        for (int i = 0; i < mTests.size(); i++) {
+            Runnable test = mTests.get(i);
+
+            setTestName(test.getClass().getSimpleName());
+            // Disabled until database support lands
+            //ensureEmptyDatabase();
+            test.run();
+        }
+    }
+
+    abstract class Test implements Runnable {
+        @Override
+        public void run() {
+            try {
+                test();
+            } catch (Exception e) {
+                mAsserter.is(true, false, "Test " + this.getClass().getName() +
+                        " threw exception: " + e);
+            }
+        }
+
+        public abstract void test() throws Exception;
+    }
+
+    class TestFakeItems extends Test {
+        @Override
+        public void test() throws Exception {
+            final long id = 1;
+            final String providerId = "fake-provider";
+            final String title = "Example";
+            final String url = "http://example.com";
+
+            final Cursor c = mProvider.query(mItemsFakeUri, null, null, null, null);
+            mAsserter.is(c.moveToFirst(), true, "Fake list item found");
+
+            mAsserter.is(c.getLong(c.getColumnIndex(mItemsIdCol)), id, "Fake list item has correct ID");
+            mAsserter.is(c.getString(c.getColumnIndex(mItemsProviderIdCol)), providerId, "Fake list item has correct provider ID");
+            mAsserter.is(c.getString(c.getColumnIndex(mItemsTitleCol)), title, "Fake list item has correct title");
+            mAsserter.is(c.getString(c.getColumnIndex(mItemsUrlCol)), url, "Fake list item has correct URL");
+
+            c.close();
+        }
+    }
+
+    class TestInsertItem extends Test {
+        @Override
+        public void test() throws Exception {
+            final String providerId = "{c77da387-4c80-0c45-9f22-70276c29b3ed}";
+            final String title = "Mozilla";
+            final String url = "https://mozilla.org";
+
+            // Insert a new list item with test values.
+            final ContentValues cv = new ContentValues();
+            cv.put(mItemsProviderIdCol, providerId);
+            cv.put(mItemsTitleCol, title);
+            cv.put(mItemsUrlCol, url);
+
+            final long id = ContentUris.parseId(mProvider.insert(mItemsUri, cv));
+
+            // Check that the item was inserted correctly.
+            final Cursor c = mProvider.query(mItemsUri, null, mItemsIdCol + " = ?", new String[] { String.valueOf(id) }, null);
+            mAsserter.is(c.moveToFirst(), true, "Inserted list item found");
+
+            mAsserter.is(c.getString(c.getColumnIndex(mItemsProviderIdCol)), providerId, "Inserted list item has correct provider ID");
+            mAsserter.is(c.getString(c.getColumnIndex(mItemsTitleCol)), title, "Inserted list item has correct title");
+            mAsserter.is(c.getString(c.getColumnIndex(mItemsUrlCol)), url, "Inserted list item has correct URL");
+
+            c.close();
+        }
+    }
+}

From e55de8109af7b0c7c8f7debd1afbad2095abea32 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 19 Dec 2013 14:51:10 -0800
Subject: [PATCH 76/78] Bug 862805 - API to allow add-ons to register custom
 lists on about:home. r=wesj

---
 mobile/android/base/home/HomeConfig.java      |  2 +-
 .../base/home/HomeConfigMemBackend.java       | 14 ++-
 mobile/android/base/home/ListManager.java     | 87 +++++++++++++++++++
 mobile/android/base/home/ListPage.java        | 28 +++++-
 mobile/android/base/moz.build                 |  1 +
 mobile/android/modules/Home.jsm               | 69 ++++++++++++++-
 6 files changed, 194 insertions(+), 7 deletions(-)
 create mode 100644 mobile/android/base/home/ListManager.java

diff --git a/mobile/android/base/home/HomeConfig.java b/mobile/android/base/home/HomeConfig.java
index 309bdee34724..81b47ded0d11 100644
--- a/mobile/android/base/home/HomeConfig.java
+++ b/mobile/android/base/home/HomeConfig.java
@@ -200,4 +200,4 @@ final class HomeConfig {
     public static HomeConfig getDefault(Context context) {
         return new HomeConfig(new HomeConfigMemBackend(context));
     }
-}
\ No newline at end of file
+}
diff --git a/mobile/android/base/home/HomeConfigMemBackend.java b/mobile/android/base/home/HomeConfigMemBackend.java
index 03d038b1f2c5..6042a93d8db3 100644
--- a/mobile/android/base/home/HomeConfigMemBackend.java
+++ b/mobile/android/base/home/HomeConfigMemBackend.java
@@ -10,9 +10,11 @@ import org.mozilla.gecko.home.HomeConfig.HomeConfigBackend;
 import org.mozilla.gecko.home.HomeConfig.OnChangeListener;
 import org.mozilla.gecko.home.HomeConfig.PageEntry;
 import org.mozilla.gecko.home.HomeConfig.PageType;
+import org.mozilla.gecko.home.ListManager.ListInfo;
 import org.mozilla.gecko.util.HardwareUtils;
 
 import android.content.Context;
+import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -20,10 +22,14 @@ import java.util.EnumSet;
 import java.util.List;
 
 class HomeConfigMemBackend implements HomeConfigBackend {
+    private static final String LOGTAG = "GeckoHomeConfigMemBackend";
     private final Context mContext;
 
+    private final ListManager mListManager;
+
     public HomeConfigMemBackend(Context context) {
         mContext = context;
+        mListManager = new ListManager(context);
     }
 
     public List<PageEntry> load() {
@@ -54,6 +60,12 @@ class HomeConfigMemBackend implements HomeConfigBackend {
             pageEntries.add(0, historyEntry);
         }
 
+        // Add registered list pages.
+        List<ListInfo> listInfos = mListManager.getListInfos();
+        for (ListInfo info : listInfos) {
+            pageEntries.add(new PageEntry(PageType.LIST, info.title, info.id));
+        }
+
         return Collections.unmodifiableList(pageEntries);
     }
 
@@ -64,4 +76,4 @@ class HomeConfigMemBackend implements HomeConfigBackend {
     public void setOnChangeListener(OnChangeListener listener) {
         // This is a static backend, do nothing.
     }
-}
\ No newline at end of file
+}
diff --git a/mobile/android/base/home/ListManager.java b/mobile/android/base/home/ListManager.java
new file mode 100644
index 000000000000..bb1af8b5f8b0
--- /dev/null
+++ b/mobile/android/base/home/ListManager.java
@@ -0,0 +1,87 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko.home;
+
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.util.GeckoEventListener;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListManager implements GeckoEventListener {
+    private static final String LOGTAG = "GeckoListManager";
+
+    public class ListInfo {
+        public final String id;
+        public final String title;
+
+        public ListInfo(String id, String title) {
+            this.id = id;
+            this.title = title;
+        }
+    }
+
+    private final Context mContext;
+
+    public ListManager(Context context) {
+        mContext = context;
+
+        // Add a listener to handle any new lists that are added after the lists have been loaded.
+        GeckoAppShell.getEventDispatcher().registerEventListener("HomeLists:Added", this);
+    }
+
+    /**
+     * Reads list info from SharedPreferences. Don't call this on the main thread!
+     *
+     * @return List<ListInfo> A list of ListInfos for each registered list.
+     */
+    public List<ListInfo> getListInfos() {
+        final ArrayList<ListInfo> listInfos = new ArrayList<ListInfo>();
+
+        // XXX: We need to use PreferenceManager right now because that's what SharedPreferences.jsm uses (see bug 940575)
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+        final String prefValue = prefs.getString("home_lists", "");
+
+        if (!TextUtils.isEmpty(prefValue)) {
+            try {
+                final JSONArray lists = new JSONArray(prefValue);
+                for (int i = 0; i < lists.length(); i++) {
+                    final JSONObject list = lists.getJSONObject(i);
+                    final ListInfo info = new ListInfo(list.getString("id"), list.getString("title"));
+                    listInfos.add(info);
+                }
+            } catch (JSONException e) {
+                Log.e(LOGTAG, "Exception getting list info", e);
+            }
+        }
+        return listInfos;
+    }
+
+    /**
+     * Listens for "HomeLists:Added"
+     */
+    @Override
+    public void handleMessage(String event, JSONObject message) {
+        try {
+            final ListInfo info = new ListInfo(message.getString("id"), message.getString("title"));
+
+            // Do something to update the set of list pages.
+
+        } catch (JSONException e) {
+            Log.e(LOGTAG, "Exception handling " + event + " message", e);
+        }
+    }
+}
diff --git a/mobile/android/base/home/ListPage.java b/mobile/android/base/home/ListPage.java
index f3c911095b84..19d3b3d01f8b 100644
--- a/mobile/android/base/home/ListPage.java
+++ b/mobile/android/base/home/ListPage.java
@@ -6,17 +6,22 @@
 package org.mozilla.gecko.home;
 
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.db.BrowserContract;
+import org.mozilla.gecko.db.BrowserContract.HomeListItems;
 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
 import org.mozilla.gecko.home.HomeConfig.PageEntry;
 
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.Loader;
 import android.support.v4.widget.CursorAdapter;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,6 +33,8 @@ import java.util.EnumSet;
  * Fragment that displays custom lists.
  */
 public class ListPage extends HomeFragment {
+    private static final String LOGTAG = "GeckoListPage";
+
     // Cursor loader ID for the lists
     private static final int LOADER_ID_LIST = 0;
 
@@ -132,14 +139,27 @@ public class ListPage extends HomeFragment {
      * Cursor loader for the lists.
      */
     private static class HomeListLoader extends SimpleCursorLoader {
-        public HomeListLoader(Context context) {
+        private String mProviderId;
+
+        public HomeListLoader(Context context, String providerId) {
             super(context);
+            mProviderId = providerId;
         }
 
         @Override
         public Cursor loadCursor() {
-            // Do nothing
-            return null;
+            final ContentResolver cr = getContext().getContentResolver();
+
+            // XXX: Use the test URI for static fake data
+            final Uri fakeItemsUri = HomeListItems.CONTENT_FAKE_URI.buildUpon().
+                appendQueryParameter(BrowserContract.PARAM_PROFILE, "default").build();
+
+            final String selection = HomeListItems.PROVIDER_ID + " = ?";
+            final String[] selectionArgs = new String[] { mProviderId };
+
+            Log.i(LOGTAG, "Loading fake data for list provider: " + mProviderId);
+
+            return cr.query(fakeItemsUri, null, selection, selectionArgs, null);
         }
     }
 
@@ -169,7 +189,7 @@ public class ListPage extends HomeFragment {
     private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-            return new HomeListLoader(getActivity());
+            return new HomeListLoader(getActivity(), mPageEntry.getId());
         }
 
         @Override
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 3e091f242722..7eee539ba034 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -220,6 +220,7 @@ gbjar.sources += [
     'home/HomePager.java',
     'home/HomePagerTabStrip.java',
     'home/LastTabsPage.java',
+    'home/ListManager.java',
     'home/ListPage.java',
     'home/MostRecentPage.java',
     'home/MultiTypeCursorAdapter.java',
diff --git a/mobile/android/modules/Home.jsm b/mobile/android/modules/Home.jsm
index a1a7b09b862f..a93532314c03 100644
--- a/mobile/android/modules/Home.jsm
+++ b/mobile/android/modules/Home.jsm
@@ -10,6 +10,7 @@ this.EXPORTED_SYMBOLS = ["Home"];
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/SharedPreferences.jsm");
 
 // See bug 915424
 function resolveGeckoURI(aURI) {
@@ -136,7 +137,73 @@ let HomeBanner = {
   }
 };
 
+function List(options) {
+  if ("id" in options)
+    this.id = options.id;
+
+  if ("title" in options)
+    this.title = options.title;
+}
+
+function HomeLists() {
+  this.PREF_KEY = "home_lists";
+
+  this._sharedPrefs = new SharedPreferences();
+  this._lists = {};
+
+  let prefValue = this._sharedPrefs.getCharPref(this.PREF_KEY);
+  if (!prefValue) {
+    return;
+  }
+
+  JSON.parse(prefValue).forEach(data => {
+    let list = new List(data);
+    this._lists[list.id] = list;
+  });
+}
+
+HomeLists.prototype = {
+  add: function(options) {
+    let list = new List(options);
+    if (!list.id || !list.title) {
+      throw "Can't create a home list without an id and title!";
+    }
+
+    // Bail if the list already exists
+    if (list.id in this._lists) {
+      throw "List already exists: " + list.id;
+    }
+
+    this._lists[list.id] = list;
+    this._updateSharedPref();
+
+    // Send a message to Java to update the home pager if it's currently showing
+    sendMessageToJava({
+      type: "HomeLists:Added",
+      id: list.id,
+      title: list.title
+    });
+  },
+
+  remove: function(id) {
+    delete this._lists[id];
+    this._updateSharedPref();
+  },
+
+  // Set a shared pref so that Java can know about this list before Gecko is running
+  _updateSharedPref: function() {
+    let lists = [];
+    for (let id in this._lists) {
+      let list = this._lists[id];
+      lists.push({ id: list.id, title: list.title});
+    }
+    this._sharedPrefs.setCharPref(this.PREF_KEY, JSON.stringify(lists));
+  }
+
+};
+
 // Public API
 this.Home = {
-  banner: HomeBanner
+  banner: HomeBanner,
+  lists: new HomeLists()
 }

From c55ae6084ff27b788214cf2e82c64addfd736a74 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Thu, 19 Dec 2013 14:50:18 -0800
Subject: [PATCH 77/78] Bug 947501 - Uplift Addon SDK to Firefox

---
 addon-sdk/source/lib/sdk/context-menu.js      |   61 +
 .../lib/sdk/deprecated/unit-test-finder.js    |    6 +-
 addon-sdk/source/lib/sdk/lang/type.js         |    6 +
 addon-sdk/source/lib/sdk/selection.js         |   16 +-
 addon-sdk/source/lib/sdk/util/sequence.js     |  576 ++++++++
 .../source/python-lib/cuddlefish/__init__.py  |   38 +-
 .../simplest-test/manifest-overload.json      |    3 +
 .../python-lib/cuddlefish/tests/test_init.py  |   16 +
 .../source/test/addons/translators/main.js    |   24 +
 .../test/addons/translators/package.json      |    6 +
 addon-sdk/source/test/test-context-menu.html  |   25 +
 addon-sdk/source/test/test-context-menu.js    |  482 +++++++
 addon-sdk/source/test/test-sequence.js        | 1163 +++++++++++++++++
 addon-sdk/source/test/test-tab.js             |   11 +-
 addon-sdk/source/test/test-windows-common.js  |   12 +-
 15 files changed, 2402 insertions(+), 43 deletions(-)
 create mode 100644 addon-sdk/source/lib/sdk/util/sequence.js
 create mode 100644 addon-sdk/source/python-lib/cuddlefish/tests/addons/simplest-test/manifest-overload.json
 create mode 100644 addon-sdk/source/test/addons/translators/main.js
 create mode 100644 addon-sdk/source/test/addons/translators/package.json
 create mode 100644 addon-sdk/source/test/test-sequence.js

diff --git a/addon-sdk/source/lib/sdk/context-menu.js b/addon-sdk/source/lib/sdk/context-menu.js
index c410c4e1e76c..9c5dccccb7aa 100644
--- a/addon-sdk/source/lib/sdk/context-menu.js
+++ b/addon-sdk/source/lib/sdk/context-menu.js
@@ -24,6 +24,7 @@ const { Worker } = require("./content/worker");
 const { EventTarget } = require("./event/target");
 const { emit } = require('./event/core');
 const { when } = require('./system/unload');
+const selection = require('./selection');
 
 // All user items we add have this class.
 const ITEM_CLASS = "addon-context-menu-item";
@@ -204,6 +205,66 @@ let URLContext = Class({
 });
 exports.URLContext = URLContext;
 
+// Matches when the user-supplied predicate returns true
+let PredicateContext = Class({
+  extends: Context,
+
+  initialize: function initialize(predicate) {
+    let options = validateOptions({ predicate: predicate }, {
+      predicate: {
+        is: ["function"],
+        msg: "predicate must be a function."
+      }
+    });
+    internal(this).predicate = options.predicate;
+  },
+
+  isCurrent: function isCurrent(popupNode) {
+    return internal(this).predicate(populateCallbackNodeData(popupNode));
+  }
+});
+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.linkURL = node.href || null;
+  data.value = node.value || null;
+
+  return data;
+}
+
 function removeItemFromArray(array, item) {
   return array.filter(function(i) i !== item);
 }
diff --git a/addon-sdk/source/lib/sdk/deprecated/unit-test-finder.js b/addon-sdk/source/lib/sdk/deprecated/unit-test-finder.js
index 5b584868d200..7002525924bc 100644
--- a/addon-sdk/source/lib/sdk/deprecated/unit-test-finder.js
+++ b/addon-sdk/source/lib/sdk/deprecated/unit-test-finder.js
@@ -14,6 +14,7 @@ const suites = require('@test/options').allTestModules;
 const { Loader } = require("sdk/test/loader");
 const cuddlefish = require("sdk/loader/cuddlefish");
 
+let loader = Loader(module);
 const NOT_TESTS = ['setup', 'teardown'];
 
 var TestFinder = exports.TestFinder = function TestFinder(options) {
@@ -51,11 +52,10 @@ TestFinder.prototype = {
     } else
       filter = function() {return true};
 
-    suites.forEach(
-      function(suite) {
+    suites.forEach(function(suite) {
         // Load each test file as a main module in its own loader instance
         // `suite` is defined by cuddlefish/manifest.py:ManifestBuilder.build
-        let loader = Loader(module);
+
         let suiteModule;
 
         try {
diff --git a/addon-sdk/source/lib/sdk/lang/type.js b/addon-sdk/source/lib/sdk/lang/type.js
index dc3065d24c69..8d2feea4e194 100644
--- a/addon-sdk/source/lib/sdk/lang/type.js
+++ b/addon-sdk/source/lib/sdk/lang/type.js
@@ -129,6 +129,12 @@ function isArguments(value) {
 }
 exports.isArguments = isArguments;
 
+let isMap = value => Object.prototype.toString.call(value) === "[object Map]"
+exports.isMap = isMap;
+
+let isSet = value => Object.prototype.toString.call(value) === "[object Set]"
+exports.isSet = isSet;
+
 /**
  * Returns true if it is a primitive `value`. (null, undefined, number,
  * boolean, string)
diff --git a/addon-sdk/source/lib/sdk/selection.js b/addon-sdk/source/lib/sdk/selection.js
index 339390c164fa..bdb96bc3a503 100644
--- a/addon-sdk/source/lib/sdk/selection.js
+++ b/addon-sdk/source/lib/sdk/selection.js
@@ -315,14 +315,24 @@ function getElementWithSelection() {
   if (!element)
     return null;
 
-  let { value, selectionStart, selectionEnd } = element;
+  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 hasSelection = typeof value === "string" &&
+    let { value, selectionStart, selectionEnd } = element;
+
+    let hasSelection = typeof value === "string" &&
                       !isNaN(selectionStart) &&
                       !isNaN(selectionEnd) &&
                       selectionStart !== selectionEnd;
 
-  return hasSelection ? element : null;
+    return hasSelection ? element : null;
+  }
+  catch (err) {
+    return null;
+  }
+
 }
 
 /**
diff --git a/addon-sdk/source/lib/sdk/util/sequence.js b/addon-sdk/source/lib/sdk/util/sequence.js
new file mode 100644
index 000000000000..d65089cdeb20
--- /dev/null
+++ b/addon-sdk/source/lib/sdk/util/sequence.js
@@ -0,0 +1,576 @@
+/* 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";
+
+module.metadata = {
+  "stability": "experimental"
+};
+
+// Disclamer:
+// In this module we'll have some common argument / variable names
+// to hint their type or behavior.
+//
+// - `f` stands for "function" that is intended to be side effect
+//   free.
+// - `p` stands for "predicate" that is function which returns logical
+//   true or false and is intended to be side effect free.
+// - `x` / `y` single item of the sequence.
+// - `xs` / `ys` sequence of `x` / `y` items where `x` / `y` signifies
+//    type of the items in sequence, so sequence is not of the same item.
+// - `_` used for argument(s) or variable(s) who's values are ignored.
+
+const { complement, flip, identity } = require("../lang/functional");
+const { iteratorSymbol } = require("../util/iteration");
+const { isArray, isArguments, isMap, isSet,
+        isString, isBoolean, isNumber } = require("../lang/type");
+
+const Sequence = function Sequence(iterator) {
+  if (iterator.isGenerator && iterator.isGenerator())
+    this[iteratorSymbol] = iterator;
+  else
+    throw TypeError("Expected generator argument");
+};
+exports.Sequence = Sequence;
+
+const polymorphic = dispatch => x =>
+  x === null ? dispatch.null(null) :
+  x === void(0) ? dispatch.void(void(0)) :
+  isArray(x) ? (dispatch.array || dispatch.indexed)(x) :
+  isString(x) ? (dispatch.string || dispatch.indexed)(x) :
+  isArguments(x) ? (dispatch.arguments || dispatch.indexed)(x) :
+  isMap(x) ? dispatch.map(x) :
+  isSet(x) ? dispatch.set(x) :
+  isNumber(x) ? dispatch.number(x) :
+  isBoolean(x) ? dispatch.boolean(x) :
+  dispatch.default(x);
+
+const nogen = function*() {};
+const empty = () => new Sequence(nogen);
+exports.empty = empty;
+
+const seq = polymorphic({
+  null: empty,
+  void: empty,
+  array: identity,
+  string: identity,
+  arguments: identity,
+  map: identity,
+  set: identity,
+  default: x => x instanceof Sequence ? x : new Sequence(x)
+});
+exports.seq = seq;
+
+
+
+
+// Function to cast seq to string.
+const string = (...etc) => "".concat(...etc);
+exports.string = string;
+
+// Function for casting seq to plain object.
+const object = (...pairs) => {
+  let result = {};
+  for (let [key, value] of pairs)
+    result[key] = value;
+
+  return result;
+};
+exports.object = object;
+
+// Takes `getEnumerator` function that returns `nsISimpleEnumerator`
+// and creates lazy sequence of it's items. Note that function does
+// not take `nsISimpleEnumerator` itslef because that would allow
+// single iteration, which would not be consistent with rest of the
+// lazy sequences.
+const fromEnumerator = getEnumerator => seq(function* () {
+  const enumerator = getEnumerator();
+  while (enumerator.hasMoreElements())
+   yield enumerator.getNext();
+});
+exports.fromEnumerator = fromEnumerator;
+
+// Takes `object` and returns lazy sequence of own `[key, value]`
+// pairs (does not include inherited and non enumerable keys).
+const pairs = polymorphic({
+  null: empty,
+  void: empty,
+  map: identity,
+  indexed: indexed => seq(function* () {
+    const count = indexed.length;
+    let index = 0;
+    while (index < count) {
+      yield [index, indexed[index]];
+      index = index + 1;
+    }
+  }),
+  default: object => seq(function* () {
+    for (let key of Object.keys(object))
+      yield [key, object[key]];
+  })
+});
+exports.pairs = pairs;
+
+
+const keys = polymorphic({
+  null: empty,
+  void: empty,
+  indexed: indexed => seq(function* () {
+    const count = indexed.length;
+    let index = 0;
+    while (index < count) {
+      yield index;
+      index = index + 1;
+    }
+  }),
+  map: map => seq(function* () {
+    for (let [key, _] of map)
+      yield key;
+  }),
+  default: object => seq(function* () {
+    for (let key of Object.keys(object))
+      yield key;
+  })
+});
+exports.keys = keys;
+
+
+const values = polymorphic({
+  null: empty,
+  void: empty,
+  set: identity,
+  indexed: indexed => seq(function* () {
+    const count = indexed.length;
+    let index = 0;
+    while (index < count) {
+      yield indexed[index];
+      index = index + 1;
+    }
+  }),
+  map: map => seq(function* () {
+    for (let [_, value] of map) yield value;
+  }),
+  default: object => seq(function* () {
+    for (let key of Object.keys(object)) yield object[key];
+  })
+});
+exports.values = values;
+
+
+
+// Returns a lazy sequence of `x`, `f(x)`, `f(f(x))` etc.
+// `f` must be free of side-effects. Note that returned
+// sequence is infinite so it must be consumed partially.
+//
+// Implements clojure iterate:
+// http://clojuredocs.org/clojure_core/clojure.core/iterate
+const iterate = (f, x) => seq(function* () {
+  let state = x;
+  while (true) {
+    yield state;
+    state = f(state);
+  }
+});
+exports.iterate = iterate;
+
+// Returns a lazy sequence of the items in sequence for which `p(item)`
+// returns `true`. `p` must be free of side-effects.
+//
+// Implements clojure filter:
+// http://clojuredocs.org/clojure_core/clojure.core/filter
+const filter = (p, sequence) => seq(function* () {
+  if (sequence !== null && sequence !== void(0)) {
+    for (let item of sequence) {
+      if (p(item))
+        yield item;
+    }
+  }
+});
+exports.filter = filter;
+
+// Returns a lazy sequence consisting of the result of applying `f` to the
+// set of first items of each sequence, followed by applying f to the set
+// of second items in each sequence, until any one of the sequences is
+// exhausted. Any remaining items in other sequences are ignored. Function
+// `f` should accept number-of-sequences arguments.
+//
+// Implements clojure map:
+// http://clojuredocs.org/clojure_core/clojure.core/map
+const map = (f, ...sequences) => seq(function* () {
+  const count = sequences.length;
+  // Optimize a single sequence case
+  if (count === 1) {
+    let [sequence] = sequences;
+    if (sequence !== null && sequence !== void(0)) {
+      for (let item of sequence)
+        yield f(item);
+    }
+  }
+  else {
+    // define args array that will be recycled on each
+    // step to aggregate arguments to be passed to `f`.
+    let args = [];
+    // define inputs to contain started generators.
+    let inputs = [];
+
+    let index = 0;
+    while (index < count) {
+      inputs[index] = sequences[index][iteratorSymbol]();
+      index = index + 1;
+    }
+
+    // Run loop yielding of applying `f` to the set of
+    // items at each step until one of the `inputs` is
+    // exhausted.
+    let done = false;
+    while (!done) {
+      let index = 0;
+      let value = void(0);
+      while (index < count && !done) {
+        ({ done, value }) = inputs[index].next();
+
+        // If input is not exhausted yet store value in args.
+        if (!done) {
+          args[index] = value;
+          index = index + 1;
+        }
+      }
+
+      // If none of the inputs is exhasted yet, `args` contain items
+      // from each input so we yield application of `f` over them.
+      if (!done)
+        yield f(...args);
+    }
+  }
+});
+exports.map = map;
+
+// Returns a lazy sequence of the intermediate values of the reduction (as
+// per reduce) of sequence by `f`, starting with `initial` value if provided.
+//
+// Implements clojure reductions:
+// http://clojuredocs.org/clojure_core/clojure.core/reductions
+const reductions = (...params) => {
+  const count = params.length;
+  let hasInitial = false;
+  let f, initial, source;
+  if (count === 2) {
+    ([f, source]) = params;
+  }
+  else if (count === 3) {
+    ([f, initial, source]) = params;
+    hasInitial = true;
+  }
+  else {
+    throw Error("Invoked with wrong number of arguments: " + count);
+  }
+
+  const sequence = seq(source);
+
+  return seq(function* () {
+    let started = hasInitial;
+    let result = void(0);
+
+    // If initial is present yield it.
+    if (hasInitial)
+      yield (result = initial);
+
+    // For each item of the sequence accumulate new result.
+    for (let item of sequence) {
+      // If nothing has being yield yet set result to first
+      // item and yield it.
+      if (!started) {
+        started = true;
+        yield (result = item);
+      }
+      // Otherwise accumulate new result and yield it.
+      else {
+        yield (result = f(result, item));
+      }
+    }
+
+    // If nothing has being yield yet it's empty sequence and no
+    // `initial` was provided in which case we need to yield `f()`.
+    if (!started)
+      yield f();
+  });
+};
+exports.reductions = reductions;
+
+// `f` should be a function of 2 arguments. If `initial` is not supplied,
+// returns the result of applying `f` to the first 2 items in sequence, then
+// applying `f` to that result and the 3rd item, etc. If sequence contains no
+// items, `f` must accept no arguments as well, and reduce returns the
+// result of calling f with no arguments. If sequence has only 1 item, it
+// is returned and `f` is not called. If `initial` is supplied, returns the
+// result of applying `f` to `initial` and the first item in  sequence, then
+// applying `f` to that result and the 2nd item, etc. If sequence contains no
+// items, returns `initial` and `f` is not called.
+//
+// Implements clojure reduce:
+// http://clojuredocs.org/clojure_core/clojure.core/reduce
+const reduce = (...args) => {
+  const xs = reductions(...args);
+  let x;
+  for (x of xs) void(0);
+  return x;
+};
+exports.reduce = reduce;
+
+const each = (f, sequence) => {
+  for (let x of seq(sequence)) void(f(x));
+};
+exports.each = each;
+
+
+const inc = x => x + 1;
+// Returns the number of items in the sequence. `count(null)` && `count()`
+// returns `0`. Also works on strings, arrays, Maps & Sets.
+
+// Implements clojure count:
+// http://clojuredocs.org/clojure_core/clojure.core/count
+const count = polymorphic({
+  null: _ => 0,
+  void: _ => 0,
+  indexed: indexed => indexed.length,
+  map: map => map.size,
+  set: set => set.size,
+  default: xs => reduce(inc, 0, xs)
+});
+exports.count = count;
+
+// Returns `true` if sequence has no items.
+
+// Implements clojure empty?:
+// http://clojuredocs.org/clojure_core/clojure.core/empty_q
+const isEmpty = sequence => {
+  // Treat `null` and `undefined` as empty sequences.
+  if (sequence === null || sequence === void(0))
+    return true;
+
+  // If contains any item non empty so return `false`.
+  for (let _ of sequence)
+    return false;
+
+  // If has not returned yet, there was nothing to iterate
+  // so it's empty.
+  return true;
+};
+exports.isEmpty = isEmpty;
+
+const and = (a, b) => a && b;
+
+// Returns true if `p(x)` is logical `true` for every `x` in sequence, else
+// `false`.
+//
+// Implements clojure every?:
+// http://clojuredocs.org/clojure_core/clojure.core/every_q
+const isEvery = (p, sequence) => {
+  if (sequence !== null && sequence !== void(0)) {
+    for (let item of sequence) {
+      if (!p(item))
+        return false;
+    }
+  }
+  return true;
+};
+exports.isEvery = isEvery;
+
+// Returns the first logical true value of (p x) for any x in sequence,
+// else `null`.
+//
+// Implements clojure some:
+// http://clojuredocs.org/clojure_core/clojure.core/some
+const some = (p, sequence) => {
+  if (sequence !== null && sequence !== void(0)) {
+    for (let item of sequence) {
+      if (p(item))
+        return true;
+    }
+  }
+  return null;
+};
+exports.some = some;
+
+// Returns a lazy sequence of the first `n` items in sequence, or all items if
+// there are fewer than `n`.
+//
+// Implements clojure take:
+// http://clojuredocs.org/clojure_core/clojure.core/take
+const take = (n, sequence) => n <= 0 ? empty() : seq(function* () {
+  let count = n;
+  for (let item of sequence) {
+    yield item;
+    count = count - 1;
+    if (count === 0) break;
+  }
+});
+exports.take = take;
+
+// Returns a lazy sequence of successive items from sequence while
+// `p(item)` returns `true`. `p` must be free of side-effects.
+//
+// Implements clojure take-while:
+// http://clojuredocs.org/clojure_core/clojure.core/take-while
+const takeWhile = (p, sequence) => seq(function* () {
+  for (let item of sequence) {
+    if (!p(item))
+      break;
+
+    yield item;
+  }
+});
+exports.takeWhile = takeWhile;
+
+// Returns a lazy sequence of all but the first `n` items in
+// sequence.
+//
+// Implements clojure drop:
+// http://clojuredocs.org/clojure_core/clojure.core/drop
+const drop = (n, sequence) => seq(function* () {
+  if (sequence !== null && sequence !== void(0)) {
+    let count = n;
+    for (let item of sequence) {
+      if (count > 0)
+        count = count - 1;
+      else
+        yield item;
+    }
+  }
+});
+exports.drop = drop;
+
+// Returns a lazy sequence of the items in sequence starting from the
+// first item for which `p(item)` returns falsy value.
+//
+// Implements clojure drop-while:
+// http://clojuredocs.org/clojure_core/clojure.core/drop-while
+const dropWhile = (p, sequence) => seq(function* () {
+  let keep = false;
+  for (let item of sequence) {
+    keep = keep || !p(item);
+    if (keep) yield item;
+  }
+});
+exports.dropWhile = dropWhile;
+
+// Returns a lazy sequence representing the concatenation of the
+// suplied sequences.
+//
+// Implements clojure conact:
+// http://clojuredocs.org/clojure_core/clojure.core/concat
+const concat = (...sequences) => seq(function* () {
+  for (let sequence of sequences)
+    for (let item of sequence)
+      yield item;
+});
+exports.concat = concat;
+
+// Returns the first item in the sequence.
+//
+// Implements clojure first:
+// http://clojuredocs.org/clojure_core/clojure.core/first
+const first = sequence => {
+  if (sequence !== null && sequence !== void(0)) {
+    for (let item of sequence)
+      return item;
+  }
+  return null;
+};
+exports.first = first;
+
+// Returns a possibly empty sequence of the items after the first.
+//
+// Implements clojure rest:
+// http://clojuredocs.org/clojure_core/clojure.core/rest
+const rest = sequence => drop(1, sequence);
+exports.rest = rest;
+
+// Returns the value at the index. Returns `notFound` or `undefined`
+// if index is out of bounds.
+const nth = (xs, n, notFound) => {
+  if (n >= 0) {
+    if (isArray(xs) || isArguments(xs) || isString(xs)) {
+      return n < xs.length ? xs[n] : notFound;
+    }
+    else if (xs !== null && xs !== void(0)) {
+      let count = n;
+      for (let x of xs) {
+        if (count <= 0)
+          return x;
+
+        count = count - 1;
+      }
+    }
+  }
+  return notFound;
+};
+exports.nth = nth;
+
+// Return the last item in sequence, in linear time.
+// If `sequence` is an array or string or arguments
+// returns in constant time.
+// Implements clojure last:
+// http://clojuredocs.org/clojure_core/clojure.core/last
+const last = polymorphic({
+  null: _ => null,
+  void: _ => null,
+  indexed: indexed => indexed[indexed.length - 1],
+  map: xs => reduce((_, x) => x, xs),
+  set: xs => reduce((_, x) => x, xs),
+  default: xs => reduce((_, x) => x, xs)
+});
+exports.last = last;
+
+// Return a lazy sequence of all but the last `n` (default 1) items
+// from the give `xs`.
+//
+// Implements clojure drop-last:
+// http://clojuredocs.org/clojure_core/clojure.core/drop-last
+const dropLast = flip((xs, n=1) => seq(function* () {
+  let ys = [];
+  for (let x of xs) {
+    ys.push(x);
+    if (ys.length > n)
+      yield ys.shift();
+  }
+}));
+exports.dropLast = dropLast;
+
+// Returns a lazy sequence of the elements of `xs` with duplicates
+// removed
+//
+// Implements clojure distinct
+// http://clojuredocs.org/clojure_core/clojure.core/distinct
+const distinct = sequence => seq(function* () {
+  let items = new Set();
+  for (let item of sequence) {
+    if (!items.has(item)) {
+      items.add(item);
+      yield item;
+    }
+  }
+});
+exports.distinct = distinct;
+
+// Returns a lazy sequence of the items in `xs` for which
+// `p(x)` returns false. `p` must be free of side-effects.
+//
+// Implements clojure remove
+// http://clojuredocs.org/clojure_core/clojure.core/remove
+const remove = (p, xs) => filter(complement(p), xs);
+exports.remove = remove;
+
+// Returns the result of applying concat to the result of
+// `map(f, xs)`. Thus function `f` should return a sequence.
+//
+// Implements clojure mapcat
+// http://clojuredocs.org/clojure_core/clojure.core/mapcat
+const mapcat = (f, sequence) => seq(function* () {
+  const sequences = map(f, sequence);
+  for (let sequence of sequences)
+    for (let item of sequence)
+      yield item;
+});
+exports.mapcat = mapcat;
diff --git a/addon-sdk/source/python-lib/cuddlefish/__init__.py b/addon-sdk/source/python-lib/cuddlefish/__init__.py
index e908916f0304..8218bae9ca73 100644
--- a/addon-sdk/source/python-lib/cuddlefish/__init__.py
+++ b/addon-sdk/source/python-lib/cuddlefish/__init__.py
@@ -26,14 +26,12 @@ usage = """
 %prog [options] command [command-specific options]
 
 Supported Commands:
-  docs       - view web-based documentation
   init       - create a sample addon in an empty directory
   test       - run tests
   run        - run program
   xpi        - generate an xpi
 
 Internal Commands:
-  sdocs      - export static documentation
   testcfx    - test the cfx tool
   testex     - test all example code
   testpkgs   - test all installed packages
@@ -223,11 +221,6 @@ parser_groups = (
                                   metavar=None,
                                   default=False,
                                   cmds=['test', 'testex', 'testpkgs'])),
-        (("", "--override-version",), dict(dest="override_version",
-                                  help="Pass in a version string to use in generated docs",
-                                  metavar=None,
-                                  default=False,
-                                  cmds=['sdocs'])),
         (("", "--check-memory",), dict(dest="check_memory",
                                        help="attempts to detect leaked compartments after a test run",
                                        action="store_true",
@@ -238,6 +231,10 @@ parser_groups = (
                                       help="Where to put the finished .xpi",
                                       default=None,
                                       cmds=['xpi'])),
+        (("", "--manifest-overload",), dict(dest="manifest_overload",
+                                      help="JSON file to overload package.json properties",
+                                      default=None,
+                                      cmds=['xpi'])),
         ]
      ),
 
@@ -249,12 +246,6 @@ parser_groups = (
                                  default=None,
                                  cmds=['test', 'run', 'testex', 'testpkgs',
                                        'testall'])),
-        (("", "--baseurl",), dict(dest="baseurl",
-                                 help=("root of static docs tree: "
-                                       "for example: 'http://me.com/the_docs/'"),
-                                 metavar=None,
-                                 default='',
-                                 cmds=['sdocs'])),
         (("", "--test-runner-pkg",), dict(dest="test_runner_pkg",
                                           help=("name of package "
                                                 "containing test runner "
@@ -626,23 +617,6 @@ def run(arguments=sys.argv[1:], target_cfg=None, pkg_cfg=None,
             return
         test_cfx(env_root, options.verbose)
         return
-    elif command == "docs":
-        from cuddlefish.docs import generate
-        if len(args) > 1:
-            docs_home = generate.generate_named_file(env_root, filename_and_path=args[1])
-        else:
-            docs_home = generate.generate_local_docs(env_root)
-            webbrowser.open(docs_home)
-        return
-    elif command == "sdocs":
-        from cuddlefish.docs import generate
-        filename=""
-        if options.override_version:
-            filename = generate.generate_static_docs(env_root, override_version=options.override_version)
-        else:
-            filename = generate.generate_static_docs(env_root)
-        print >>stdout, "Wrote %s." % filename
-        return
     elif command not in ["xpi", "test", "run"]:
         print >>sys.stderr, "Unknown command: %s" % command
         print >>sys.stderr, "Try using '--help' for assistance."
@@ -666,6 +640,10 @@ def run(arguments=sys.argv[1:], target_cfg=None, pkg_cfg=None,
         target_cfg_json = os.path.join(options.pkgdir, 'package.json')
         target_cfg = packaging.get_config_in_dir(options.pkgdir)
 
+    if options.manifest_overload:
+        for k, v in packaging.load_json_file(options.manifest_overload).items():
+            target_cfg[k] = v
+
     # At this point, we're either building an XPI or running Jetpack code in
     # a Mozilla application (which includes running tests).
 
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/addons/simplest-test/manifest-overload.json b/addon-sdk/source/python-lib/cuddlefish/tests/addons/simplest-test/manifest-overload.json
new file mode 100644
index 000000000000..a446378b0cfb
--- /dev/null
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/addons/simplest-test/manifest-overload.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0-nightly"
+}
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_init.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_init.py
index c47378bca692..ac8d6f9bce83 100644
--- a/addon-sdk/source/python-lib/cuddlefish/tests/test_init.py
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_init.py
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os, unittest, shutil
+import zipfile
 from StringIO import StringIO
 from cuddlefish import initializer
 from cuddlefish.templates import TEST_MAIN_JS, PACKAGE_JSON
@@ -196,6 +197,21 @@ class TestCfxQuits(unittest.TestCase):
         self.assertIn("1 of 1 tests passed.", err)
         self.assertIn("Program terminated successfully.", err)
 
+    def test_cfx_xpi(self):
+        addon_path = os.path.join(tests_path,
+                                  "addons", "simplest-test")
+        rc, out, err = self.run_cfx(addon_path, \
+          ["xpi", "--manifest-overload", "manifest-overload.json"])
+        self.assertEqual(rc, 0)
+        # Ensure that the addon version from our manifest overload is used
+        # in install.rdf
+        xpi_path = os.path.join(addon_path, "simplest-test.xpi")
+        xpi = zipfile.ZipFile(xpi_path, "r")
+        manifest = xpi.read("install.rdf")
+        self.assertIn("<em:version>1.0-nightly</em:version>", manifest)
+        xpi.close()
+        os.remove(xpi_path)
+
     def test_cfx_init(self):
         # Create an empty test directory
         addon_path = os.path.abspath(os.path.join(".test_tmp", "test-cfx-init"))
diff --git a/addon-sdk/source/test/addons/translators/main.js b/addon-sdk/source/test/addons/translators/main.js
new file mode 100644
index 000000000000..e175bea36092
--- /dev/null
+++ b/addon-sdk/source/test/addons/translators/main.js
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+'use strict';
+
+const { Cc, Ci, Cu, Cm, components } = require('chrome');
+const self = require('sdk/self');
+const { AddonManager } = Cu.import('resource://gre/modules/AddonManager.jsm', {});
+
+
+exports.testTranslators = function(assert, done) {
+  AddonManager.getAddonByID(self.id, function(addon) {
+    let count = 0;
+    addon.translators.forEach(function({ name }) {
+      count++;
+      assert.equal(name, 'Erik Vold', 'The translator keys are correct');
+    });
+      assert.equal(count, 1, 'The translator key count is correct');
+      assert.equal(addon.translators.length, 1, 'The translator key length is correct');
+    done();
+  });
+}
+
+require('sdk/test/runner').runTestsFromModule(module);
diff --git a/addon-sdk/source/test/addons/translators/package.json b/addon-sdk/source/test/addons/translators/package.json
new file mode 100644
index 000000000000..9d1667a339a8
--- /dev/null
+++ b/addon-sdk/source/test/addons/translators/package.json
@@ -0,0 +1,6 @@
+{
+  "id": "test-translators",
+  "translators": [
+    "Erik Vold"
+  ]
+}
diff --git a/addon-sdk/source/test/test-context-menu.html b/addon-sdk/source/test/test-context-menu.html
index 5d380bf7a341..1d4304b87351 100644
--- a/addon-sdk/source/test/test-context-menu.html
+++ b/addon-sdk/source/test/test-context-menu.html
@@ -6,6 +6,9 @@
   <head>
     <meta charset="UTF-8">
     <title>Context menu test</title>
+    <style>
+      p { display: inline-block; }
+    </style>
   </head>
   <body>
     <p>
@@ -52,5 +55,27 @@
     <p>
       <input type="submit" id="button">
     </p>
+
+    <p>
+      <a class="predicate-test-a" href="#test">
+        A link with no ID and an anchor, used by PredicateContext tests.
+      </a>
+    </p>
+
+    <p>
+      <input type="text" id="textbox" value="test value">
+    </p>
+
+    <p>
+      <input type="text" id="readonly-textbox" readonly="true" value="readonly value">
+    </p>
+
+    <p>
+      <input type="text" id="disabled-textbox" disabled="true" value="disabled value">
+    </p>
+
+    <p>
+      <p contenteditable="true" id="editable">This content is editable.</p>
+    </p>
   </body>
 </html>
diff --git a/addon-sdk/source/test/test-context-menu.js b/addon-sdk/source/test/test-context-menu.js
index 80b6df4f0ff5..f2b1c3c0ee3b 100644
--- a/addon-sdk/source/test/test-context-menu.js
+++ b/addon-sdk/source/test/test-context-menu.js
@@ -3135,6 +3135,488 @@ exports.testSelectionInOuterFrameNoMatch = function (assert, done) {
   });
 };
 
+
+// Test that the return value of the predicate function determines if
+// item is shown
+exports.testPredicateContextControl = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let itemTrue = loader.cm.Item({
+    label: "visible",
+    context: loader.cm.PredicateContext(function () { return true; })
+  });
+
+  let itemFalse = loader.cm.Item({
+    label: "hidden",
+    context: loader.cm.PredicateContext(function () { return false; })
+  });
+
+  test.showMenu(null, function (popup) {
+    test.checkMenu([itemTrue, itemFalse], [itemFalse], []);
+    test.done();
+  });
+};
+
+// Test that the data object has the correct document type
+exports.testPredicateContextDocumentType = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.equal(data.documentType, 'text/html');
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(null, function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object has the correct document URL
+exports.testPredicateContextDocumentURL = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.equal(data.documentURL, TEST_DOC_URL);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(null, function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+
+// Test that the data object has the correct element name
+exports.testPredicateContextTargetName = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.targetName, "input");
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("button"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+
+// Test that the data object has the correct ID
+exports.testPredicateContextTargetIDSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.targetID, "button");
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("button"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object has the correct ID
+exports.testPredicateContextTargetIDNotSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.targetID, null);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementsByClassName("predicate-test-a")[0], function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object is showing editable correctly for regular text inputs
+exports.testPredicateContextTextBoxIsEditable = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.isEditable, true);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("textbox"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object is showing editable correctly for readonly text inputs
+exports.testPredicateContextReadonlyTextBoxIsNotEditable = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.isEditable, false);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("readonly-textbox"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object is showing editable correctly for disabled text inputs
+exports.testPredicateContextDisabledTextBoxIsNotEditable = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.isEditable, false);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("disabled-textbox"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object is showing editable correctly for text areas
+exports.testPredicateContextTextAreaIsEditable = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.isEditable, true);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("textfield"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that non-text inputs are not considered editable
+exports.testPredicateContextButtonIsNotEditable = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.isEditable, false);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("button"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+
+// Test that the data object is showing editable correctly
+exports.testPredicateContextNonInputIsNotEditable = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.isEditable, false);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("image"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+
+// Test that the data object is showing editable correctly for HTML contenteditable elements
+exports.testPredicateContextEditableElement = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.isEditable, true);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("editable"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+
+// Test that the data object does not have a selection when there is none
+exports.testPredicateContextNoSelectionInPage = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.selectionText, null);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(null, function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object includes the selected page text
+exports.testPredicateContextSelectionInPage = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      // since we might get whitespace
+      assert.ok(data.selectionText && data.selectionText.search(/^\s*Some text.\s*$/) != -1,
+		'Expected "Some text.", got "' + data.selectionText + '"');
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    window.getSelection().selectAllChildren(doc.getElementById("text"));
+    test.showMenu(null, function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object includes the selected input text
+exports.testPredicateContextSelectionInTextBox = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      // since we might get whitespace
+      assert.strictEqual(data.selectionText, "t v");
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    let textbox = doc.getElementById("textbox");
+    textbox.focus();
+    textbox.setSelectionRange(3, 6);
+    test.showMenu(textbox, function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object has the correct src for an image
+exports.testPredicateContextTargetSrcSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+  let image;
+  
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.srcURL, image.src);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    image = doc.getElementById("image");
+    test.showMenu(image, function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object has no src for a link
+exports.testPredicateContextTargetSrcNotSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+  
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.srcURL, null);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("link"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+
+// Test that the data object has the correct link set
+exports.testPredicateContextTargetLinkSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+  let image;
+  
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.linkURL, TEST_DOC_URL + "#test");
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementsByClassName("predicate-test-a")[0], function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object has no link for an image
+exports.testPredicateContextTargetLinkNotSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+  
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.linkURL, null);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("image"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object has the value for an input textbox
+exports.testPredicateContextTargetValueSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+  let image;
+  
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.value, "test value");
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("textbox"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+// Test that the data object has no value for an image
+exports.testPredicateContextTargetValueNotSet = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+  
+  let items = [loader.cm.Item({
+    label: "item",
+    context: loader.cm.PredicateContext(function (data) {
+      assert.strictEqual(data.value, null);
+      return true;
+    })
+  })];
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu(doc.getElementById("image"), function (popup) {
+      test.checkMenu(items, [], []);
+      test.done();
+    });
+  });
+};
+
+
 // NO TESTS BELOW THIS LINE! ///////////////////////////////////////////////////
 
 // This makes it easier to run tests by handling things like opening the menu,
diff --git a/addon-sdk/source/test/test-sequence.js b/addon-sdk/source/test/test-sequence.js
new file mode 100644
index 000000000000..ec450a5c6a93
--- /dev/null
+++ b/addon-sdk/source/test/test-sequence.js
@@ -0,0 +1,1163 @@
+/* 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";
+
+let { seq, iterate, filter, map, reductions, reduce, count,
+      isEmpty, every, isEvery, some, take, takeWhile, drop,
+      dropWhile, concat, first, rest, nth, last, dropLast,
+      distinct, remove, mapcat, fromEnumerator, string,
+      object, pairs, keys, values, each
+    } = require("sdk/util/sequence");
+
+const boom = () => { throw new Error("Boom!"); };
+const broken = seq(function*() {
+  yield 1;
+  throw new Error("Boom!");
+});
+
+exports["test seq"] = assert => {
+  let xs = seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+  });
+
+  assert.deepEqual([...seq(null)], [], "seq of null is empty");
+  assert.deepEqual([...seq(void(0))], [], "seq of void is empty");
+  assert.deepEqual([...xs], [1, 2, 3], "seq of 1 2 3");
+  assert.deepEqual([...seq(xs)], [1, 2, 3], "seq of seq is seq");
+
+  assert.deepEqual([...seq([])], [], "seq of emtpy array is empty");
+  assert.deepEqual([...seq([1])], [1], "seq of lonly array is single element");
+  assert.deepEqual([...seq([1, 2, 3])], [1, 2, 3], "seq of array is it's elements");
+
+  assert.deepEqual([...seq("")], [], "seq of emtpy string is empty");
+  assert.deepEqual([...seq("o")], ["o"], "seq of char is single char seq");
+  assert.deepEqual([...seq("hello")], ["h", "e", "l", "l", "o"],
+                   "seq of string are chars");
+
+  assert.deepEqual([...seq(new Set())], [], "seq of emtpy set is empty");
+  assert.deepEqual([...seq(new Set([1]))], [1], "seq of lonely set is single");
+  assert.deepEqual([...seq(new Set([1, 2, 3]))], [1, 2, 3], "seq of lonely set is single");
+
+  assert.deepEqual([...seq(new Map())], [], "seq of emtpy map is empty");
+  assert.deepEqual([...seq(new Map([[1, 2]]))], [[1, 2]], "seq single mapping is that mapping");
+  assert.deepEqual([...seq(new Map([[1, 2], [3, 4], [5, 6]]))],
+                   [[1, 2], [3, 4], [5, 6]],
+                   "seq of map is key value mappings");
+
+  [function(){}, 1, /foo/, true].forEach(x => {
+    assert.throws(() => seq(x), "Type is not seq-able");
+  });
+
+  assert.throws(() => [...broken],
+                /Boom/,
+                "broken sequence errors propagate");
+};
+
+exports["test seq casting"] = assert => {
+  const xs = seq(function*() { yield 1; yield 2; yield 3; });
+  const ys = seq(function*() { yield 1; });
+  const zs = seq(function*() {});
+  const kvs = seq(function*() { yield ["a", 1]; yield ["b", 2]; });
+  const kv = seq(function*() { yield ["a", 1]; });
+
+  assert.deepEqual([...xs], [1, 2, 3], "cast to array");
+  assert.deepEqual([...ys], [1], "cast to of one element");
+  assert.deepEqual([...zs], [], "cast empty array");
+
+  assert.deepEqual(string(...xs), "123", "cast to string");
+  assert.deepEqual(string(...ys), "1", "cast to char");
+  assert.deepEqual(string(...zs), "", "cast to empty string");
+
+  assert.deepEqual(new Set(xs), new Set([1, 2, 3]),
+                   "cast to set of items");
+  assert.deepEqual(new Set(ys), new Set([1]),
+                   "cast to set of one item");
+  assert.deepEqual(new Set(zs), new Set(),
+                   "cast to set of one item");
+
+  assert.deepEqual(new Map(kvs), new Map([["a", 1], ["b", 2]]),
+                   "cast to map");
+  assert.deepEqual(new Map(kv), new Map([["a", 1]]),
+                   "cast to single mapping");
+  assert.deepEqual(new Map(zs), new Map(),
+                   "cast to empty map");
+
+  assert.deepEqual(object(...kvs), {a: 1, b: 2},
+                  "cast to object");
+  assert.deepEqual(object(...kv), {a: 1},
+                  "cast to single pair");
+  assert.deepEqual(object(...zs), {},
+                  "cast to empty object");
+};
+
+exports["test pairs"] = assert => {
+  assert.deepEqual([...pairs(null)], [], "pairs on null is empty");
+  assert.deepEqual([...pairs(void(0))], [], "pairs on void is empty");
+  assert.deepEqual([...pairs({})], [], "empty sequence");
+  assert.deepEqual([...pairs({a: 1})], [["a", 1]], "single pair");
+  assert.deepEqual([...pairs({a: 1, b: 2, c: 3})].sort(),
+                   [["a", 1], ["b", 2], ["c", 3]],
+                   "creates pairs");
+  let items = [];
+  for (let [key, value] of pairs({a: 1, b: 2, c: 3}))
+    items.push([key, value]);
+
+  assert.deepEqual(items.sort(),
+                   [["a", 1], ["b", 2], ["c", 3]],
+                   "for of works on pairs");
+
+
+  assert.deepEqual([...pairs([])], [], "pairs on empty array is empty");
+  assert.deepEqual([...pairs([1])], [[0, 1]], "pairs on array is [index, element]");
+  assert.deepEqual([...pairs([1, 2, 3])],
+                   [[0, 1], [1, 2], [2, 3]],
+                   "for arrays it pair of [index, element]");
+
+  assert.deepEqual([...pairs("")], [], "pairs on empty string is empty");
+  assert.deepEqual([...pairs("a")], [[0, "a"]], "pairs on char is [0, char]");
+  assert.deepEqual([...pairs("hello")],
+                   [[0, "h"], [1, "e"], [2, "l"], [3, "l"], [4, "o"]],
+                   "for strings it's pair of [index, char]");
+
+  assert.deepEqual([...pairs(new Map())],
+                   [],
+                   "pairs on empty map is empty");
+  assert.deepEqual([...pairs(new Map([[1, 3]]))],
+                   [[1, 3]],
+                   "pairs on single mapping single mapping");
+  assert.deepEqual([...pairs(new Map([[1, 2], [3, 4]]))],
+                   [[1, 2], [3, 4]],
+                   "pairs on map returs key vaule pairs");
+
+  assert.throws(() => pairs(new Set()),
+                "can't pair set");
+
+  assert.throws(() => pairs(4),
+                "can't pair number");
+
+  assert.throws(() => pairs(true),
+                "can't pair boolean");
+};
+
+exports["test keys"] = assert => {
+  assert.deepEqual([...keys(null)], [], "keys on null is empty");
+  assert.deepEqual([...keys(void(0))], [], "keys on void is empty");
+  assert.deepEqual([...keys({})], [], "empty sequence");
+  assert.deepEqual([...keys({a: 1})], ["a"], "single key");
+  assert.deepEqual([...keys({a: 1, b: 2, c: 3})].sort(),
+                   ["a", "b", "c"],
+                   "all keys");
+
+  let items = [];
+  for (let key of keys({a: 1, b: 2, c: 3}))
+    items.push(key);
+
+  assert.deepEqual(items.sort(),
+                   ["a", "b", "c"],
+                   "for of works on keys");
+
+
+  assert.deepEqual([...keys([])], [], "keys on empty array is empty");
+  assert.deepEqual([...keys([1])], [0], "keys on array is indexes");
+  assert.deepEqual([...keys([1, 2, 3])],
+                   [0, 1, 2],
+                   "keys on arrays returns indexes");
+
+  assert.deepEqual([...keys("")], [], "keys on empty string is empty");
+  assert.deepEqual([...keys("a")], [0], "keys on char is 0");
+  assert.deepEqual([...keys("hello")],
+                   [0, 1, 2, 3, 4],
+                   "keys on strings is char indexes");
+
+  assert.deepEqual([...keys(new Map())],
+                   [],
+                   "keys on empty map is empty");
+  assert.deepEqual([...keys(new Map([[1, 3]]))],
+                   [1],
+                   "keys on single mapping single mapping is single key");
+  assert.deepEqual([...keys(new Map([[1, 2], [3, 4]]))],
+                   [1, 3],
+                   "keys on map is keys from map");
+
+  assert.throws(() => keys(new Set()),
+                "can't keys set");
+
+  assert.throws(() => keys(4),
+                "can't keys number");
+
+  assert.throws(() => keys(true),
+                "can't keys boolean");
+};
+
+exports["test values"] = assert => {
+  assert.deepEqual([...values({})], [], "empty sequence");
+  assert.deepEqual([...values({a: 1})], [1], "single value");
+  assert.deepEqual([...values({a: 1, b: 2, c: 3})].sort(),
+                   [1, 2, 3],
+                   "all values");
+
+  let items = [];
+  for (let value of values({a: 1, b: 2, c: 3}))
+    items.push(value);
+
+  assert.deepEqual(items.sort(),
+                   [1, 2, 3],
+                   "for of works on values");
+
+  assert.deepEqual([...values([])], [], "values on empty array is empty");
+  assert.deepEqual([...values([1])], [1], "values on array elements");
+  assert.deepEqual([...values([1, 2, 3])],
+                   [1, 2, 3],
+                   "values on arrays returns elements");
+
+  assert.deepEqual([...values("")], [], "values on empty string is empty");
+  assert.deepEqual([...values("a")], ["a"], "values on char is char");
+  assert.deepEqual([...values("hello")],
+                   ["h", "e", "l", "l", "o"],
+                   "values on strings is chars");
+
+  assert.deepEqual([...values(new Map())],
+                   [],
+                   "values on empty map is empty");
+  assert.deepEqual([...values(new Map([[1, 3]]))],
+                   [3],
+                   "keys on single mapping single mapping is single key");
+  assert.deepEqual([...values(new Map([[1, 2], [3, 4]]))],
+                   [2, 4],
+                   "values on map is values from map");
+
+  assert.deepEqual([...values(new Set())], [], "values on empty set is empty");
+  assert.deepEqual([...values(new Set([1]))], [1], "values on set is it's items");
+  assert.deepEqual([...values(new Set([1, 2, 3]))],
+                   [1, 2, 3],
+                   "values on set is it's items");
+
+
+  assert.throws(() => values(4),
+                "can't values number");
+
+  assert.throws(() => values(true),
+                "can't values boolean");
+};
+
+exports["test fromEnumerator"] = assert => {
+  const { Cc, Ci } = require("chrome");
+  const { enumerateObservers,
+          addObserver,
+          removeObserver } = Cc["@mozilla.org/observer-service;1"].
+                               getService(Ci.nsIObserverService);
+
+
+  const topic = "sec:" + Math.random().toString(32).substr(2);
+  const [a, b, c] = [{wrappedJSObject: {}},
+                     {wrappedJSObject: {}},
+                     {wrappedJSObject: {}}];
+  const unwrap = x => x.wrappedJSObject;
+
+  [a, b, c].forEach(x => addObserver(x, topic, false));
+
+  const xs = fromEnumerator(() => enumerateObservers(topic));
+  const ys = map(unwrap, xs);
+
+  assert.deepEqual([...ys], [a, b, c].map(unwrap),
+                   "all observers are there");
+
+  removeObserver(b, topic);
+
+  assert.deepEqual([...ys], [a, c].map(unwrap),
+                   "b was removed");
+
+  removeObserver(a, topic);
+
+  assert.deepEqual([...ys], [c].map(unwrap),
+                   "a was removed");
+
+  removeObserver(c, topic);
+
+  assert.deepEqual([...ys], [],
+                   "c was removed, now empty");
+
+  addObserver(a, topic, false);
+
+  assert.deepEqual([...ys], [a].map(unwrap),
+                   "a was added");
+
+  removeObserver(a, topic);
+
+  assert.deepEqual([...ys], [].map(unwrap),
+                   "a was removed, now empty");
+
+};
+
+exports["test filter"] = assert => {
+  const isOdd = x => x % 2;
+  const odds = seq(function*() { yield 1; yield 3; yield 5; });
+  const evens = seq(function*() { yield 2; yield 4; yield 6; });
+  const mixed = seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+    yield 4;
+  });
+
+  assert.deepEqual([...filter(isOdd, mixed)], [1, 3],
+                   "filtered odds");
+  assert.deepEqual([...filter(isOdd, odds)], [1, 3, 5],
+                   "kept all");
+  assert.deepEqual([...filter(isOdd, evens)], [],
+                   "kept none");
+
+
+  let xs = filter(boom, mixed);
+  assert.throws(() => [...xs], /Boom/, "errors propagate");
+
+  assert.throws(() => [...filter(isOdd, broken)], /Boom/,
+                "sequence errors propagate");
+};
+
+exports["test filter array"] = assert => {
+  let isOdd = x => x % 2;
+  let xs = filter(isOdd, [1, 2, 3, 4]);
+  let ys = filter(isOdd, [1, 3, 5]);
+  let zs = filter(isOdd, [2, 4, 6]);
+
+  assert.deepEqual([...xs], [1, 3], "filteres odds");
+  assert.deepEqual([...ys], [1, 3, 5], "kept all");
+  assert.deepEqual([...zs], [], "kept none");
+  assert.ok(!Array.isArray(xs));
+};
+
+exports["test filter set"] = assert => {
+  let isOdd = x => x % 2;
+  let xs = filter(isOdd, new Set([1, 2, 3, 4]));
+  let ys = filter(isOdd, new Set([1, 3, 5]));
+  let zs = filter(isOdd, new Set([2, 4, 6]));
+
+  assert.deepEqual([...xs], [1, 3], "filteres odds");
+  assert.deepEqual([...ys], [1, 3, 5], "kept all");
+  assert.deepEqual([...zs], [], "kept none");
+};
+
+exports["test filter string"] = assert => {
+  let isUpperCase = x => x.toUpperCase() === x;
+  let xs = filter(isUpperCase, "aBcDe");
+  let ys = filter(isUpperCase, "ABC");
+  let zs = filter(isUpperCase, "abcd");
+
+  assert.deepEqual([...xs], ["B", "D"], "filteres odds");
+  assert.deepEqual([...ys], ["A", "B", "C"], "kept all");
+  assert.deepEqual([...zs], [], "kept none");
+};
+
+exports["test filter lazy"] = assert => {
+  const x = 1;
+  let y = 2;
+
+  const xy = seq(function*() { yield x; yield y; });
+  const isOdd = x => x % 2;
+  const actual = filter(isOdd, xy);
+
+  assert.deepEqual([...actual], [1], "only one odd number");
+  y = 3;
+  assert.deepEqual([...actual], [1, 3], "filter is lazy");
+};
+
+exports["test filter non sequences"] = assert => {
+  const False = _ => false;
+  assert.throws(() => [...filter(False, 1)],
+                "can't iterate number");
+  assert.throws(() => [...filter(False, {a: 1, b:2})],
+                "can't iterate object");
+};
+
+exports["test map"] = assert => {
+  let inc = x => x + 1;
+  let xs = seq(function*() { yield 1; yield 2; yield 3; });
+  let ys = map(inc, xs);
+
+  assert.deepEqual([...ys], [2, 3, 4], "incremented each item");
+
+  assert.deepEqual([...map(inc, null)], [], "mapping null is empty");
+  assert.deepEqual([...map(inc, void(0))], [], "mapping void is empty");
+  assert.deepEqual([...map(inc, new Set([1, 2, 3]))], [2, 3, 4], "maps set items");
+};
+
+exports["test map two inputs"] = assert => {
+  let sum = (x, y) => x + y;
+  let xs = seq(function*() { yield 1; yield 2; yield 3; });
+  let ys = seq(function*() { yield 4; yield 5; yield 6; });
+
+  let zs = map(sum, xs, ys);
+
+  assert.deepEqual([...zs], [5, 7, 9], "summed numbers");
+};
+
+exports["test map diff sized inputs"] = assert => {
+  let sum = (x, y) => x + y;
+  let xs = seq(function*() { yield 1; yield 2; yield 3; });
+  let ys = seq(function*() { yield 4; yield 5; yield 6; yield 7; yield 8; });
+
+  let zs = map(sum, xs, ys);
+
+  assert.deepEqual([...zs], [5, 7, 9], "summed numbers");
+  assert.deepEqual([...map(sum, ys, xs)], [5, 7, 9],
+                   "index of exhasting input is irrelevant");
+};
+
+exports["test map multi"] = assert => {
+  let sum = (x, y, z, w) => x + y + z + w;
+  let xs = seq(function*() { yield 1; yield 2; yield 3; yield 4; });
+  let ys = seq(function*() { yield 4; yield 5; yield 6; yield 7; yield 8; });
+  let zs = seq(function*() { yield 10; yield 11; yield 12; });
+  let ws = seq(function*() { yield 0; yield 20; yield 40; yield 60; });
+
+  let actual = map(sum, xs, ys, zs, ws);
+
+  assert.deepEqual([...actual], [15, 38, 61], "summed numbers");
+};
+
+exports["test map errors"] = assert => {
+  assert.deepEqual([...map(boom, [])], [],
+                   "won't throw if empty");
+
+  const xs = map(boom, [1, 2, 4]);
+
+  assert.throws(() => [...xs], /Boom/, "propagates errors");
+
+  assert.throws(() => [...map(x => x, broken)], /Boom/,
+                "sequence errors propagate");
+};
+
+exports["test reductions"] = assert => {
+  let sum = (...xs) => xs.reduce((x, y) => x + y, 0);
+
+  assert.deepEqual([...reductions(sum, [1, 1, 1, 1])],
+                   [1, 2, 3, 4],
+                   "works with arrays");
+  assert.deepEqual([...reductions(sum, 5, [1, 1, 1, 1])],
+                   [5, 6, 7, 8, 9],
+                   "array with initial");
+
+  assert.deepEqual([...reductions(sum, seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+  }))],
+  [1, 3, 6],
+  "works with sequences");
+
+  assert.deepEqual([...reductions(sum, 10, seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+  }))],
+  [10, 11, 13, 16],
+  "works with sequences");
+
+  assert.deepEqual([...reductions(sum, [])], [0],
+                   "invokes accumulator with no args");
+
+  assert.throws(() => [...reductions(boom, 1, [1])],
+                /Boom/,
+                "arg errors errors propagate");
+  assert.throws(() => [...reductions(sum, 1, broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+exports["test reduce"] = assert => {
+ let sum = (...xs) => xs.reduce((x, y) => x + y, 0);
+
+  assert.deepEqual(reduce(sum, [1, 2, 3, 4, 5]),
+                   15,
+                   "works with arrays");
+
+  assert.deepEqual(reduce(sum, seq(function*() {
+                     yield 1;
+                     yield 2;
+                     yield 3;
+                   })),
+                   6,
+                   "works with sequences");
+
+  assert.deepEqual(reduce(sum, 10, [1, 2, 3, 4, 5]),
+                   25,
+                   "works with array & initial");
+
+  assert.deepEqual(reduce(sum, 5, seq(function*() {
+                     yield 1;
+                     yield 2;
+                     yield 3;
+                   })),
+                   11,
+                   "works with sequences & initial");
+
+  assert.deepEqual(reduce(sum, []), 0, "reduce with no args");
+  assert.deepEqual(reduce(sum, "a", []), "a", "reduce with initial");
+  assert.deepEqual(reduce(sum, 1, [1]), 2, "reduce with single & initial");
+
+  assert.throws(() => [...reduce(boom, 1, [1])],
+                /Boom/,
+                "arg errors errors propagate");
+  assert.throws(() => [...reduce(sum, 1, broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+exports["test each"] = assert => {
+  const collect = xs => {
+    let result = [];
+    each((...etc) => result.push(...etc), xs);
+    return result;
+  };
+
+  assert.deepEqual(collect(null), [], "each ignores null");
+  assert.deepEqual(collect(void(0)), [], "each ignores void");
+
+  assert.deepEqual(collect([]), [], "each ignores empty");
+  assert.deepEqual(collect([1]), [1], "each works on single item arrays");
+  assert.deepEqual(collect([1, 2, 3, 4, 5]),
+                   [1, 2, 3, 4, 5],
+                   "works with arrays");
+
+  assert.deepEqual(collect(seq(function*() {
+                     yield 1;
+                     yield 2;
+                     yield 3;
+                   })),
+                   [1, 2, 3],
+                   "works with sequences");
+
+  assert.deepEqual(collect(""), [], "ignores empty strings");
+  assert.deepEqual(collect("a"), ["a"], "works on chars");
+  assert.deepEqual(collect("hello"), ["h", "e", "l", "l", "o"],
+                   "works on strings");
+
+  assert.deepEqual(collect(new Set()), [], "ignores empty sets");
+  assert.deepEqual(collect(new Set(["a"])), ["a"],
+                   "works on single item sets");
+  assert.deepEqual(collect(new Set([1, 2, 3])), [1, 2, 3],
+                   "works on muti item tests");
+
+  assert.deepEqual(collect(new Map()), [], "ignores empty maps");
+  assert.deepEqual(collect(new Map([["a", 1]])), [["a", 1]],
+                   "works on single mapping maps");
+  assert.deepEqual(collect(new Map([[1, 2], [3, 4], [5, 6]])),
+                   [[1, 2], [3, 4], [5, 6]],
+                   "works on muti mapping maps");
+
+  assert.throws(() => collect({}), "objects arn't supported");
+  assert.throws(() => collect(1), "numbers arn't supported");
+  assert.throws(() => collect(true), "booleas arn't supported");
+};
+
+exports["test count"] = assert => {
+  assert.equal(count(null), 0, "null counts to 0");
+  assert.equal(count(), 0, "undefined counts to 0");
+  assert.equal(count([]), 0, "empty array");
+  assert.equal(count([1, 2, 3]), 3, "non-empty array");
+  assert.equal(count(""), 0, "empty string");
+  assert.equal(count("hello"), 5, "non-empty string");
+  assert.equal(count(new Map()), 0, "empty map");
+  assert.equal(count(new Map([[1, 2], [2, 3]])), 2, "non-empty map");
+  assert.equal(count(new Set()), 0, "empty set");
+  assert.equal(count(new Set([1, 2, 3, 4])), 4, "non-empty set");
+  assert.equal(count(seq(function*() {})), 0, "empty sequence");
+  assert.equal(count(seq(function*() { yield 1; yield 2; })), 2,
+               "non-empty sequence");
+
+  assert.throws(() => count(broken),
+                /Boom/,
+                "sequence errors propagate");
+};
+
+exports["test isEmpty"] = assert => {
+  assert.equal(isEmpty(null), true, "null is empty");
+  assert.equal(isEmpty(), true, "undefined is empty");
+  assert.equal(isEmpty([]), true, "array is array");
+  assert.equal(isEmpty([1, 2, 3]), false, "array isn't empty");
+  assert.equal(isEmpty(""), true, "string is empty");
+  assert.equal(isEmpty("hello"), false, "non-empty string");
+  assert.equal(isEmpty(new Map()), true, "empty map");
+  assert.equal(isEmpty(new Map([[1, 2], [2, 3]])), false, "non-empty map");
+  assert.equal(isEmpty(new Set()), true, "empty set");
+  assert.equal(isEmpty(new Set([1, 2, 3, 4])), false , "non-empty set");
+  assert.equal(isEmpty(seq(function*() {})), true, "empty sequence");
+  assert.equal(isEmpty(seq(function*() { yield 1; yield 2; })), false,
+               "non-empty sequence");
+
+  assert.equal(isEmpty(broken), false, "hasn't reached error");
+};
+
+exports["test isEvery"] = assert => {
+  let isOdd = x => x % 2;
+  let isTrue = x => x === true;
+  let isFalse = x => x === false;
+
+  assert.equal(isEvery(isOdd, seq(function*() {
+    yield 1;
+    yield 3;
+    yield 5;
+  })), true, "all are odds");
+
+  assert.equal(isEvery(isOdd, seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+  })), false, "contains even");
+
+  assert.equal(isEvery(isTrue, seq(function*() {})), true, "true if empty");
+  assert.equal(isEvery(isFalse, seq(function*() {})), true, "true if empty");
+
+  assert.equal(isEvery(isTrue, null), true, "true for null");
+  assert.equal(isEvery(isTrue, undefined), true, "true for undefined");
+
+  assert.throws(() => isEvery(boom, [1, 2]),
+                /Boom/,
+                "arg errors errors propagate");
+  assert.throws(() => isEvery(x => true, broken),
+                /Boom/,
+                "sequence errors propagate");
+
+  assert.equal(isEvery(x => false, broken), false,
+              "hasn't reached error");
+};
+
+exports["test some"] = assert => {
+  let isOdd = x => x % 2;
+  let isTrue = x => x === true;
+  let isFalse = x => x === false;
+
+  assert.equal(some(isOdd, seq(function*() {
+    yield 2;
+    yield 4;
+    yield 6;
+  })), null, "all are even");
+
+  assert.equal(some(isOdd, seq(function*() {
+    yield 2;
+    yield 3;
+    yield 4;
+  })), true, "contains odd");
+
+  assert.equal(some(isTrue, seq(function*() {})), null,
+               "null if empty")
+  assert.equal(some(isFalse, seq(function*() {})), null,
+               "null if empty")
+
+  assert.equal(some(isTrue, null), null, "null for null");
+  assert.equal(some(isTrue, undefined), null, "null for undefined");
+
+  assert.throws(() => some(boom, [1, 2]),
+                /Boom/,
+                "arg errors errors propagate");
+  assert.throws(() => some(x => false, broken),
+                /Boom/,
+                "sequence errors propagate");
+
+  assert.equal(some(x => true, broken), true,
+              "hasn't reached error");
+};
+
+exports["test take"] = assert => {
+  let xs = seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+    yield 4;
+    yield 5;
+    yield 6;
+  });
+
+  assert.deepEqual([...take(3, xs)], [1, 2, 3], "took 3 items");
+  assert.deepEqual([...take(3, [1, 2, 3, 4, 5])], [1, 2, 3],
+                   "took 3 from array");
+
+  let ys = seq(function*() { yield 1; yield 2; });
+  assert.deepEqual([...take(3, ys)], [1, 2], "takes at max n");
+  assert.deepEqual([...take(3, [1, 2])], [1, 2],
+                   "takes at max n from arary");
+
+  let empty = seq(function*() {});
+  assert.deepEqual([...take(5, empty)], [], "nothing to take");
+
+  assert.throws(() => [...take(3, broken)],
+                /Boom/,
+                "sequence errors propagate");
+
+  assert.deepEqual([...take(1, broken)], [1],
+                   "hasn't reached error");
+};
+
+exports["test iterate"] = assert => {
+  let inc = x => x + 1;
+  let nums = iterate(inc, 0);
+
+  assert.deepEqual([...take(5, nums)], [0, 1, 2, 3, 4], "took 5");
+  assert.deepEqual([...take(10, nums)], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "took 10");
+
+  let xs = iterate(x => x * 3, 2);
+  assert.deepEqual([...take(4, xs)], [2, 6, 18, 54], "took 4");
+
+  assert.throws(() => [...iterate(boom, 0)],
+                /Boom/,
+                "function exceptions propagate");
+};
+
+exports["test takeWhile"] = assert => {
+  let isNegative = x => x < 0;
+  let xs = seq(function*() {
+    yield -2;
+    yield -1;
+    yield 0;
+    yield 1;
+    yield 2;
+    yield 3;
+  });
+
+  assert.deepEqual([...takeWhile(isNegative, xs)], [-2, -1],
+                   "took until 0");
+
+  let ys = seq(function*() {});
+  assert.deepEqual([...takeWhile(isNegative, ys)], [],
+                   "took none");
+
+  let zs = seq(function*() {
+    yield 0;
+    yield 1;
+    yield 2;
+    yield 3;
+  });
+
+  assert.deepEqual([...takeWhile(isNegative, zs)], [],
+                   "took none");
+
+  assert.throws(() => [...takeWhile(boom, zs)],
+                /Boom/,
+                "function errors errors propagate");
+  assert.throws(() => [...takeWhile(x => true, broken)],
+                /Boom/,
+                "sequence errors propagate");
+
+  assert.deepEqual([...takeWhile(x => false, broken)],
+                   [],
+                   "hasn't reached error");
+};
+
+exports["test drop"] = assert => {
+  let testDrop = xs => {
+    assert.deepEqual([...drop(2, xs)],
+                     [3, 4],
+                     "dropped two elements");
+
+    assert.deepEqual([...drop(1, xs)],
+                     [2, 3, 4],
+                     "dropped one");
+
+    assert.deepEqual([...drop(0, xs)],
+                     [1, 2, 3, 4],
+                     "dropped 0");
+
+    assert.deepEqual([...drop(-2, xs)],
+                     [1, 2, 3, 4],
+                     "dropped 0 on negative `n`");
+
+    assert.deepEqual([...drop(5, xs)],
+                     [],
+                     "dropped all items");
+  };
+
+  testDrop([1, 2, 3, 4]);
+  testDrop(seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+    yield 4;
+  }));
+
+  assert.throws(() => [...drop(1, broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+
+exports["test dropWhile"] = assert => {
+  let isNegative = x => x < 0;
+  let True = _ => true;
+  let False = _ => false;
+
+  let test = xs => {
+    assert.deepEqual([...dropWhile(isNegative, xs)],
+                     [0, 1, 2],
+                     "dropped negative");
+
+    assert.deepEqual([...dropWhile(True, xs)],
+                     [],
+                     "drop all");
+
+    assert.deepEqual([...dropWhile(False, xs)],
+                     [-2, -1, 0, 1, 2],
+                     "keep all");
+  };
+
+  test([-2, -1, 0, 1, 2]);
+  test(seq(function*() {
+    yield -2;
+    yield -1;
+    yield 0;
+    yield 1;
+    yield 2;
+  }));
+
+  assert.throws(() => [...dropWhile(boom, [1, 2, 3])],
+                /Boom/,
+                "function errors errors propagate");
+  assert.throws(() => [...dropWhile(x => true, broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+
+exports["test concat"] = assert => {
+  let test = (a, b, c, d) => {
+    assert.deepEqual([...concat()],
+                     [],
+                     "nothing to concat");
+    assert.deepEqual([...concat(a)],
+                     [1, 2, 3],
+                     "concat with nothing returns same as first");
+    assert.deepEqual([...concat(a, b)],
+                     [1, 2, 3, 4, 5],
+                     "concat items from both");
+    assert.deepEqual([...concat(a, b, a)],
+                     [1, 2, 3, 4, 5, 1, 2, 3],
+                     "concat itself");
+    assert.deepEqual([...concat(c)],
+                     [],
+                     "concat of empty is empty");
+    assert.deepEqual([...concat(a, c)],
+                     [1, 2, 3],
+                     "concat with empty");
+    assert.deepEqual([...concat(c, c, c)],
+                     [],
+                     "concat of empties is empty");
+    assert.deepEqual([...concat(c, b)],
+                     [4, 5],
+                     "empty can be in front");
+    assert.deepEqual([...concat(d)],
+                     [7],
+                     "concat singular");
+    assert.deepEqual([...concat(d, d)],
+                     [7, 7],
+                     "concat singulars");
+
+    assert.deepEqual([...concat(a, a, b, c, d, c, d, d)],
+                     [1, 2, 3, 1, 2, 3, 4, 5, 7, 7, 7],
+                     "many concats");
+
+    let ab = concat(a, b);
+    let abcd = concat(ab, concat(c, d));
+    let cdabcd = concat(c, d, abcd);
+
+    assert.deepEqual([...cdabcd],
+                     [7, 1, 2, 3, 4, 5, 7],
+                     "nested concats");
+  };
+
+  test([1, 2, 3],
+       [4, 5],
+       [],
+       [7]);
+
+  test(seq(function*() { yield 1; yield 2; yield 3; }),
+       seq(function*() { yield 4; yield 5; }),
+       seq(function*() { }),
+       seq(function*() { yield 7; }));
+
+  assert.throws(() => [...concat(broken, [1, 2, 3])],
+                /Boom/,
+                "function errors errors propagate");
+};
+
+
+exports["test first"] = assert => {
+  let test = (xs, empty) => {
+    assert.equal(first(xs), 1, "returns first");
+    assert.equal(first(empty), null, "returns null empty");
+  };
+
+  test("1234", "");
+  test([1, 2, 3], []);
+  test([1, 2, 3], null);
+  test([1, 2, 3], undefined);
+  test(seq(function*() { yield 1; yield 2; yield 3; }),
+       seq(function*() { }));
+  assert.equal(first(broken), 1, "did not reached error");
+};
+
+exports["test rest"] = assert => {
+  let test = (xs, x, nil) => {
+    assert.deepEqual([...rest(xs)], ["b", "c"],
+                     "rest items");
+    assert.deepEqual([...rest(x)], [],
+                     "empty when singular");
+    assert.deepEqual([...rest(nil)], [],
+                     "empty when empty");
+  };
+
+  test("abc", "a", "");
+  test(["a", "b", "c"], ["d"], []);
+  test(seq(function*() { yield "a"; yield "b"; yield "c"; }),
+       seq(function*() { yield "d"; }),
+       seq(function*() {}));
+  test(["a", "b", "c"], ["d"], null);
+  test(["a", "b", "c"], ["d"], undefined);
+
+  assert.throws(() => [...rest(broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+
+exports["test nth"] = assert => {
+  let notFound = {};
+  let test = xs => {
+    assert.equal(nth(xs, 0), "h", "first");
+    assert.equal(nth(xs, 1), "e", "second");
+    assert.equal(nth(xs, 5), void(0), "out of bound");
+    assert.equal(nth(xs, 5, notFound), notFound, "out of bound");
+    assert.equal(nth(xs, -1), void(0), "out of bound");
+    assert.equal(nth(xs, -1, notFound), notFound, "out of bound");
+    assert.equal(nth(xs, 4), "o", "5th");
+  };
+
+  let testEmpty = xs => {
+    assert.equal(nth(xs, 0), void(0), "no first in empty");
+    assert.equal(nth(xs, 5), void(0), "no 5th in empty");
+    assert.equal(nth(xs, 0, notFound), notFound, "notFound on out of bound");
+  };
+
+  test("hello");
+  test(["h", "e", "l", "l", "o"]);
+  test(seq(function*() {
+    yield "h";
+    yield "e";
+    yield "l";
+    yield "l";
+    yield "o";
+  }));
+  testEmpty(null);
+  testEmpty(undefined);
+  testEmpty([]);
+  testEmpty("");
+  testEmpty(seq(function*() {}));
+
+
+  assert.throws(() => nth(broken, 1),
+                /Boom/,
+                "sequence errors propagate");
+  assert.equal(nth(broken, 0), 1, "have not reached error");
+};
+
+
+exports["test last"] = assert => {
+  assert.equal(last(null), null, "no last in null");
+  assert.equal(last(void(0)), null, "no last in undefined");
+  assert.equal(last([]), null, "no last in []");
+  assert.equal(last(""), null, "no last in ''");
+  assert.equal(last(seq(function*() { })), null, "no last in empty");
+
+  assert.equal(last("hello"), "o", "last from string");
+  assert.equal(last([1, 2, 3]), 3, "last from array");
+  assert.equal(last([1]), 1, "last from singular");
+  assert.equal(last(seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+  })), 3, "last from sequence");
+
+  assert.throws(() => last(broken),
+                /Boom/,
+                "sequence errors propagate");
+};
+
+
+exports["test dropLast"] = assert => {
+  let test = xs => {
+    assert.deepEqual([...dropLast(xs)],
+                     [1, 2, 3, 4],
+                     "dropped last");
+    assert.deepEqual([...dropLast(0, xs)],
+                     [1, 2, 3, 4, 5],
+                     "dropped none on 0");
+    assert.deepEqual([...dropLast(-3, xs)],
+                     [1, 2, 3, 4, 5],
+                     "drop none on negative");
+    assert.deepEqual([...dropLast(3, xs)],
+                     [1, 2],
+                     "dropped given number");
+    assert.deepEqual([...dropLast(5, xs)],
+                     [],
+                     "dropped all");
+  };
+
+  let testEmpty = xs => {
+    assert.deepEqual([...dropLast(xs)],
+                     [],
+                     "nothing to drop");
+    assert.deepEqual([...dropLast(0, xs)],
+                     [],
+                     "dropped none on 0");
+    assert.deepEqual([...dropLast(-3, xs)],
+                     [],
+                     "drop none on negative");
+    assert.deepEqual([...dropLast(3, xs)],
+                     [],
+                     "nothing to drop");
+  };
+
+  test([1, 2, 3, 4, 5]);
+  test(seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+    yield 4;
+    yield 5;
+  }));
+  testEmpty([]);
+  testEmpty("");
+  testEmpty(seq(function*() {}));
+
+  assert.throws(() => [...dropLast(broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+
+exports["test distinct"] = assert => {
+  let test = (xs, message) => {
+    assert.deepEqual([...distinct(xs)],
+                     [1, 2, 3, 4, 5],
+                     message);
+  };
+
+  test([1, 2, 1, 3, 1, 4, 1, 5], "works with arrays");
+  test(seq(function*() {
+    yield 1;
+    yield 2;
+    yield 1;
+    yield 3;
+    yield 1;
+    yield 4;
+    yield 1;
+    yield 5;
+  }), "works with sequences");
+  test(new Set([1, 2, 1, 3, 1, 4, 1, 5]),
+       "works with sets");
+  test(seq(function*() {
+    yield 1;
+    yield 2;
+    yield 2;
+    yield 2;
+    yield 1;
+    yield 3;
+    yield 1;
+    yield 4;
+    yield 4;
+    yield 4;
+    yield 1;
+    yield 5;
+  }), "works with multiple repeatitions");
+  test([1, 2, 3, 4, 5], "work with distinct arrays");
+  test(seq(function*() {
+    yield 1;
+    yield 2;
+    yield 3;
+    yield 4;
+    yield 5;
+  }), "works with distinct seqs");
+};
+
+
+exports["test remove"] = assert => {
+  let isPositive = x => x > 0;
+  let test = xs => {
+    assert.deepEqual([...remove(isPositive, xs)],
+                     [-2, -1, 0],
+                     "removed positives");
+  };
+
+  test([1, -2, 2, -1, 3, 7, 0]);
+  test(seq(function*() {
+    yield 1;
+    yield -2;
+    yield 2;
+    yield -1;
+    yield 3;
+    yield 7;
+    yield 0;
+  }));
+
+  assert.throws(() => [...distinct(broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+
+exports["test mapcat"] = assert => {
+  let upto = n => seq(function* () {
+    let index = 0;
+    while (index < n) {
+      yield index;
+      index = index + 1;
+    }
+  });
+
+  assert.deepEqual([...mapcat(upto, [1, 2, 3, 4])],
+                   [0, 0, 1, 0, 1, 2, 0, 1, 2, 3],
+                   "expands given sequence");
+
+  assert.deepEqual([...mapcat(upto, [0, 1, 2, 0])],
+                   [0, 0, 1],
+                   "expands given sequence");
+
+  assert.deepEqual([...mapcat(upto, [0, 0, 0])],
+                   [],
+                   "expands given sequence");
+
+  assert.deepEqual([...mapcat(upto, [])],
+                   [],
+                   "nothing to expand");
+
+  assert.deepEqual([...mapcat(upto, null)],
+                   [],
+                   "nothing to expand");
+
+  assert.deepEqual([...mapcat(upto, void(0))],
+                   [],
+                   "nothing to expand");
+
+  let xs = seq(function*() {
+    yield 0;
+    yield 1;
+    yield 0;
+    yield 2;
+    yield 0;
+  });
+
+  assert.deepEqual([...mapcat(upto, xs)],
+                   [0, 0, 1],
+                   "expands given sequence");
+
+  assert.throws(() => [...mapcat(boom, xs)],
+                /Boom/,
+                "function errors errors propagate");
+  assert.throws(() => [...mapcat(upto, broken)],
+                /Boom/,
+                "sequence errors propagate");
+};
+
+require("sdk/test").run(exports);
diff --git a/addon-sdk/source/test/test-tab.js b/addon-sdk/source/test/test-tab.js
index 0632c270793a..f20b09c70ab9 100644
--- a/addon-sdk/source/test/test-tab.js
+++ b/addon-sdk/source/test/test-tab.js
@@ -9,6 +9,7 @@ const { getTabForWindow } = require('sdk/tabs/helpers');
 const app = require("sdk/system/xul-app");
 const { viewFor } = require("sdk/view/core");
 const { getTabId } = require("sdk/tabs/utils");
+const { defer } = require("sdk/lang/functional");
 
 // The primary test tab
 var primaryTab;
@@ -139,14 +140,16 @@ exports["test behavior on close"] = function(assert, done) {
 };
 
 exports["test viewFor(tab)"] = (assert, done) => {
-  tabs.once("open", tab => {
+  // Note we defer handlers as length collection is updated after
+  // handler is invoked, so if test is finished before counnts are
+  // updated wrong length will show up in followup tests.
+  tabs.once("open", defer(tab => {
     const view = viewFor(tab);
     assert.ok(view, "view is returned");
     assert.equal(getTabId(view), tab.id, "tab has a same id");
 
-    tab.close();
-    done();
-  });
+    tab.close(defer(done));
+  }));
 
   tabs.open({ url: "about:mozilla" });
 }
diff --git a/addon-sdk/source/test/test-windows-common.js b/addon-sdk/source/test/test-windows-common.js
index 0cc1f7d66c36..a461b903192f 100644
--- a/addon-sdk/source/test/test-windows-common.js
+++ b/addon-sdk/source/test/test-windows-common.js
@@ -8,6 +8,8 @@ const { browserWindows } = require('sdk/windows');
 const { viewFor } = require('sdk/view/core');
 const { Ci } = require("chrome");
 const { isBrowser, getWindowTitle } = require("sdk/window/utils");
+const { defer } = require("sdk/lang/functional");
+
 
 // TEST: browserWindows Iterator
 exports.testBrowserWindowsIterator = function(assert) {
@@ -30,6 +32,7 @@ exports.testBrowserWindowsIterator = function(assert) {
   }
 };
 
+
 exports.testWindowTabsObject_alt = function(assert, done) {
   let window = browserWindows.activeWindow;
   window.tabs.open({
@@ -58,6 +61,7 @@ exports.testWindowActivateMethod_simple = function(assert) {
                'Active tab is active after window.activate() call');
 };
 
+
 exports["test getView(window)"] = function(assert, done) {
   browserWindows.once("open", window => {
     const view = viewFor(window);
@@ -68,9 +72,11 @@ exports["test getView(window)"] = function(assert, done) {
                  "window has a right title");
 
     window.close();
-    window.destroy();
-    assert.equal(viewFor(window), null, "window view is gone");
-    done();
+    // Defer handler cause window is destroyed after event is dispatched.
+    browserWindows.once("close", defer(_ => {
+      assert.equal(viewFor(window), null, "window view is gone");
+      done();
+    }));
   });
 
 

From bdc10edc8a2d48bba8a2ff011974309a4158bba4 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 19 Dec 2013 17:33:34 -0800
Subject: [PATCH 78/78] Bug 631842 (part 2b) - Fix a mis-handling of
 platform-specific suppression files in |mach valgrind-test|.  r=me.

--HG--
extra : rebase_source : 7a8a33d9db10ed47cf273358d99b6da874b48137
---
 build/valgrind/mach_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/valgrind/mach_commands.py b/build/valgrind/mach_commands.py
index 1f0cd026729a..75bfef4f6da1 100644
--- a/build/valgrind/mach_commands.py
+++ b/build/valgrind/mach_commands.py
@@ -56,7 +56,7 @@ class MachCommands(MachCommandBase):
         machtype = subprocess.check_output(['bash', '-c', 'echo $MACHTYPE']).rstrip()
         arch_specific_supps_file = os.path.join(supps_dir, machtype + '.sup')
         if os.path.isfile(arch_specific_supps_file):
-            debugger_args += ' --suppressions=' + os.path.join(supps_dir, arch_specific_supps_file)
+            debugger_args.append('--suppressions=' + os.path.join(supps_dir, arch_specific_supps_file))
             print('Using platform-specific suppression file: ',
                   arch_specific_supps_file + '\n')
         else: