From ddc1a655e6ba8914f560ae6b8d4d93419baddfe3 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Thu, 30 May 2013 11:40:14 -0700
Subject: [PATCH 01/85] Bug 876776 - Import latest version of
 js/examples/jorendb.js. r=NPOTB (yet)

---
 js/examples/jorendb.js | 820 ++++++++++++++++++++++++-----------------
 1 file changed, 473 insertions(+), 347 deletions(-)

diff --git a/js/examples/jorendb.js b/js/examples/jorendb.js
index d83589f08fc..54fc782596f 100644
--- a/js/examples/jorendb.js
+++ b/js/examples/jorendb.js
@@ -5,12 +5,13 @@
  *
  * 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/. */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 
 /*
- * jorendb is a simple command-line debugger for shell-js programs.  It is
- * intended as a demo of the Debugger object (as there are no shell js programs to
- * speak of).
+ * jorendb is a simple command-line debugger for shell-js programs. It is
+ * intended as a demo of the Debugger object (as there are no shell js programs
+ * to speak of).
  *
  * To run it: $JS -d path/to/this/file/jorendb.js
  * To run some JS code under it, try:
@@ -18,367 +19,492 @@
  * Execution will stop at debugger statements and you'll get a jorendb prompt.
  */
 
-(function () {
-    var debuggerSource = "(" + function () {
-        // Debugger state.
-        var focusedFrame = null;
-        var topFrame = null;
-        var debuggeeValues = [null];
-        var lastExc = null;
+// Debugger state.
+var focusedFrame = null;
+var topFrame = null;
+var debuggeeValues = {};
+var nextDebuggeeValueIndex = 1;
+var lastExc = null;
 
-        // Convert a debuggee value v to a string.
-        function dvToString(v) {
-            return (typeof v !== 'object' || v === null) ? uneval(v) : "[object " + v.class + "]";
+// Cleanup functions to run when we next re-enter the repl.
+var replCleanups = [];
+
+// Convert a debuggee value v to a string.
+function dvToString(v) {
+    return (typeof v !== 'object' || v === null) ? uneval(v) : "[object " + v.class + "]";
+}
+
+function showDebuggeeValue(dv) {
+    var dvrepr = dvToString(dv);
+    var i = nextDebuggeeValueIndex++;
+    debuggeeValues["$" + i] = dv;
+    print("$" + i + " = " + dvrepr);
+}
+
+Object.defineProperty(Debugger.Frame.prototype, "num", {
+    configurable: true,
+    enumerable: false,
+    get: function () {
+            var i = 0;
+            for (var f = topFrame; f && f !== this; f = f.older)
+                i++;
+            return f === null ? undefined : i;
         }
+    });
 
-        function showDebuggeeValue(dv) {
-            var dvrepr = dvToString(dv);
-            var i = debuggeeValues.length;
-            debuggeeValues[i] = dv;
-            print("$" + i + " = " + dvrepr);
-        }
+Debugger.Frame.prototype.frameDescription = function frameDescription() {
+    if (this.type == "call")
+        return ((this.callee.name || '<anonymous>') +
+                "(" + this.arguments.map(dvToString).join(", ") + ")");
+    else
+        return this.type + " code";
+}
 
-        Object.defineProperty(Debugger.Frame.prototype, "num", {
-            configurable: true,
-            enumerable: false,
-            get: function () {
-                    var i = 0;
-                    for (var f = topFrame; f && f !== this; f = f.older)
-                        i++;
-                    return f === null ? undefined : i;
-                }
-            });
+Debugger.Frame.prototype.positionDescription = function positionDescription() {
+    if (this.script) {
+        var line = this.script.getOffsetLine(this.offset);
+        if (this.script.url)
+            return this.script.url + ":" + line;
+        return "line " + line;
+    }
+    return null;
+}
 
-        function framePosition(f) {
-            if (!f.script)
-                return f.type + " code";
-            return (f.script.url || f.type + " code") + ":" + f.script.getOffsetLine(f.offset);
-        }
+Debugger.Frame.prototype.fullDescription = function fullDescription() {
+    var fr = this.frameDescription();
+    var pos = this.positionDescription();
+    if (pos)
+        return fr + ", " + pos;
+    return fr;
+}
 
-        function callDescription(f) {
-            return ((f.callee.name || '<anonymous>') + 
-                    "(" + f.arguments.map(dvToString).join(", ") + ")");
-        }
-
-        function showFrame(f, n) {
-            if (f === undefined || f === null) {
-                f = focusedFrame;
-                if (f === null) {
-                    print("No stack.");
-                    return;
-                }
-            }
-            if (n === undefined) {
-                n = f.num;
-                if (n === undefined)
-                    throw new Error("Internal error: frame not on stack");
-            }
-
-            var me = '#' + n;
-            if (f.type === "call")
-                me += ' ' + callDescription(f);
-            me += ' ' + framePosition(f);
-            print(me);
-        }
-
-        function saveExcursion(fn) {
-            var tf = topFrame, ff = focusedFrame;
-            try {
-                return fn();
-            } finally {
-                topFrame = tf;
-                focusedFrame = ff;
-            }
-        }
-
-        function quitCommand() {
-            dbg.enabled = false;
-            quit(0);
-        }
-
-        function backtraceCommand() {
-            if (topFrame === null)
-                print("No stack.");
-            for (var i = 0, f = topFrame; f; i++, f = f.older)
-                showFrame(f, i);
-        }
-
-        function printCommand(rest) {
-            if (focusedFrame === null) {
-                // This is super bogus, need a way to create an env wrapping the debuggeeGlobal
-                // and eval against that.
-                var nonwrappedValue;
-                try {
-                    nonwrappedValue = debuggeeGlobal.eval(rest);
-                } catch (exc) {
-                    print("Exception caught.");
-                    nonwrappedValue = exc;
-                }
-                if (typeof nonwrappedValue !== "object" || nonwrappedValue === null) {
-                    // primitive value, no sweat
-                    print("    " + uneval(nonwrappedValue));
-                } else {
-                    // junk for now
-                    print("    " + Object.prototype.toString.call(nonwrappedValue));
-                }
-            } else {
-                // This is the real deal.
-                var cv = saveExcursion(function () {
-                        return focusedFrame.eval(rest);
-                    });
-                if (cv === null) {
-                    if (!dbg.enabled)
-                        return [cv];
-                    print("Debuggee died.");
-                } else if ('return' in cv) {
-                    if (!dbg.enabled)
-                        return [undefined];
-                    showDebuggeeValue(cv.return);
-                } else {
-                    if (!dbg.enabled)
-                        return [cv];
-                    print("Exception caught. (To rethrow it, type 'throw'.)");
-                    lastExc = cv.throw;
-                    showDebuggeeValue(lastExc);
-                }
-            }
-        }
-
-        function detachCommand() {
-            dbg.enabled = false;
-            return [undefined];
-        }
-
-        function continueCommand() {
-            if (focusedFrame === null) {
-                print("No stack.");
-                return;
-            }
-            return [undefined];
-        }
-
-        function throwCommand(rest) {
-            var v;
-            if (focusedFrame !== topFrame) {
-                print("To throw, you must select the newest frame (use 'frame 0').");
-                return;
-            } else if (focusedFrame === null) {
-                print("No stack.");
-                return;
-            } else if (rest === '') {
-                return [{throw: lastExc}];
-            } else {
-                var cv = saveExcursion(function () { return focusedFrame.eval(rest); });
-                if (cv === null) {
-                    if (!dbg.enabled)
-                        return [cv];
-                    print("Debuggee died while determining what to throw. Stopped.");
-                } else if ('return' in cv) {
-                    return [{throw: cv.return}];
-                } else {
-                    if (!dbg.enabled)
-                        return [cv];
-                    print("Exception determining what to throw. Stopped.");
-                    showDebuggeeValue(cv.throw);
-                }
-                return;
-            }
-        }
-
-        function frameCommand(rest) {
-            var n, f;
-            if (rest.match(/[0-9]+/)) {
-                n = +rest;
-                f = topFrame;
-                if (f === null) {
-                    print("No stack.");
-                    return;
-                }
-                for (var i = 0; i < n && f; i++) {
-                    if (!f.older) {
-                        print("There is no frame " + rest + ".");
-                        return;
-                    }
-                    f.older.younger = f;
-                    f = f.older;
-                }
-                focusedFrame = f;
-                showFrame(f, n);
-            } else if (rest !== '') {
-                if (topFrame === null)
-                    print("No stack.");
-                else
-                    showFrame();
-            } else {
-                print("do what now?");
-            }
-        }
-
-        function debugmeCommand() {
-            var meta = newGlobal("new-compartment");
-            meta.debuggeeGlobal = this;
-            meta.debuggerSource = debuggerSource;
-            meta.prompt = prompt.replace('(', '(meta-');
-            meta.eval(debuggerSource);
-        }
-
-        function upCommand() {
-            if (focusedFrame === null)
-                print("No stack.");
-            else if (focusedFrame.older === null)
-                print("Initial frame selected; you cannot go up.");
-            else {
-                focusedFrame.older.younger = focusedFrame;
-                focusedFrame = focusedFrame.older;
-                showFrame();
-            }
-        }
-
-        function downCommand() {
-            if (focusedFrame === null)
-                print("No stack.");
-            else if (!focusedFrame.younger)
-                print("Youngest frame selected; you cannot go down.");
-            else {
-                focusedFrame = focusedFrame.younger;
-                showFrame();
-            }
-        }
-
-        function forcereturnCommand(rest) {
-            var v;
-            var f = focusedFrame;
-            if (f !== topFrame) {
-                print("To forcereturn, you must select the newest frame (use 'frame 0').");
-            } else if (f === null) {
-                print("Nothing on the stack.");
-            } else if (rest === '') {
-                return [{return: undefined}];
-            } else {
-                var cv = saveExcursion(function () { return f.eval(rest); });
-                if (cv === null) {
-                    if (!dbg.enabled)
-                        return [cv];
-                    print("Debuggee died while determining what to forcereturn. Stopped.");
-                } else if ('return' in cv) {
-                    return [{return: cv.return}];
-                } else {
-                    if (!dbg.enabled)
-                        return [cv];
-                    print("Error determining what to forcereturn. Stopped.");
-                    showDebuggeeValue(cv.throw);
-                }
-            }
-        }
-
-        // Build the table of commands.
-        var commands = {};
-        var commandArray = [
-            backtraceCommand, "bt", "where",
-            continueCommand, "c",
-            detachCommand,
-            debugmeCommand,
-            downCommand, "d",
-            forcereturnCommand,
-            frameCommand, "f",
-            printCommand, "p",
-            quitCommand, "q",
-            throwCommand, "t",
-            upCommand, "u"
-            ];
-        var last = null;
-        for (var i = 0; i < commandArray.length; i++) {
-            var cmd = commandArray[i];
-            if (typeof cmd === "string")
-                commands[cmd] = last;
+Object.defineProperty(Debugger.Frame.prototype, "line", {
+        configurable: true,
+        enumerable: false,
+        get: function() {
+            if (this.script)
+                return this.script.getOffsetLine(this.offset);
             else
-                last = commands[cmd.name.replace(/Command$/, '')] = cmd;
+                return null;
         }
+    });
 
-        // Break cmd into two parts: its first word and everything else.
-        function breakcmd(cmd) {
-            cmd = cmd.trimLeft();
-            var m = /\s/.exec(cmd);
-            if (m === null)
-                return [cmd, ''];
-            return [cmd.slice(0, m.index), cmd.slice(m.index).trimLeft()];
+function callDescription(f) {
+    return ((f.callee.name || '<anonymous>') +
+            "(" + f.arguments.map(dvToString).join(", ") + ")");
+}
+
+function showFrame(f, n) {
+    if (f === undefined || f === null) {
+        f = focusedFrame;
+        if (f === null) {
+            print("No stack.");
+            return;
         }
+    }
+    if (n === undefined) {
+        n = f.num;
+        if (n === undefined)
+            throw new Error("Internal error: frame not on stack");
+    }
 
-        function runcmd(cmd) {
-            var pieces = breakcmd(cmd);
-            if (pieces[0] === "")
-                return undefined;
+    print('#' + n + " " + f.fullDescription());
+}
 
-            var first = pieces[0], rest = pieces[1];
-            if (!commands.hasOwnProperty(first)) {
-                print("unrecognized command '" + first + "'");
-                return undefined;
+function saveExcursion(fn) {
+    var tf = topFrame, ff = focusedFrame;
+    try {
+        return fn();
+    } finally {
+        topFrame = tf;
+        focusedFrame = ff;
+    }
+}
+
+// Evaluate an expression in the Debugger global
+function evalCommand(expr) {
+    eval(expr);
+}
+
+function quitCommand() {
+    dbg.enabled = false;
+    quit(0);
+}
+
+function backtraceCommand() {
+    if (topFrame === null)
+        print("No stack.");
+    for (var i = 0, f = topFrame; f; i++, f = f.older)
+        showFrame(f, i);
+}
+
+function printCommand(rest) {
+    // This is the real deal.
+    var cv = saveExcursion(
+        () => focusedFrame == null
+              ? debuggeeGlobalWrapper.evalInGlobalWithBindings(rest, debuggeeValues)
+              : focusedFrame.evalWithBindings(rest, debuggeeValues));
+    if (cv === null) {
+        if (!dbg.enabled)
+            return [cv];
+        print("Debuggee died.");
+    } else if ('return' in cv) {
+        if (!dbg.enabled)
+            return [undefined];
+        showDebuggeeValue(cv.return);
+    } else {
+        if (!dbg.enabled)
+            return [cv];
+        print("Exception caught. (To rethrow it, type 'throw'.)");
+        lastExc = cv.throw;
+        showDebuggeeValue(lastExc);
+    }
+}
+
+function detachCommand() {
+    dbg.enabled = false;
+    return [undefined];
+}
+
+function continueCommand() {
+    if (focusedFrame === null) {
+        print("No stack.");
+        return;
+    }
+    return [undefined];
+}
+
+function throwCommand(rest) {
+    var v;
+    if (focusedFrame !== topFrame) {
+        print("To throw, you must select the newest frame (use 'frame 0').");
+        return;
+    } else if (focusedFrame === null) {
+        print("No stack.");
+        return;
+    } else if (rest === '') {
+        return [{throw: lastExc}];
+    } else {
+        var cv = saveExcursion(function () { return focusedFrame.eval(rest); });
+        if (cv === null) {
+            if (!dbg.enabled)
+                return [cv];
+            print("Debuggee died while determining what to throw. Stopped.");
+        } else if ('return' in cv) {
+            return [{throw: cv.return}];
+        } else {
+            if (!dbg.enabled)
+                return [cv];
+            print("Exception determining what to throw. Stopped.");
+            showDebuggeeValue(cv.throw);
+        }
+        return;
+    }
+}
+
+function frameCommand(rest) {
+    var n, f;
+    if (rest.match(/[0-9]+/)) {
+        n = +rest;
+        f = topFrame;
+        if (f === null) {
+            print("No stack.");
+            return;
+        }
+        for (var i = 0; i < n && f; i++) {
+            if (!f.older) {
+                print("There is no frame " + rest + ".");
+                return;
             }
+            f.older.younger = f;
+            f = f.older;
+        }
+        focusedFrame = f;
+        showFrame(f, n);
+    } else if (rest !== '') {
+        if (topFrame === null)
+            print("No stack.");
+        else
+            showFrame();
+    } else {
+        print("do what now?");
+    }
+}
 
-            var cmd = commands[first];
-            if (cmd.length === 0 && rest !== '') {
-                print("this command cannot take an argument");
-                return undefined;
-            }
+function upCommand() {
+    if (focusedFrame === null)
+        print("No stack.");
+    else if (focusedFrame.older === null)
+        print("Initial frame selected; you cannot go up.");
+    else {
+        focusedFrame.older.younger = focusedFrame;
+        focusedFrame = focusedFrame.older;
+        showFrame();
+    }
+}
 
-            return cmd(rest);
+function downCommand() {
+    if (focusedFrame === null)
+        print("No stack.");
+    else if (!focusedFrame.younger)
+        print("Youngest frame selected; you cannot go down.");
+    else {
+        focusedFrame = focusedFrame.younger;
+        showFrame();
+    }
+}
+
+function forcereturnCommand(rest) {
+    var v;
+    var f = focusedFrame;
+    if (f !== topFrame) {
+        print("To forcereturn, you must select the newest frame (use 'frame 0').");
+    } else if (f === null) {
+        print("Nothing on the stack.");
+    } else if (rest === '') {
+        return [{return: undefined}];
+    } else {
+        var cv = saveExcursion(function () { return f.eval(rest); });
+        if (cv === null) {
+            if (!dbg.enabled)
+                return [cv];
+            print("Debuggee died while determining what to forcereturn. Stopped.");
+        } else if ('return' in cv) {
+            return [{return: cv.return}];
+        } else {
+            if (!dbg.enabled)
+                return [cv];
+            print("Error determining what to forcereturn. Stopped.");
+            showDebuggeeValue(cv.throw);
+        }
+    }
+}
+
+function printPop(f, c) {
+    var fdesc = f.fullDescription();
+    if (c.return) {
+        print("frame returning (still selected): " + fdesc);
+        showDebuggeeValue(c.return);
+    } else if (c.throw) {
+        print("frame threw exception: " + fdesc);
+        showDebuggeeValue(c.throw);
+        print("(To rethrow it, type 'throw'.)");
+        lastExc = c.throw;
+    } else {
+        print("frame was terminated: " + fdesc);
+    }
+}
+
+// Set |prop| on |obj| to |value|, but then restore its current value
+// when we next enter the repl.
+function setUntilRepl(obj, prop, value) {
+    var saved = obj[prop];
+    obj[prop] = value;
+    replCleanups.push(function () { obj[prop] = saved; });
+}
+
+function doStepOrNext(kind) {
+    var startFrame = topFrame;
+    var startLine = startFrame.line;
+    print("stepping in:   " + startFrame.fullDescription());
+    print("starting line: " + uneval(startLine));
+
+    function stepPopped(completion) {
+        // Note that we're popping this frame; we need to watch for
+        // subsequent step events on its caller.
+        this.reportedPop = true;
+        printPop(this, completion);
+        topFrame = focusedFrame = this;
+        return repl();
+    }
+
+    function stepEntered(newFrame) {
+        print("entered frame: " + newFrame.fullDescription());
+        topFrame = focusedFrame = newFrame;
+        return repl();
+    }
+
+    function stepStepped() {
+        print("stepStepped: " + this.fullDescription());
+        // If we've changed frame or line, then report that.
+        if (this !== startFrame || this.line != startLine) {
+            topFrame = focusedFrame = this;
+            if (focusedFrame != startFrame)
+                print(focusedFrame.fullDescription());
+            return repl();
         }
 
-        function repl() {
-            var cmd;
-            for (;;) {
-                print("\n" + prompt);
-                cmd = readline();
-                if (cmd === null)
-                    break;
+        // Otherwise, let execution continue.
+        return undefined;
+    }
 
-                try {
-                    var result = runcmd(cmd);
-                    if (result === undefined)
-                        ; // do nothing
-                    else if (Array.isArray(result))
-                        return result[0];
-                    else
-                        throw new Error("Internal error: result of runcmd wasn't array or undefined");
-                } catch (exc) {
-                    print("*** Internal error: exception in the debugger code.");
-                    print("    " + exc);
-                    var me = prompt.replace(/^\((.*)\)$/, function (a, b) { return b; });
-                    print("Debug " + me + "? (y/n)");
-                    if (readline().match(/^\s*y/i) !== null)
-                        debugMe();
-                    else
-                        print("ok, ignoring error");
-                }
-            }
+    if (kind.step)
+        setUntilRepl(dbg, 'onEnterFrame', stepEntered);
+
+    // If we're stepping after an onPop, watch for steps and pops in the
+    // next-older frame; this one is done.
+    var stepFrame = startFrame.reportedPop ? startFrame.older : startFrame;
+    if (!stepFrame || !stepFrame.script)
+        stepFrame = null;
+    if (stepFrame) {
+        setUntilRepl(stepFrame, 'onStep', stepStepped);
+        setUntilRepl(stepFrame, 'onPop',  stepPopped);
+    }
+
+    // Let the program continue!
+    return [undefined];
+}
+
+function stepCommand() { return doStepOrNext({step:true}); }
+function nextCommand() { return doStepOrNext({next:true}); }
+
+// Build the table of commands.
+var commands = {};
+var commandArray = [
+    backtraceCommand, "bt", "where",
+    continueCommand, "c",
+    detachCommand,
+    downCommand, "d",
+    forcereturnCommand,
+    frameCommand, "f",
+    nextCommand, "n",
+    printCommand, "p",
+    quitCommand, "q",
+    stepCommand, "s",
+    throwCommand, "t",
+    upCommand, "u",
+    helpCommand, "h",
+    evalCommand, "!",
+    ];
+var last = null;
+for (var i = 0; i < commandArray.length; i++) {
+    var cmd = commandArray[i];
+    if (typeof cmd === "string")
+        commands[cmd] = last;
+    else
+        last = commands[cmd.name.replace(/Command$/, '')] = cmd;
+}
+
+function helpCommand(rest) {
+    print("Available commands:");
+    var printcmd = function(group) {
+        print("  " + group.join(", "));
+    }
+
+    var group = [];
+    for (var cmd of commandArray) {
+        if (typeof cmd === "string") {
+            group.push(cmd);
+        } else {
+            if (group.length) printcmd(group);
+            group = [ cmd.name.replace(/Command$/, '') ];
         }
+    }
+    printcmd(group);
+}
 
-        var dbg = new Debugger(debuggeeGlobal);
-        dbg.onDebuggerStatement = function (frame) {
-            return saveExcursion(function () {
-                    topFrame = focusedFrame = frame;
-                    print("'debugger' statement hit.");
-                    showFrame();
-                    return repl();
-                });
-        };
-        dbg.onThrow = function (frame, exc) {
-            return saveExcursion(function () {
-                    topFrame = focusedFrame = frame;
-                    print("Unwinding due to exception. (Type 'c' to continue unwinding.)");
-                    showFrame();
-                    print("Exception value is:");
-                    showDebuggeeValue(exc);
-                    return repl();
-                });
-        };
-        repl();
-    } + ")();"
+// Break cmd into two parts: its first word and everything else. If it begins
+// with punctuation, treat that as a separate word.
+function breakcmd(cmd) {
+    cmd = cmd.trimLeft();
+    if ("!@#$%^&*_+=/?.,<>:;'\"".indexOf(cmd.substr(0, 1)) != -1)
+        return [cmd.substr(0, 1), cmd.substr(1).trimLeft()];
+    var m = /\s/.exec(cmd);
+    if (m === null)
+        return [cmd, ''];
+    return [cmd.slice(0, m.index), cmd.slice(m.index).trimLeft()];
+}
 
-    print("jorendb version -0.0");
-    var g = newGlobal("new-compartment");
-    g.debuggeeGlobal = this;
-    g.prompt = '(jorendb)';
-    g.debuggerSource = debuggerSource;
-    g.eval(debuggerSource);
-})();
+function runcmd(cmd) {
+    var pieces = breakcmd(cmd);
+    if (pieces[0] === "")
+        return undefined;
+
+    var first = pieces[0], rest = pieces[1];
+    if (!commands.hasOwnProperty(first)) {
+        print("unrecognized command '" + first + "'");
+        return undefined;
+    }
+
+    var cmd = commands[first];
+    if (cmd.length === 0 && rest !== '') {
+        print("this command cannot take an argument");
+        return undefined;
+    }
+
+    return cmd(rest);
+}
+
+function repl() {
+    while (replCleanups.length > 0)
+        replCleanups.pop()();
+
+    var cmd;
+    for (;;) {
+        putstr("\n" + prompt);
+        cmd = readline();
+        if (cmd === null)
+            return null;
+
+        try {
+            var result = runcmd(cmd);
+            if (result === undefined)
+                ; // do nothing
+            else if (Array.isArray(result))
+                return result[0];
+            else
+                throw new Error("Internal error: result of runcmd wasn't array or undefined");
+        } catch (exc) {
+            print("*** Internal error: exception in the debugger code.");
+            print("    " + exc);
+            print(exc.stack);
+        }
+    }
+}
+
+var dbg = new Debugger();
+dbg.onDebuggerStatement = function (frame) {
+    return saveExcursion(function () {
+            topFrame = focusedFrame = frame;
+            print("'debugger' statement hit.");
+            showFrame();
+            return repl();
+        });
+};
+dbg.onThrow = function (frame, exc) {
+    return saveExcursion(function () {
+            topFrame = focusedFrame = frame;
+            print("Unwinding due to exception. (Type 'c' to continue unwinding.)");
+            showFrame();
+            print("Exception value is:");
+            showDebuggeeValue(exc);
+            return repl();
+        });
+};
+
+// The depth of jorendb nesting.
+var jorendbDepth;
+if (typeof jorendbDepth == 'undefined') jorendbDepth = 0;
+
+var debuggeeGlobal = newGlobal("new-compartment");
+debuggeeGlobal.jorendbDepth = jorendbDepth + 1;
+var debuggeeGlobalWrapper = dbg.addDebuggee(debuggeeGlobal);
+
+print("jorendb version -0.0");
+prompt = '(' + Array(jorendbDepth+1).join('meta-') + 'jorendb) ';
+
+var args = arguments;
+while(args.length > 0) {
+    var arg = args.shift();
+    if (arg == '-f') {
+        arg = args.shift();
+        debuggeeGlobal.evaluate(read(arg), { fileName: arg, lineNumber: 1 });
+    } else if (arg == '-e') {
+        arg = args.shift();
+        debuggeeGlobal.eval(arg);
+    } else {
+        throw("jorendb does not implement command-line argument '" + arg + "'");
+    }
+}
+
+repl();

From 64887849258fb6a5443cc867cbcdf426671df503 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Wed, 22 May 2013 09:50:08 -0700
Subject: [PATCH 02/85] Bug 876776 - Allow using '--' to terminate shell
 arguments (and pass the rest to the script), r=terrence

This makes
  ./js -f foo.js -- a b c
the same as
  ./js foo.js a b c
but also allows things like
  ./js -e 'print(arguments)' -- a b c
which previously wasn't possible.
---
 js/src/shell/js.cpp         |  1 +
 js/src/shell/jsoptparse.cpp | 51 +++++++++++++++++++++++++------------
 js/src/shell/jsoptparse.h   |  9 ++++++-
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 95fa579d4a0..4cb813bdcc7 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -5348,6 +5348,7 @@ main(int argc, char **argv, char **envp)
     }
 
     op.setArgTerminatesOptions("script", true);
+    op.setArgCapturesRest("scriptArgs");
 
     switch (op.parseArgs(argc, argv)) {
       case OptionParser::ParseHelp:
diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp
index 1d7b7a676ce..f8c5f30f293 100644
--- a/js/src/shell/jsoptparse.cpp
+++ b/js/src/shell/jsoptparse.cpp
@@ -59,6 +59,14 @@ OptionParser::setArgTerminatesOptions(const char *name, bool enabled)
     findArgument(name)->setTerminatesOptions(enabled);
 }
 
+void
+OptionParser::setArgCapturesRest(const char *name)
+{
+    MOZ_ASSERT(restArgument == -1, "only one argument may be set to capture the rest");
+    restArgument = findArgumentIndex(name);
+    MOZ_ASSERT(restArgument != -1, "unknown argument name passed to setArgCapturesRest");
+}
+
 OptionParser::Result
 OptionParser::error(const char *fmt, ...)
 {
@@ -350,10 +358,17 @@ OptionParser::parseArgs(int inputArgc, char **argv)
             /* Option. */
             Option *opt;
             if (arg[1] == '-') {
-                /* Long option. */
-                opt = findOption(arg + 2);
-                if (!opt)
-                    return error("Invalid long option: %s", arg);
+                if (arg[2] == '\0') {
+                    /* End of options */
+                    optionsAllowed = false;
+                    nextArgument = restArgument;
+                    continue;
+                } else {
+                    /* Long option. */
+                    opt = findOption(arg + 2);
+                    if (!opt)
+                        return error("Invalid long option: %s", arg);
+                }
             } else {
                 /* Short option */
                 if (arg[2] != '\0')
@@ -369,12 +384,8 @@ OptionParser::parseArgs(int inputArgc, char **argv)
             r = handleArg(argc, argv, &i, &optionsAllowed);
         }
 
-        switch (r) {
-          case Okay:
-            break;
-          default:
+        if (r != Okay)
             return r;
-        }
     }
     return Okay;
 }
@@ -498,21 +509,29 @@ OptionParser::findOption(const char *longflag) const
 
 /* Argument accessors */
 
+ssize_t
+OptionParser::findArgumentIndex(const char *name) const
+{
+    for (Option * const *it = arguments.begin(); it != arguments.end(); ++it) {
+        const char *target = (*it)->longflag;
+        if (strcmp(target, name) == 0)
+            return it - arguments.begin();
+    }
+    return -1;
+}
+
 Option *
 OptionParser::findArgument(const char *name)
 {
-    for (Option **it = arguments.begin(), **end = arguments.end(); it != end; ++it) {
-        const char *target = (*it)->longflag;
-        if (strcmp(target, name) == 0)
-            return *it;
-    }
-    return NULL;
+    ssize_t index = findArgumentIndex(name);
+    return (index == -1) ? NULL : arguments[index];
 }
 
 const Option *
 OptionParser::findArgument(const char *name) const
 {
-    return const_cast<OptionParser *>(this)->findArgument(name);
+    ssize_t index = findArgumentIndex(name);
+    return (index == -1) ? NULL : arguments[index];
 }
 
 const char *
diff --git a/js/src/shell/jsoptparse.h b/js/src/shell/jsoptparse.h
index b4bf5ba477a..4a0e06f705f 100644
--- a/js/src/shell/jsoptparse.h
+++ b/js/src/shell/jsoptparse.h
@@ -211,12 +211,17 @@ class OptionParser
     size_t      helpWidth;
     size_t      nextArgument;
 
+    // If '--' is passed, all remaining arguments should be interpreted as the
+    // argument at index 'restArgument'. Defaults to the next unassigned argument.
+    ssize_t     restArgument;
+
     static const char prognameMeta[];
 
     Option *findOption(char shortflag);
     const Option *findOption(char shortflag) const;
     Option *findOption(const char *longflag);
     const Option *findOption(const char *longflag) const;
+    ssize_t findArgumentIndex(const char *name) const;
     Option *findArgument(const char *name);
     const Option *findArgument(const char *name) const;
 
@@ -228,7 +233,8 @@ class OptionParser
   public:
     explicit OptionParser(const char *usage)
       : helpOption('h', "help", "Display help information"),
-        usage(usage), ver(NULL), descr(NULL), descrWidth(80), helpWidth(80), nextArgument(0)
+        usage(usage), ver(NULL), descr(NULL), descrWidth(80), helpWidth(80),
+        nextArgument(0), restArgument(-1)
     {}
 
     ~OptionParser();
@@ -244,6 +250,7 @@ class OptionParser
     void setDescription(const char *description) { descr = description; }
     void setHelpOption(char shortflag, const char *longflag, const char *help);
     void setArgTerminatesOptions(const char *name, bool enabled);
+    void setArgCapturesRest(const char *name);
 
     /* Arguments: no further arguments may be added after a variadic argument. */
 

From 127dde9613981fedd8ac7ca4385cd53a8f343167 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Thu, 30 May 2013 11:40:16 -0700
Subject: [PATCH 03/85] Bug 876776 - Do not crash when dumping a NULL object,
 r=terrence

---
 js/src/jsfriendapi.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 2518542fc87..629b937f209 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -635,6 +635,10 @@ js_DumpChars(const jschar *s, size_t n)
 JS_FRIEND_API(void)
 js_DumpObject(JSObject *obj)
 {
+    if (!obj) {
+        fprintf(stderr, "NULL\n");
+        return;
+    }
     obj->dump();
 }
 

From 5858a608250a32a64971f7baca726b2b658cdb5b Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Thu, 30 May 2013 11:40:16 -0700
Subject: [PATCH 04/85] Bug 876776 - Add a -J option to the shell for running
 under jorendb, r=terrence

---
 js/src/tests/jstests.py        | 12 +++++++++++-
 js/src/tests/lib/tasks_unix.py | 31 ++++++++++++++++---------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py
index dee150e891f..9e22e859e80 100755
--- a/js/src/tests/jstests.py
+++ b/js/src/tests/jstests.py
@@ -89,6 +89,8 @@ def parse_args():
                           help='Example: --jitflags=m,amd to run each test with -m, -a -m -d [default=%default]')
     harness_og.add_option('-g', '--debug', action='store_true', help='Run a test in debugger.')
     harness_og.add_option('--debugger', default='gdb -q --args', help='Debugger command.')
+    harness_og.add_option('-J', '--jorendb', action='store_true', help='Run under JS debugger.')
+    harness_og.add_option('--passthrough', action='store_true', help='Run tests with stdin/stdout attached to caller.')
     harness_og.add_option('--valgrind', action='store_true', help='Run tests in valgrind.')
     harness_og.add_option('--valgrind-args', default='', help='Extra args to pass to valgrind.')
     op.add_option_group(harness_og)
@@ -153,7 +155,15 @@ def parse_args():
         if os.uname()[0] == 'Darwin':
             prefix.append('--dsymutil=yes')
         options.show_output = True
-    TestCase.set_js_cmd_prefix(options.js_shell, options.shell_args.split(), prefix)
+
+    js_cmd_args = options.shell_args.split()
+    if options.jorendb:
+        options.passthrough = True
+        options.hide_progress = True
+        options.worker_count = 1
+        debugger_path = os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../../examples/jorendb.js")
+        js_cmd_args.extend([ '-d', '-f', debugger_path, '--' ])
+    TestCase.set_js_cmd_prefix(options.js_shell, js_cmd_args, prefix)
 
     # If files with lists of tests to run were specified, add them to the
     # requested tests set.
diff --git a/js/src/tests/lib/tasks_unix.py b/js/src/tests/lib/tasks_unix.py
index 73ef257fb5c..f85578c314f 100644
--- a/js/src/tests/lib/tasks_unix.py
+++ b/js/src/tests/lib/tasks_unix.py
@@ -17,25 +17,26 @@ class Task(object):
         self.out = []
         self.err = []
 
-def spawn_test(test):
+def spawn_test(test, passthrough = False):
     """Spawn one child, return a task struct."""
-    (rout, wout) = os.pipe()
-    (rerr, werr) = os.pipe()
+    if not passthrough:
+        (rout, wout) = os.pipe()
+        (rerr, werr) = os.pipe()
 
-    rv = os.fork()
+        rv = os.fork()
 
-    # Parent.
-    if rv:
-        os.close(wout)
-        os.close(werr)
-        return Task(test, rv, rout, rerr)
+        # Parent.
+        if rv:
+            os.close(wout)
+            os.close(werr)
+            return Task(test, rv, rout, rerr)
 
-    # Child.
-    os.close(rout)
-    os.close(rerr)
+        # Child.
+        os.close(rout)
+        os.close(rerr)
 
-    os.dup2(wout, 1)
-    os.dup2(werr, 2)
+        os.dup2(wout, 1)
+        os.dup2(werr, 2)
 
     cmd = test.get_command(test.js_cmd_prefix)
     os.execvp(cmd[0], cmd)
@@ -188,7 +189,7 @@ def run_all_tests(tests, results, options):
 
     while len(tests) or len(tasks):
         while len(tests) and len(tasks) < options.worker_count:
-            tasks.append(spawn_test(tests.pop()))
+            tasks.append(spawn_test(tests.pop(), options.passthrough))
 
         timeout = get_max_wait(tasks, results, options.timeout)
         read_input(tasks, timeout)

From a264d6a4ada599ccfb50e1386eb3dfa0795f8a23 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Fri, 31 May 2013 02:46:34 +0800
Subject: [PATCH 05/85] Bug 846944 - Change www.mozilla.com to .org in official
 Firefox Branding preferences. r=gavin

---
 browser/app/profile/firefox.js                       |  4 ++--
 browser/base/content/aboutDialog.xul                 |  2 +-
 browser/base/content/browser-appmenu.inc             |  2 +-
 browser/branding/official/branding.nsi               |  4 ++--
 browser/fuel/test/browser_Bookmarks.js               |  6 +++---
 browser/locales/en-US/chrome/browser/aboutDialog.dtd |  2 +-
 browser/locales/en-US/chrome/browser/aboutRobots.dtd |  4 +---
 browser/locales/en-US/profile/bookmarks.inc          | 10 +++++-----
 browser/locales/generic/extract-bookmarks.py         | 10 +++++-----
 browser/locales/generic/profile/bookmarks.html.in    | 10 +++++-----
 browser/metro/base/content/pages/aboutRights.xhtml   |  2 +-
 browser/metro/profile/metro.js                       |  4 ++--
 12 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 754501b178e..0aee107a6c8 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -51,7 +51,7 @@ pref("extensions.blocklist.interval", 86400);
 // blocking them.
 pref("extensions.blocklist.level", 2);
 pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
-pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
+pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blocklist/");
 pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
 
 pref("extensions.update.autoUpdateDefault", true);
@@ -753,7 +753,7 @@ pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozill
 pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
 pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
 
-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
+pref("browser.safebrowsing.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/phishing-protection/");
 pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
 
 #ifdef MOZILLA_OFFICIAL
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul
index 848d940298e..3d88664dddc 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -117,7 +117,7 @@
       <hbox pack="center">
         <label class="text-link bottom-link" href="about:license">&bottomLinks.license;</label>
         <label class="text-link bottom-link" href="about:rights">&bottomLinks.rights;</label>
-        <label class="text-link bottom-link" href="http://www.mozilla.com/legal/privacy/">&bottomLinks.privacy;</label>
+        <label class="text-link bottom-link" href="https://www.mozilla.org/legal/privacy/">&bottomLinks.privacy;</label>
       </hbox>
       <description id="trademark">&trademarkInfo.part1;</description>
     </vbox>
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index 042d06901eb..ecb3b8d5324 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -369,7 +369,7 @@
                       onclick="checkForMiddleClick(this, event);"/>
             <menuitem id="appmenu_gettingStarted"
                       label="&appMenuGettingStarted.label;"
-                      oncommand="gBrowser.loadOneTab('http://www.mozilla.com/firefox/central/', {inBackground: false});"
+                      oncommand="gBrowser.loadOneTab('https://www.mozilla.org/firefox/central/', {inBackground: false});"
                       onclick="checkForMiddleClick(this, event);"/>
 #ifdef MOZ_SERVICES_HEALTHREPORT
             <menuitem id="appmenu_healthReport"
diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi
index f5da39727ec..6c81a9b3276 100644
--- a/browser/branding/official/branding.nsi
+++ b/browser/branding/official/branding.nsi
@@ -10,8 +10,8 @@
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Firefox"
 !define CompanyName           "Mozilla Corporation"
-!define URLInfoAbout          "http://www.mozilla.com/${AB_CD}/"
-!define URLUpdateInfo         "http://www.mozilla.com/${AB_CD}/firefox/"
+!define URLInfoAbout          "https://www.mozilla.org/${AB_CD}/"
+!define URLUpdateInfo         "https://www.mozilla.org/${AB_CD}/firefox/"
 
 ; The OFFICIAL define is a workaround to support different urls for Release and
 ; Beta since they share the same branding when building with other branches that
diff --git a/browser/fuel/test/browser_Bookmarks.js b/browser/fuel/test/browser_Bookmarks.js
index d096f7b19dc..c9af43f6126 100644
--- a/browser/fuel/test/browser_Bookmarks.js
+++ b/browser/fuel/test/browser_Bookmarks.js
@@ -78,13 +78,13 @@ function test() {
   testFolder.events.addListener("removechild", onFolderRemoveChild);
 
   // test adding a bookmark
-  var testBookmark = testFolder.addBookmark("Mozilla", url("http://www.mozilla.com/"));
+  var testBookmark = testFolder.addBookmark("Mozilla", url("https://www.mozilla.org/"));
   ok(testBookmark, "Check bookmark creation");
   ok(testBookmark.parent, "Check parent after bookmark creation");
   is(gLastFolderAction, "addchild", "Check event handler for adding a child to a folder");
   is(testBookmark.type, "bookmark", "Check 'bookmark.type' after creation");
   is(testBookmark.title, "Mozilla", "Check 'bookmark.title' after creation");
-  is(testBookmark.uri.spec, "http://www.mozilla.com/", "Check 'bookmark.uri' after creation");
+  is(testBookmark.uri.spec, "https://www.mozilla.org/", "Check 'bookmark.uri' after creation");
 
   is(testFolder.children.length, 1, "Check test folder child count after adding a child bookmark");
 
@@ -175,7 +175,7 @@ function test() {
   var testFolderA = root.addFolder("folder-a");
   var testFolderB = root.addFolder("folder-b");
 
-  var testMove = testFolderA.addBookmark("Mozilla", url("http://www.mozilla.com/"));
+  var testMove = testFolderA.addBookmark("Mozilla", url("https://www.mozilla.org/"));
   testMove.events.addListener("move", onBookmarkMove);
   is(testMove.parent.title, "folder-a", "Checking for new parent before moving bookmark");
 
diff --git a/browser/locales/en-US/chrome/browser/aboutDialog.dtd b/browser/locales/en-US/chrome/browser/aboutDialog.dtd
index 2b5fd45552e..a901ebca15d 100644
--- a/browser/locales/en-US/chrome/browser/aboutDialog.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutDialog.dtd
@@ -36,7 +36,7 @@
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 <!ENTITY bottomLinks.rights         "End-User Rights">
 
-<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy        "Privacy Policy">
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
diff --git a/browser/locales/en-US/chrome/browser/aboutRobots.dtd b/browser/locales/en-US/chrome/browser/aboutRobots.dtd
index f417428c84a..139603d8d3b 100644
--- a/browser/locales/en-US/chrome/browser/aboutRobots.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutRobots.dtd
@@ -3,9 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- These strings are used in the about:robots page, which ties in with the
-     robots theme used in the Firefox 3 Beta 2/3 first run pages...
-         https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
-         https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
+     robots theme used in the Firefox 3 Beta 2/3 first run pages.
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 
diff --git a/browser/locales/en-US/profile/bookmarks.inc b/browser/locales/en-US/profile/bookmarks.inc
index f91f15ef765..d2a701e52b9 100644
--- a/browser/locales/en-US/profile/bookmarks.inc
+++ b/browser/locales/en-US/profile/bookmarks.inc
@@ -14,7 +14,7 @@
 #define bookmarks_toolbarfolder_description Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
 
 # LOCALIZATION NOTE (getting_started):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/central/
+# link title for https://www.mozilla.org/en-US/firefox/central/
 #define getting_started Getting Started
 
 # LOCALIZATION NOTE (firefox_heading):
@@ -22,19 +22,19 @@
 #define firefox_heading Mozilla Firefox
 
 # LOCALIZATION NOTE (firefox_help):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/help/
+# link title for https://www.mozilla.org/en-US/firefox/help/
 #define firefox_help Help and Tutorials
 
 # LOCALIZATION NOTE (firefox_customize):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/customize/
+# link title for https://www.mozilla.org/en-US/firefox/customize/
 #define firefox_customize Customize Firefox
 
 # LOCALIZATION NOTE (firefox_community):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/community/
+# link title for https://www.mozilla.org/en-US/contribute/
 #define firefox_community Get Involved
 
 # LOCALIZATION NOTE (firefox_about):
-# link title for http://en-US.www.mozilla.com/en-US/about/
+# link title for https://www.mozilla.org/en-US/about/
 #define firefox_about About Us
 
 #unfilter emptyLines
diff --git a/browser/locales/generic/extract-bookmarks.py b/browser/locales/generic/extract-bookmarks.py
index cc8a954ef53..7bf711fff12 100644
--- a/browser/locales/generic/extract-bookmarks.py
+++ b/browser/locales/generic/extract-bookmarks.py
@@ -32,7 +32,7 @@ template = '''#filter emptyLines
 #define bookmarks_toolbarfolder_description %s
 
 # LOCALIZATION NOTE (getting_started):
-# link title for http://www.mozilla.com/en-US/firefox/central/
+# link title for https://www.mozilla.org/en-US/firefox/central/
 #define getting_started %s
 
 # LOCALIZATION NOTE (firefox_heading):
@@ -40,19 +40,19 @@ template = '''#filter emptyLines
 #define firefox_heading %s
 
 # LOCALIZATION NOTE (firefox_help):
-# link title for http://www.mozilla.com/en-US/firefox/help/
+# link title for https://www.mozilla.org/en-US/firefox/help/
 #define firefox_help %s
 
 # LOCALIZATION NOTE (firefox_customize):
-# link title for http://www.mozilla.com/en-US/firefox/customize/
+# link title for https://www.mozilla.org/en-US/firefox/customize/
 #define firefox_customize %s
 
 # LOCALIZATION NOTE (firefox_community):
-# link title for http://www.mozilla.com/en-US/firefox/community/
+# link title for https://www.mozilla.org/en-US/contribute/
 #define firefox_community %s
 
 # LOCALIZATION NOTE (firefox_about):
-# link title for http://www.mozilla.com/en-US/about/
+# link title for https://www.mozilla.org/en-US/about/
 #define firefox_about %s
 
 #unfilter emptyLines'''
diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
index b9a5ba865d5..e925c1ef235 100644
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/browser/locales/generic/profile/bookmarks.html.in
@@ -15,13 +15,13 @@
     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
 <DD>@bookmarks_toolbarfolder_description@
     <DL><p>
-        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
+        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
     </DL><p>
     <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
     <DL><p>
-        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
-        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
-        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
-        <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
+        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
+        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
+        <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+        <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
     </DL><p>
 </DL><p>
diff --git a/browser/metro/base/content/pages/aboutRights.xhtml b/browser/metro/base/content/pages/aboutRights.xhtml
index becab854e2d..df29ae7ea60 100644
--- a/browser/metro/base/content/pages/aboutRights.xhtml
+++ b/browser/metro/base/content/pages/aboutRights.xhtml
@@ -33,7 +33,7 @@
   -->
   <li>&rights.intro-point2-a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
   <li>&rights.intro-point2.5;</li>
-  <li>&rights2.intro-point3a;<a href="http://www.mozilla.com/legal/privacy/">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
+  <li>&rights2.intro-point3a;<a href="https://www.mozilla.org/legal/privacy/">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
   <li>&rights2.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
 </ul>
 
diff --git a/browser/metro/profile/metro.js b/browser/metro/profile/metro.js
index 3b278bd59ce..381845c007c 100644
--- a/browser/metro/profile/metro.js
+++ b/browser/metro/profile/metro.js
@@ -188,7 +188,7 @@ pref("extensions.update.enabled", false);
 pref("extensions.blocklist.enabled", true);
 pref("extensions.blocklist.interval", 86400);
 pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
-pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
+pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blocklist/");
 
 /* block popups by default, and notify the user about blocked popups */
 pref("dom.disable_open_during_load", true);
@@ -383,7 +383,7 @@ pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
 // TODO: This is not the correct article for metro!!!
 pref("app.sync.tutorialURL", "https://support.mozilla.org/kb/sync-firefox-between-desktop-and-mobile");
 pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
-pref("app.privacyURL", "http://www.mozilla.com/legal/privacy/");
+pref("app.privacyURL", "https://www.mozilla.org/legal/privacy/");
 pref("app.creditsURL", "http://www.mozilla.org/credits/");
 pref("app.channelURL", "http://www.mozilla.org/%LOCALE%/firefox/channel/");
 

From f81ab1a89410d40897fe989eb836cc2d975f4b95 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Fri, 31 May 2013 03:25:43 +0800
Subject: [PATCH 06/85] Bug 876037 - Make app.releaseNotesURL and app.vendorURL
 optional. r=gavin

---
 browser/branding/aurora/pref/firefox-branding.js     | 4 ----
 browser/branding/nightly/pref/firefox-branding.js    | 4 ----
 browser/branding/official/pref/firefox-branding.js   | 4 ----
 browser/branding/unofficial/pref/firefox-branding.js | 4 ----
 toolkit/content/about.xhtml                          | 5 +++--
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/browser/branding/aurora/pref/firefox-branding.js b/browser/branding/aurora/pref/firefox-branding.js
index 07c6cc964b3..5a877321275 100644
--- a/browser/branding/aurora/pref/firefox-branding.js
+++ b/browser/branding/aurora/pref/firefox-branding.js
@@ -21,10 +21,6 @@ pref("app.update.url.manual", "https://www.mozilla.org/firefox/aurora/");
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "https://www.mozilla.org/firefox/aurora/");
 
-// Release notes and vendor URLs
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");
-pref("app.vendorURL", "http://www.mozilla.org/projects/firefox/");
-
 // Search codes belong only in builds with official branding
 pref("browser.search.param.yahoo-fr", "");
 pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
diff --git a/browser/branding/nightly/pref/firefox-branding.js b/browser/branding/nightly/pref/firefox-branding.js
index 74035365eb5..112322c623d 100644
--- a/browser/branding/nightly/pref/firefox-branding.js
+++ b/browser/branding/nightly/pref/firefox-branding.js
@@ -18,10 +18,6 @@ pref("app.update.url.manual", "https://nightly.mozilla.org");
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "https://nightly.mozilla.org");
 
-// Release notes and vendor URLs
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");
-pref("app.vendorURL", "http://www.mozilla.org/projects/firefox/");
-
 // Search codes belong only in builds with official branding
 pref("browser.search.param.yahoo-fr", "");
 pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
index ce7e9450fe2..e3b5c5b2c31 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -18,10 +18,6 @@ pref("app.update.url.manual", "https://www.mozilla.org/firefox/");
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
 
-// Release notes and vendor URLs
-pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/");
-pref("app.vendorURL", "http://www.mozilla.com/%LOCALE%/firefox/");
-
 pref("browser.search.param.ms-pc", "MOZI");
 pref("browser.search.param.yahoo-fr", "moz35");
 pref("browser.search.param.yahoo-fr-cjkt", "moz35"); // now unused
diff --git a/browser/branding/unofficial/pref/firefox-branding.js b/browser/branding/unofficial/pref/firefox-branding.js
index 300fa3dc7a4..42792b981b0 100644
--- a/browser/branding/unofficial/pref/firefox-branding.js
+++ b/browser/branding/unofficial/pref/firefox-branding.js
@@ -18,10 +18,6 @@ pref("app.update.url.manual", "https://nightly.mozilla.org");
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "https://nightly.mozilla.org");
 
-// Release notes and vendor URLs
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");
-pref("app.vendorURL", "http://www.mozilla.org/projects/firefox/");
-
 // Search codes belong only in builds with official branding
 pref("browser.search.param.yahoo-fr", "");
 pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
diff --git a/toolkit/content/about.xhtml b/toolkit/content/about.xhtml
index 13d70eb8695..5351181f38d 100644
--- a/toolkit/content/about.xhtml
+++ b/toolkit/content/about.xhtml
@@ -22,7 +22,7 @@
 
 <body dir="&locale.dir;">
   <div id="aboutLogoContainer">
-    <a id="vendorURL" href="http://www.mozilla.org/">
+    <a id="vendorURL">
       <img src="about:logo" alt="&brandShortName;"/>
       <p id="version"></p>
     </a>
@@ -31,7 +31,7 @@
   <ul id="aboutPageList">
     <li>&about.credits.beforeLink;<a href="about:credits">&about.credits.linkTitle;</a>&about.credits.afterLink;</li>
     <li>&about.license.beforeTheLink;<a href="about:license">&about.license.linkTitle;</a>&about.license.afterTheLink;</li>
-    <li>&about.relnotes.beforeTheLink;<a id="releaseNotesURL" href="">&about.relnotes.linkTitle;</a>&about.relnotes.afterTheLink;</li>
+    <li hidden="true">&about.relnotes.beforeTheLink;<a id="releaseNotesURL">&about.relnotes.linkTitle;</a>&about.relnotes.afterTheLink;</li>
     <li>&about.buildconfig.beforeTheLink;<a href="about:buildconfig">&about.buildconfig.linkTitle;</a>&about.buildconfig.afterTheLink;</li>
     <script type="application/javascript">
       // get release notes and vendor URL from prefs
@@ -41,6 +41,7 @@
       if (releaseNotesURL != "about:blank") {
         var relnotes = document.getElementById("releaseNotesURL");
         relnotes.setAttribute("href", releaseNotesURL);
+        relnotes.parentNode.removeAttribute("hidden");
       }
 
       var vendorURL = formatter.formatURLPref("app.vendorURL");

From 561e7c68be3905c17118cb1563a974140c4945f4 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Thu, 30 May 2013 13:13:09 -0700
Subject: [PATCH 07/85] Backed out 4 changesets (bug 876776) from cypress,
 since it's only fair that if I did the first-ever inbound2 push, I should get
 the first ever inbound2 backout (on a CLOSED TREE, no less!)

Backed out changeset 31e27a44b7c4 (bug 876776)
Backed out changeset f692efb201b0 (bug 876776)
Backed out changeset 497545d56f6c (bug 876776)
Backed out changeset 8ea5828317b2 (bug 876776)
---
 js/examples/jorendb.js         | 792 ++++++++++++++-------------------
 js/src/jsfriendapi.cpp         |   4 -
 js/src/shell/js.cpp            |   1 -
 js/src/shell/jsoptparse.cpp    |  51 +--
 js/src/shell/jsoptparse.h      |   9 +-
 js/src/tests/jstests.py        |  12 +-
 js/src/tests/lib/tasks_unix.py |  31 +-
 7 files changed, 366 insertions(+), 534 deletions(-)

diff --git a/js/examples/jorendb.js b/js/examples/jorendb.js
index 54fc782596f..d83589f08fc 100644
--- a/js/examples/jorendb.js
+++ b/js/examples/jorendb.js
@@ -5,13 +5,12 @@
  *
  * 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/.
- */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * jorendb is a simple command-line debugger for shell-js programs. It is
- * intended as a demo of the Debugger object (as there are no shell js programs
- * to speak of).
+ * jorendb is a simple command-line debugger for shell-js programs.  It is
+ * intended as a demo of the Debugger object (as there are no shell js programs to
+ * speak of).
  *
  * To run it: $JS -d path/to/this/file/jorendb.js
  * To run some JS code under it, try:
@@ -19,492 +18,367 @@
  * Execution will stop at debugger statements and you'll get a jorendb prompt.
  */
 
-// Debugger state.
-var focusedFrame = null;
-var topFrame = null;
-var debuggeeValues = {};
-var nextDebuggeeValueIndex = 1;
-var lastExc = null;
+(function () {
+    var debuggerSource = "(" + function () {
+        // Debugger state.
+        var focusedFrame = null;
+        var topFrame = null;
+        var debuggeeValues = [null];
+        var lastExc = null;
 
-// Cleanup functions to run when we next re-enter the repl.
-var replCleanups = [];
-
-// Convert a debuggee value v to a string.
-function dvToString(v) {
-    return (typeof v !== 'object' || v === null) ? uneval(v) : "[object " + v.class + "]";
-}
-
-function showDebuggeeValue(dv) {
-    var dvrepr = dvToString(dv);
-    var i = nextDebuggeeValueIndex++;
-    debuggeeValues["$" + i] = dv;
-    print("$" + i + " = " + dvrepr);
-}
-
-Object.defineProperty(Debugger.Frame.prototype, "num", {
-    configurable: true,
-    enumerable: false,
-    get: function () {
-            var i = 0;
-            for (var f = topFrame; f && f !== this; f = f.older)
-                i++;
-            return f === null ? undefined : i;
+        // Convert a debuggee value v to a string.
+        function dvToString(v) {
+            return (typeof v !== 'object' || v === null) ? uneval(v) : "[object " + v.class + "]";
         }
-    });
 
-Debugger.Frame.prototype.frameDescription = function frameDescription() {
-    if (this.type == "call")
-        return ((this.callee.name || '<anonymous>') +
-                "(" + this.arguments.map(dvToString).join(", ") + ")");
-    else
-        return this.type + " code";
-}
-
-Debugger.Frame.prototype.positionDescription = function positionDescription() {
-    if (this.script) {
-        var line = this.script.getOffsetLine(this.offset);
-        if (this.script.url)
-            return this.script.url + ":" + line;
-        return "line " + line;
-    }
-    return null;
-}
-
-Debugger.Frame.prototype.fullDescription = function fullDescription() {
-    var fr = this.frameDescription();
-    var pos = this.positionDescription();
-    if (pos)
-        return fr + ", " + pos;
-    return fr;
-}
-
-Object.defineProperty(Debugger.Frame.prototype, "line", {
-        configurable: true,
-        enumerable: false,
-        get: function() {
-            if (this.script)
-                return this.script.getOffsetLine(this.offset);
-            else
-                return null;
+        function showDebuggeeValue(dv) {
+            var dvrepr = dvToString(dv);
+            var i = debuggeeValues.length;
+            debuggeeValues[i] = dv;
+            print("$" + i + " = " + dvrepr);
         }
-    });
 
-function callDescription(f) {
-    return ((f.callee.name || '<anonymous>') +
-            "(" + f.arguments.map(dvToString).join(", ") + ")");
-}
+        Object.defineProperty(Debugger.Frame.prototype, "num", {
+            configurable: true,
+            enumerable: false,
+            get: function () {
+                    var i = 0;
+                    for (var f = topFrame; f && f !== this; f = f.older)
+                        i++;
+                    return f === null ? undefined : i;
+                }
+            });
 
-function showFrame(f, n) {
-    if (f === undefined || f === null) {
-        f = focusedFrame;
-        if (f === null) {
-            print("No stack.");
-            return;
+        function framePosition(f) {
+            if (!f.script)
+                return f.type + " code";
+            return (f.script.url || f.type + " code") + ":" + f.script.getOffsetLine(f.offset);
         }
-    }
-    if (n === undefined) {
-        n = f.num;
-        if (n === undefined)
-            throw new Error("Internal error: frame not on stack");
-    }
 
-    print('#' + n + " " + f.fullDescription());
-}
+        function callDescription(f) {
+            return ((f.callee.name || '<anonymous>') + 
+                    "(" + f.arguments.map(dvToString).join(", ") + ")");
+        }
 
-function saveExcursion(fn) {
-    var tf = topFrame, ff = focusedFrame;
-    try {
-        return fn();
-    } finally {
-        topFrame = tf;
-        focusedFrame = ff;
-    }
-}
+        function showFrame(f, n) {
+            if (f === undefined || f === null) {
+                f = focusedFrame;
+                if (f === null) {
+                    print("No stack.");
+                    return;
+                }
+            }
+            if (n === undefined) {
+                n = f.num;
+                if (n === undefined)
+                    throw new Error("Internal error: frame not on stack");
+            }
 
-// Evaluate an expression in the Debugger global
-function evalCommand(expr) {
-    eval(expr);
-}
+            var me = '#' + n;
+            if (f.type === "call")
+                me += ' ' + callDescription(f);
+            me += ' ' + framePosition(f);
+            print(me);
+        }
 
-function quitCommand() {
-    dbg.enabled = false;
-    quit(0);
-}
+        function saveExcursion(fn) {
+            var tf = topFrame, ff = focusedFrame;
+            try {
+                return fn();
+            } finally {
+                topFrame = tf;
+                focusedFrame = ff;
+            }
+        }
 
-function backtraceCommand() {
-    if (topFrame === null)
-        print("No stack.");
-    for (var i = 0, f = topFrame; f; i++, f = f.older)
-        showFrame(f, i);
-}
+        function quitCommand() {
+            dbg.enabled = false;
+            quit(0);
+        }
 
-function printCommand(rest) {
-    // This is the real deal.
-    var cv = saveExcursion(
-        () => focusedFrame == null
-              ? debuggeeGlobalWrapper.evalInGlobalWithBindings(rest, debuggeeValues)
-              : focusedFrame.evalWithBindings(rest, debuggeeValues));
-    if (cv === null) {
-        if (!dbg.enabled)
-            return [cv];
-        print("Debuggee died.");
-    } else if ('return' in cv) {
-        if (!dbg.enabled)
+        function backtraceCommand() {
+            if (topFrame === null)
+                print("No stack.");
+            for (var i = 0, f = topFrame; f; i++, f = f.older)
+                showFrame(f, i);
+        }
+
+        function printCommand(rest) {
+            if (focusedFrame === null) {
+                // This is super bogus, need a way to create an env wrapping the debuggeeGlobal
+                // and eval against that.
+                var nonwrappedValue;
+                try {
+                    nonwrappedValue = debuggeeGlobal.eval(rest);
+                } catch (exc) {
+                    print("Exception caught.");
+                    nonwrappedValue = exc;
+                }
+                if (typeof nonwrappedValue !== "object" || nonwrappedValue === null) {
+                    // primitive value, no sweat
+                    print("    " + uneval(nonwrappedValue));
+                } else {
+                    // junk for now
+                    print("    " + Object.prototype.toString.call(nonwrappedValue));
+                }
+            } else {
+                // This is the real deal.
+                var cv = saveExcursion(function () {
+                        return focusedFrame.eval(rest);
+                    });
+                if (cv === null) {
+                    if (!dbg.enabled)
+                        return [cv];
+                    print("Debuggee died.");
+                } else if ('return' in cv) {
+                    if (!dbg.enabled)
+                        return [undefined];
+                    showDebuggeeValue(cv.return);
+                } else {
+                    if (!dbg.enabled)
+                        return [cv];
+                    print("Exception caught. (To rethrow it, type 'throw'.)");
+                    lastExc = cv.throw;
+                    showDebuggeeValue(lastExc);
+                }
+            }
+        }
+
+        function detachCommand() {
+            dbg.enabled = false;
             return [undefined];
-        showDebuggeeValue(cv.return);
-    } else {
-        if (!dbg.enabled)
-            return [cv];
-        print("Exception caught. (To rethrow it, type 'throw'.)");
-        lastExc = cv.throw;
-        showDebuggeeValue(lastExc);
-    }
-}
-
-function detachCommand() {
-    dbg.enabled = false;
-    return [undefined];
-}
-
-function continueCommand() {
-    if (focusedFrame === null) {
-        print("No stack.");
-        return;
-    }
-    return [undefined];
-}
-
-function throwCommand(rest) {
-    var v;
-    if (focusedFrame !== topFrame) {
-        print("To throw, you must select the newest frame (use 'frame 0').");
-        return;
-    } else if (focusedFrame === null) {
-        print("No stack.");
-        return;
-    } else if (rest === '') {
-        return [{throw: lastExc}];
-    } else {
-        var cv = saveExcursion(function () { return focusedFrame.eval(rest); });
-        if (cv === null) {
-            if (!dbg.enabled)
-                return [cv];
-            print("Debuggee died while determining what to throw. Stopped.");
-        } else if ('return' in cv) {
-            return [{throw: cv.return}];
-        } else {
-            if (!dbg.enabled)
-                return [cv];
-            print("Exception determining what to throw. Stopped.");
-            showDebuggeeValue(cv.throw);
         }
-        return;
-    }
-}
 
-function frameCommand(rest) {
-    var n, f;
-    if (rest.match(/[0-9]+/)) {
-        n = +rest;
-        f = topFrame;
-        if (f === null) {
-            print("No stack.");
-            return;
-        }
-        for (var i = 0; i < n && f; i++) {
-            if (!f.older) {
-                print("There is no frame " + rest + ".");
+        function continueCommand() {
+            if (focusedFrame === null) {
+                print("No stack.");
                 return;
             }
-            f.older.younger = f;
-            f = f.older;
-        }
-        focusedFrame = f;
-        showFrame(f, n);
-    } else if (rest !== '') {
-        if (topFrame === null)
-            print("No stack.");
-        else
-            showFrame();
-    } else {
-        print("do what now?");
-    }
-}
-
-function upCommand() {
-    if (focusedFrame === null)
-        print("No stack.");
-    else if (focusedFrame.older === null)
-        print("Initial frame selected; you cannot go up.");
-    else {
-        focusedFrame.older.younger = focusedFrame;
-        focusedFrame = focusedFrame.older;
-        showFrame();
-    }
-}
-
-function downCommand() {
-    if (focusedFrame === null)
-        print("No stack.");
-    else if (!focusedFrame.younger)
-        print("Youngest frame selected; you cannot go down.");
-    else {
-        focusedFrame = focusedFrame.younger;
-        showFrame();
-    }
-}
-
-function forcereturnCommand(rest) {
-    var v;
-    var f = focusedFrame;
-    if (f !== topFrame) {
-        print("To forcereturn, you must select the newest frame (use 'frame 0').");
-    } else if (f === null) {
-        print("Nothing on the stack.");
-    } else if (rest === '') {
-        return [{return: undefined}];
-    } else {
-        var cv = saveExcursion(function () { return f.eval(rest); });
-        if (cv === null) {
-            if (!dbg.enabled)
-                return [cv];
-            print("Debuggee died while determining what to forcereturn. Stopped.");
-        } else if ('return' in cv) {
-            return [{return: cv.return}];
-        } else {
-            if (!dbg.enabled)
-                return [cv];
-            print("Error determining what to forcereturn. Stopped.");
-            showDebuggeeValue(cv.throw);
-        }
-    }
-}
-
-function printPop(f, c) {
-    var fdesc = f.fullDescription();
-    if (c.return) {
-        print("frame returning (still selected): " + fdesc);
-        showDebuggeeValue(c.return);
-    } else if (c.throw) {
-        print("frame threw exception: " + fdesc);
-        showDebuggeeValue(c.throw);
-        print("(To rethrow it, type 'throw'.)");
-        lastExc = c.throw;
-    } else {
-        print("frame was terminated: " + fdesc);
-    }
-}
-
-// Set |prop| on |obj| to |value|, but then restore its current value
-// when we next enter the repl.
-function setUntilRepl(obj, prop, value) {
-    var saved = obj[prop];
-    obj[prop] = value;
-    replCleanups.push(function () { obj[prop] = saved; });
-}
-
-function doStepOrNext(kind) {
-    var startFrame = topFrame;
-    var startLine = startFrame.line;
-    print("stepping in:   " + startFrame.fullDescription());
-    print("starting line: " + uneval(startLine));
-
-    function stepPopped(completion) {
-        // Note that we're popping this frame; we need to watch for
-        // subsequent step events on its caller.
-        this.reportedPop = true;
-        printPop(this, completion);
-        topFrame = focusedFrame = this;
-        return repl();
-    }
-
-    function stepEntered(newFrame) {
-        print("entered frame: " + newFrame.fullDescription());
-        topFrame = focusedFrame = newFrame;
-        return repl();
-    }
-
-    function stepStepped() {
-        print("stepStepped: " + this.fullDescription());
-        // If we've changed frame or line, then report that.
-        if (this !== startFrame || this.line != startLine) {
-            topFrame = focusedFrame = this;
-            if (focusedFrame != startFrame)
-                print(focusedFrame.fullDescription());
-            return repl();
+            return [undefined];
         }
 
-        // Otherwise, let execution continue.
-        return undefined;
-    }
-
-    if (kind.step)
-        setUntilRepl(dbg, 'onEnterFrame', stepEntered);
-
-    // If we're stepping after an onPop, watch for steps and pops in the
-    // next-older frame; this one is done.
-    var stepFrame = startFrame.reportedPop ? startFrame.older : startFrame;
-    if (!stepFrame || !stepFrame.script)
-        stepFrame = null;
-    if (stepFrame) {
-        setUntilRepl(stepFrame, 'onStep', stepStepped);
-        setUntilRepl(stepFrame, 'onPop',  stepPopped);
-    }
-
-    // Let the program continue!
-    return [undefined];
-}
-
-function stepCommand() { return doStepOrNext({step:true}); }
-function nextCommand() { return doStepOrNext({next:true}); }
-
-// Build the table of commands.
-var commands = {};
-var commandArray = [
-    backtraceCommand, "bt", "where",
-    continueCommand, "c",
-    detachCommand,
-    downCommand, "d",
-    forcereturnCommand,
-    frameCommand, "f",
-    nextCommand, "n",
-    printCommand, "p",
-    quitCommand, "q",
-    stepCommand, "s",
-    throwCommand, "t",
-    upCommand, "u",
-    helpCommand, "h",
-    evalCommand, "!",
-    ];
-var last = null;
-for (var i = 0; i < commandArray.length; i++) {
-    var cmd = commandArray[i];
-    if (typeof cmd === "string")
-        commands[cmd] = last;
-    else
-        last = commands[cmd.name.replace(/Command$/, '')] = cmd;
-}
-
-function helpCommand(rest) {
-    print("Available commands:");
-    var printcmd = function(group) {
-        print("  " + group.join(", "));
-    }
-
-    var group = [];
-    for (var cmd of commandArray) {
-        if (typeof cmd === "string") {
-            group.push(cmd);
-        } else {
-            if (group.length) printcmd(group);
-            group = [ cmd.name.replace(/Command$/, '') ];
+        function throwCommand(rest) {
+            var v;
+            if (focusedFrame !== topFrame) {
+                print("To throw, you must select the newest frame (use 'frame 0').");
+                return;
+            } else if (focusedFrame === null) {
+                print("No stack.");
+                return;
+            } else if (rest === '') {
+                return [{throw: lastExc}];
+            } else {
+                var cv = saveExcursion(function () { return focusedFrame.eval(rest); });
+                if (cv === null) {
+                    if (!dbg.enabled)
+                        return [cv];
+                    print("Debuggee died while determining what to throw. Stopped.");
+                } else if ('return' in cv) {
+                    return [{throw: cv.return}];
+                } else {
+                    if (!dbg.enabled)
+                        return [cv];
+                    print("Exception determining what to throw. Stopped.");
+                    showDebuggeeValue(cv.throw);
+                }
+                return;
+            }
         }
-    }
-    printcmd(group);
-}
 
-// Break cmd into two parts: its first word and everything else. If it begins
-// with punctuation, treat that as a separate word.
-function breakcmd(cmd) {
-    cmd = cmd.trimLeft();
-    if ("!@#$%^&*_+=/?.,<>:;'\"".indexOf(cmd.substr(0, 1)) != -1)
-        return [cmd.substr(0, 1), cmd.substr(1).trimLeft()];
-    var m = /\s/.exec(cmd);
-    if (m === null)
-        return [cmd, ''];
-    return [cmd.slice(0, m.index), cmd.slice(m.index).trimLeft()];
-}
+        function frameCommand(rest) {
+            var n, f;
+            if (rest.match(/[0-9]+/)) {
+                n = +rest;
+                f = topFrame;
+                if (f === null) {
+                    print("No stack.");
+                    return;
+                }
+                for (var i = 0; i < n && f; i++) {
+                    if (!f.older) {
+                        print("There is no frame " + rest + ".");
+                        return;
+                    }
+                    f.older.younger = f;
+                    f = f.older;
+                }
+                focusedFrame = f;
+                showFrame(f, n);
+            } else if (rest !== '') {
+                if (topFrame === null)
+                    print("No stack.");
+                else
+                    showFrame();
+            } else {
+                print("do what now?");
+            }
+        }
 
-function runcmd(cmd) {
-    var pieces = breakcmd(cmd);
-    if (pieces[0] === "")
-        return undefined;
+        function debugmeCommand() {
+            var meta = newGlobal("new-compartment");
+            meta.debuggeeGlobal = this;
+            meta.debuggerSource = debuggerSource;
+            meta.prompt = prompt.replace('(', '(meta-');
+            meta.eval(debuggerSource);
+        }
 
-    var first = pieces[0], rest = pieces[1];
-    if (!commands.hasOwnProperty(first)) {
-        print("unrecognized command '" + first + "'");
-        return undefined;
-    }
+        function upCommand() {
+            if (focusedFrame === null)
+                print("No stack.");
+            else if (focusedFrame.older === null)
+                print("Initial frame selected; you cannot go up.");
+            else {
+                focusedFrame.older.younger = focusedFrame;
+                focusedFrame = focusedFrame.older;
+                showFrame();
+            }
+        }
 
-    var cmd = commands[first];
-    if (cmd.length === 0 && rest !== '') {
-        print("this command cannot take an argument");
-        return undefined;
-    }
+        function downCommand() {
+            if (focusedFrame === null)
+                print("No stack.");
+            else if (!focusedFrame.younger)
+                print("Youngest frame selected; you cannot go down.");
+            else {
+                focusedFrame = focusedFrame.younger;
+                showFrame();
+            }
+        }
 
-    return cmd(rest);
-}
+        function forcereturnCommand(rest) {
+            var v;
+            var f = focusedFrame;
+            if (f !== topFrame) {
+                print("To forcereturn, you must select the newest frame (use 'frame 0').");
+            } else if (f === null) {
+                print("Nothing on the stack.");
+            } else if (rest === '') {
+                return [{return: undefined}];
+            } else {
+                var cv = saveExcursion(function () { return f.eval(rest); });
+                if (cv === null) {
+                    if (!dbg.enabled)
+                        return [cv];
+                    print("Debuggee died while determining what to forcereturn. Stopped.");
+                } else if ('return' in cv) {
+                    return [{return: cv.return}];
+                } else {
+                    if (!dbg.enabled)
+                        return [cv];
+                    print("Error determining what to forcereturn. Stopped.");
+                    showDebuggeeValue(cv.throw);
+                }
+            }
+        }
 
-function repl() {
-    while (replCleanups.length > 0)
-        replCleanups.pop()();
-
-    var cmd;
-    for (;;) {
-        putstr("\n" + prompt);
-        cmd = readline();
-        if (cmd === null)
-            return null;
-
-        try {
-            var result = runcmd(cmd);
-            if (result === undefined)
-                ; // do nothing
-            else if (Array.isArray(result))
-                return result[0];
+        // Build the table of commands.
+        var commands = {};
+        var commandArray = [
+            backtraceCommand, "bt", "where",
+            continueCommand, "c",
+            detachCommand,
+            debugmeCommand,
+            downCommand, "d",
+            forcereturnCommand,
+            frameCommand, "f",
+            printCommand, "p",
+            quitCommand, "q",
+            throwCommand, "t",
+            upCommand, "u"
+            ];
+        var last = null;
+        for (var i = 0; i < commandArray.length; i++) {
+            var cmd = commandArray[i];
+            if (typeof cmd === "string")
+                commands[cmd] = last;
             else
-                throw new Error("Internal error: result of runcmd wasn't array or undefined");
-        } catch (exc) {
-            print("*** Internal error: exception in the debugger code.");
-            print("    " + exc);
-            print(exc.stack);
+                last = commands[cmd.name.replace(/Command$/, '')] = cmd;
         }
-    }
-}
 
-var dbg = new Debugger();
-dbg.onDebuggerStatement = function (frame) {
-    return saveExcursion(function () {
-            topFrame = focusedFrame = frame;
-            print("'debugger' statement hit.");
-            showFrame();
-            return repl();
-        });
-};
-dbg.onThrow = function (frame, exc) {
-    return saveExcursion(function () {
-            topFrame = focusedFrame = frame;
-            print("Unwinding due to exception. (Type 'c' to continue unwinding.)");
-            showFrame();
-            print("Exception value is:");
-            showDebuggeeValue(exc);
-            return repl();
-        });
-};
+        // Break cmd into two parts: its first word and everything else.
+        function breakcmd(cmd) {
+            cmd = cmd.trimLeft();
+            var m = /\s/.exec(cmd);
+            if (m === null)
+                return [cmd, ''];
+            return [cmd.slice(0, m.index), cmd.slice(m.index).trimLeft()];
+        }
 
-// The depth of jorendb nesting.
-var jorendbDepth;
-if (typeof jorendbDepth == 'undefined') jorendbDepth = 0;
+        function runcmd(cmd) {
+            var pieces = breakcmd(cmd);
+            if (pieces[0] === "")
+                return undefined;
 
-var debuggeeGlobal = newGlobal("new-compartment");
-debuggeeGlobal.jorendbDepth = jorendbDepth + 1;
-var debuggeeGlobalWrapper = dbg.addDebuggee(debuggeeGlobal);
+            var first = pieces[0], rest = pieces[1];
+            if (!commands.hasOwnProperty(first)) {
+                print("unrecognized command '" + first + "'");
+                return undefined;
+            }
 
-print("jorendb version -0.0");
-prompt = '(' + Array(jorendbDepth+1).join('meta-') + 'jorendb) ';
+            var cmd = commands[first];
+            if (cmd.length === 0 && rest !== '') {
+                print("this command cannot take an argument");
+                return undefined;
+            }
 
-var args = arguments;
-while(args.length > 0) {
-    var arg = args.shift();
-    if (arg == '-f') {
-        arg = args.shift();
-        debuggeeGlobal.evaluate(read(arg), { fileName: arg, lineNumber: 1 });
-    } else if (arg == '-e') {
-        arg = args.shift();
-        debuggeeGlobal.eval(arg);
-    } else {
-        throw("jorendb does not implement command-line argument '" + arg + "'");
-    }
-}
+            return cmd(rest);
+        }
 
-repl();
+        function repl() {
+            var cmd;
+            for (;;) {
+                print("\n" + prompt);
+                cmd = readline();
+                if (cmd === null)
+                    break;
+
+                try {
+                    var result = runcmd(cmd);
+                    if (result === undefined)
+                        ; // do nothing
+                    else if (Array.isArray(result))
+                        return result[0];
+                    else
+                        throw new Error("Internal error: result of runcmd wasn't array or undefined");
+                } catch (exc) {
+                    print("*** Internal error: exception in the debugger code.");
+                    print("    " + exc);
+                    var me = prompt.replace(/^\((.*)\)$/, function (a, b) { return b; });
+                    print("Debug " + me + "? (y/n)");
+                    if (readline().match(/^\s*y/i) !== null)
+                        debugMe();
+                    else
+                        print("ok, ignoring error");
+                }
+            }
+        }
+
+        var dbg = new Debugger(debuggeeGlobal);
+        dbg.onDebuggerStatement = function (frame) {
+            return saveExcursion(function () {
+                    topFrame = focusedFrame = frame;
+                    print("'debugger' statement hit.");
+                    showFrame();
+                    return repl();
+                });
+        };
+        dbg.onThrow = function (frame, exc) {
+            return saveExcursion(function () {
+                    topFrame = focusedFrame = frame;
+                    print("Unwinding due to exception. (Type 'c' to continue unwinding.)");
+                    showFrame();
+                    print("Exception value is:");
+                    showDebuggeeValue(exc);
+                    return repl();
+                });
+        };
+        repl();
+    } + ")();"
+
+    print("jorendb version -0.0");
+    var g = newGlobal("new-compartment");
+    g.debuggeeGlobal = this;
+    g.prompt = '(jorendb)';
+    g.debuggerSource = debuggerSource;
+    g.eval(debuggerSource);
+})();
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 629b937f209..2518542fc87 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -635,10 +635,6 @@ js_DumpChars(const jschar *s, size_t n)
 JS_FRIEND_API(void)
 js_DumpObject(JSObject *obj)
 {
-    if (!obj) {
-        fprintf(stderr, "NULL\n");
-        return;
-    }
     obj->dump();
 }
 
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 4cb813bdcc7..95fa579d4a0 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -5348,7 +5348,6 @@ main(int argc, char **argv, char **envp)
     }
 
     op.setArgTerminatesOptions("script", true);
-    op.setArgCapturesRest("scriptArgs");
 
     switch (op.parseArgs(argc, argv)) {
       case OptionParser::ParseHelp:
diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp
index f8c5f30f293..1d7b7a676ce 100644
--- a/js/src/shell/jsoptparse.cpp
+++ b/js/src/shell/jsoptparse.cpp
@@ -59,14 +59,6 @@ OptionParser::setArgTerminatesOptions(const char *name, bool enabled)
     findArgument(name)->setTerminatesOptions(enabled);
 }
 
-void
-OptionParser::setArgCapturesRest(const char *name)
-{
-    MOZ_ASSERT(restArgument == -1, "only one argument may be set to capture the rest");
-    restArgument = findArgumentIndex(name);
-    MOZ_ASSERT(restArgument != -1, "unknown argument name passed to setArgCapturesRest");
-}
-
 OptionParser::Result
 OptionParser::error(const char *fmt, ...)
 {
@@ -358,17 +350,10 @@ OptionParser::parseArgs(int inputArgc, char **argv)
             /* Option. */
             Option *opt;
             if (arg[1] == '-') {
-                if (arg[2] == '\0') {
-                    /* End of options */
-                    optionsAllowed = false;
-                    nextArgument = restArgument;
-                    continue;
-                } else {
-                    /* Long option. */
-                    opt = findOption(arg + 2);
-                    if (!opt)
-                        return error("Invalid long option: %s", arg);
-                }
+                /* Long option. */
+                opt = findOption(arg + 2);
+                if (!opt)
+                    return error("Invalid long option: %s", arg);
             } else {
                 /* Short option */
                 if (arg[2] != '\0')
@@ -384,8 +369,12 @@ OptionParser::parseArgs(int inputArgc, char **argv)
             r = handleArg(argc, argv, &i, &optionsAllowed);
         }
 
-        if (r != Okay)
+        switch (r) {
+          case Okay:
+            break;
+          default:
             return r;
+        }
     }
     return Okay;
 }
@@ -509,29 +498,21 @@ OptionParser::findOption(const char *longflag) const
 
 /* Argument accessors */
 
-ssize_t
-OptionParser::findArgumentIndex(const char *name) const
-{
-    for (Option * const *it = arguments.begin(); it != arguments.end(); ++it) {
-        const char *target = (*it)->longflag;
-        if (strcmp(target, name) == 0)
-            return it - arguments.begin();
-    }
-    return -1;
-}
-
 Option *
 OptionParser::findArgument(const char *name)
 {
-    ssize_t index = findArgumentIndex(name);
-    return (index == -1) ? NULL : arguments[index];
+    for (Option **it = arguments.begin(), **end = arguments.end(); it != end; ++it) {
+        const char *target = (*it)->longflag;
+        if (strcmp(target, name) == 0)
+            return *it;
+    }
+    return NULL;
 }
 
 const Option *
 OptionParser::findArgument(const char *name) const
 {
-    ssize_t index = findArgumentIndex(name);
-    return (index == -1) ? NULL : arguments[index];
+    return const_cast<OptionParser *>(this)->findArgument(name);
 }
 
 const char *
diff --git a/js/src/shell/jsoptparse.h b/js/src/shell/jsoptparse.h
index 4a0e06f705f..b4bf5ba477a 100644
--- a/js/src/shell/jsoptparse.h
+++ b/js/src/shell/jsoptparse.h
@@ -211,17 +211,12 @@ class OptionParser
     size_t      helpWidth;
     size_t      nextArgument;
 
-    // If '--' is passed, all remaining arguments should be interpreted as the
-    // argument at index 'restArgument'. Defaults to the next unassigned argument.
-    ssize_t     restArgument;
-
     static const char prognameMeta[];
 
     Option *findOption(char shortflag);
     const Option *findOption(char shortflag) const;
     Option *findOption(const char *longflag);
     const Option *findOption(const char *longflag) const;
-    ssize_t findArgumentIndex(const char *name) const;
     Option *findArgument(const char *name);
     const Option *findArgument(const char *name) const;
 
@@ -233,8 +228,7 @@ class OptionParser
   public:
     explicit OptionParser(const char *usage)
       : helpOption('h', "help", "Display help information"),
-        usage(usage), ver(NULL), descr(NULL), descrWidth(80), helpWidth(80),
-        nextArgument(0), restArgument(-1)
+        usage(usage), ver(NULL), descr(NULL), descrWidth(80), helpWidth(80), nextArgument(0)
     {}
 
     ~OptionParser();
@@ -250,7 +244,6 @@ class OptionParser
     void setDescription(const char *description) { descr = description; }
     void setHelpOption(char shortflag, const char *longflag, const char *help);
     void setArgTerminatesOptions(const char *name, bool enabled);
-    void setArgCapturesRest(const char *name);
 
     /* Arguments: no further arguments may be added after a variadic argument. */
 
diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py
index 9e22e859e80..dee150e891f 100755
--- a/js/src/tests/jstests.py
+++ b/js/src/tests/jstests.py
@@ -89,8 +89,6 @@ def parse_args():
                           help='Example: --jitflags=m,amd to run each test with -m, -a -m -d [default=%default]')
     harness_og.add_option('-g', '--debug', action='store_true', help='Run a test in debugger.')
     harness_og.add_option('--debugger', default='gdb -q --args', help='Debugger command.')
-    harness_og.add_option('-J', '--jorendb', action='store_true', help='Run under JS debugger.')
-    harness_og.add_option('--passthrough', action='store_true', help='Run tests with stdin/stdout attached to caller.')
     harness_og.add_option('--valgrind', action='store_true', help='Run tests in valgrind.')
     harness_og.add_option('--valgrind-args', default='', help='Extra args to pass to valgrind.')
     op.add_option_group(harness_og)
@@ -155,15 +153,7 @@ def parse_args():
         if os.uname()[0] == 'Darwin':
             prefix.append('--dsymutil=yes')
         options.show_output = True
-
-    js_cmd_args = options.shell_args.split()
-    if options.jorendb:
-        options.passthrough = True
-        options.hide_progress = True
-        options.worker_count = 1
-        debugger_path = os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../../examples/jorendb.js")
-        js_cmd_args.extend([ '-d', '-f', debugger_path, '--' ])
-    TestCase.set_js_cmd_prefix(options.js_shell, js_cmd_args, prefix)
+    TestCase.set_js_cmd_prefix(options.js_shell, options.shell_args.split(), prefix)
 
     # If files with lists of tests to run were specified, add them to the
     # requested tests set.
diff --git a/js/src/tests/lib/tasks_unix.py b/js/src/tests/lib/tasks_unix.py
index f85578c314f..73ef257fb5c 100644
--- a/js/src/tests/lib/tasks_unix.py
+++ b/js/src/tests/lib/tasks_unix.py
@@ -17,26 +17,25 @@ class Task(object):
         self.out = []
         self.err = []
 
-def spawn_test(test, passthrough = False):
+def spawn_test(test):
     """Spawn one child, return a task struct."""
-    if not passthrough:
-        (rout, wout) = os.pipe()
-        (rerr, werr) = os.pipe()
+    (rout, wout) = os.pipe()
+    (rerr, werr) = os.pipe()
 
-        rv = os.fork()
+    rv = os.fork()
 
-        # Parent.
-        if rv:
-            os.close(wout)
-            os.close(werr)
-            return Task(test, rv, rout, rerr)
+    # Parent.
+    if rv:
+        os.close(wout)
+        os.close(werr)
+        return Task(test, rv, rout, rerr)
 
-        # Child.
-        os.close(rout)
-        os.close(rerr)
+    # Child.
+    os.close(rout)
+    os.close(rerr)
 
-        os.dup2(wout, 1)
-        os.dup2(werr, 2)
+    os.dup2(wout, 1)
+    os.dup2(werr, 2)
 
     cmd = test.get_command(test.js_cmd_prefix)
     os.execvp(cmd[0], cmd)
@@ -189,7 +188,7 @@ def run_all_tests(tests, results, options):
 
     while len(tests) or len(tasks):
         while len(tests) and len(tasks) < options.worker_count:
-            tasks.append(spawn_test(tests.pop(), options.passthrough))
+            tasks.append(spawn_test(tests.pop()))
 
         timeout = get_max_wait(tasks, results, options.timeout)
         read_input(tasks, timeout)

From 49977ba3acc4fe11db1c179dfa241391470cdc60 Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Fri, 17 May 2013 01:49:41 -0400
Subject: [PATCH 08/85] bug 873622 - speed up nsXPConnect::GetXPConnect() and
 rename it since it never returns null r=bholley

---
 caps/src/nsScriptSecurityManager.cpp         |  6 +-
 content/base/src/nsContentUtils.cpp          |  5 +-
 js/xpconnect/loader/mozJSComponentLoader.cpp | 14 +----
 js/xpconnect/src/XPCCallContext.cpp          |  4 +-
 js/xpconnect/src/XPCComponents.cpp           | 28 +++------
 js/xpconnect/src/XPCException.cpp            | 10 +--
 js/xpconnect/src/XPCJSContextStack.cpp       |  5 +-
 js/xpconnect/src/XPCJSID.cpp                 | 11 ++--
 js/xpconnect/src/XPCJSRuntime.cpp            | 13 ++--
 js/xpconnect/src/XPCJSWeakReference.cpp      |  2 +-
 js/xpconnect/src/XPCQuickStubs.cpp           |  2 +-
 js/xpconnect/src/XPCThrower.cpp              |  2 +-
 js/xpconnect/src/XPCVariant.cpp              |  5 +-
 js/xpconnect/src/XPCWrappedJSClass.cpp       |  8 +--
 js/xpconnect/src/nsCxPusher.cpp              | 15 ++---
 js/xpconnect/src/nsXPConnect.cpp             | 66 +++++++-------------
 js/xpconnect/src/xpcprivate.h                | 18 ++++--
 js/xpconnect/wrappers/XrayWrapper.cpp        |  2 +-
 18 files changed, 77 insertions(+), 139 deletions(-)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index b2d4a73807f..c6706697457 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -2422,11 +2422,7 @@ nsScriptSecurityManager::nsScriptSecurityManager(void)
 
 nsresult nsScriptSecurityManager::Init()
 {
-    nsXPConnect* xpconnect = nsXPConnect::GetXPConnect();
-     if (!xpconnect)
-        return NS_ERROR_FAILURE;
-
-    NS_ADDREF(sXPConnect = xpconnect);
+    NS_ADDREF(sXPConnect = nsXPConnect::XPConnect());
 
     JSContext* cx = GetSafeJSContext();
     if (!cx) return NS_ERROR_FAILURE;   // this can happen of xpt loading fails
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 858fb3e020f..f8dabdd427c 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -361,10 +361,7 @@ nsContentUtils::Init()
   nsresult rv = NS_GetNameSpaceManager(&sNameSpaceManager);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsXPConnect* xpconnect = nsXPConnect::GetXPConnect();
-  NS_ENSURE_TRUE(xpconnect, NS_ERROR_FAILURE);
-
-  sXPConnect = xpconnect;
+  sXPConnect = nsXPConnect::XPConnect();
 
   sSecurityManager = nsScriptSecurityManager::GetScriptSecurityManager();
   if(!sSecurityManager)
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index 2e789d747bf..b82aa6d42d3 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -262,12 +262,7 @@ File(JSContext *cx, unsigned argc, Value *vp)
         return false;
     }
 
-    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-    if (!xpc) {
-        XPCThrower::Throw(NS_ERROR_UNEXPECTED, cx);
-        return false;
-    }
-
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     JSObject* glob = JS_GetGlobalForScopeChain(cx);
 
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
@@ -302,12 +297,7 @@ Blob(JSContext *cx, unsigned argc, Value *vp)
         return false;
     }
 
-    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-    if (!xpc) {
-        XPCThrower::Throw(NS_ERROR_UNEXPECTED, cx);
-        return false;
-    }
-
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     JSObject* glob = JS_GetGlobalForScopeChain(cx);
 
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
diff --git a/js/xpconnect/src/XPCCallContext.cpp b/js/xpconnect/src/XPCCallContext.cpp
index 3dacd51d4a6..d40c6510fac 100644
--- a/js/xpconnect/src/XPCCallContext.cpp
+++ b/js/xpconnect/src/XPCCallContext.cpp
@@ -24,7 +24,7 @@ XPCCallContext::XPCCallContext(XPCContext::LangType callerLanguage,
                                jsval *argv         /* = nullptr               */,
                                jsval *rval         /* = nullptr               */)
     :   mState(INIT_FAILED),
-        mXPC(nsXPConnect::GetXPConnect()),
+        mXPC(nsXPConnect::XPConnect()),
         mXPCContext(nullptr),
         mJSContext(cx),
         mContextPopRequired(false),
@@ -48,7 +48,7 @@ XPCCallContext::XPCCallContext(XPCContext::LangType callerLanguage,
                                XPCWrappedNative* wrapper,
                                XPCWrappedNativeTearOff* tearOff)
     :   mState(INIT_FAILED),
-        mXPC(nsXPConnect::GetXPConnect()),
+        mXPC(nsXPConnect::XPConnect()),
         mXPCContext(nullptr),
         mJSContext(cx),
         mContextPopRequired(false),
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index ead0c542ff1..a1f4b66210a 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -65,10 +65,7 @@ JSValIsInterfaceOfType(JSContext *cx, HandleValue v, REFNSIID iid)
     if (v.isPrimitive())
         return false;
 
-    nsCOMPtr<nsIXPConnect> xpc = nsXPConnect::GetXPConnect();
-    if (!xpc)
-        return false;
-
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     RootedObject obj(cx, &v.toObject());
     if (NS_SUCCEEDED(xpc->GetWrappedNativeOfJSObject(cx, obj, getter_AddRefs(wn))) && wn &&
         NS_SUCCEEDED(wn->Native()->QueryInterface(iid, (void**)&iface)) && iface)
@@ -2808,9 +2805,8 @@ nsXPCComponents_Utils::ReportError(const JS::Value &errorArg, JSContext *cx)
         return NS_OK;
 
     nsCOMPtr<nsIStackFrame> frame;
-    nsXPConnect *xpc = nsXPConnect::GetXPConnect();
-    if (xpc)
-        xpc->GetCurrentJSStack(getter_AddRefs(frame));
+    nsXPConnect *xpc = nsXPConnect::XPConnect();
+    xpc->GetCurrentJSStack(getter_AddRefs(frame));
 
     nsXPIDLCString fileName;
     int32_t lineNo = 0;
@@ -3482,9 +3478,7 @@ GetPrincipalOrSOP(JSContext *cx, HandleObject from, nsISupports **out)
     MOZ_ASSERT(out);
     *out = NULL;
 
-    nsCOMPtr<nsIXPConnect> xpc = nsXPConnect::GetXPConnect();
-    if (!xpc)
-        return NS_ERROR_XPC_UNEXPECTED;
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
     xpc->GetWrappedNativeOfJSObject(cx, from,
                                     getter_AddRefs(wrapper));
@@ -3685,9 +3679,7 @@ AssembleSandboxMemoryReporterName(JSContext *cx, nsCString &sandboxName)
     if (sandboxName.IsEmpty())
         sandboxName = NS_LITERAL_CSTRING("[anonymous sandbox]");
 
-    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-    NS_ENSURE_TRUE(xpc, NS_ERROR_XPC_UNEXPECTED);
-
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     // Get the xpconnect native call context.
     nsAXPCNativeCallContext *cc = nullptr;
     xpc->GetCurrentNativeCallContext(&cc);
@@ -4424,9 +4416,9 @@ nsXPCComponents_Utils::Dispatch(const jsval &runnableArg, const jsval &scope,
         return NS_ERROR_INVALID_ARG;
 
     nsCOMPtr<nsIRunnable> run;
-    nsresult rv = nsXPConnect::GetXPConnect()->WrapJS(cx, &runnable.toObject(),
-                                                      NS_GET_IID(nsIRunnable),
-                                                      getter_AddRefs(run));
+    nsresult rv = nsXPConnect::XPConnect()->WrapJS(cx, &runnable.toObject(),
+                                                   NS_GET_IID(nsIRunnable),
+                                                   getter_AddRefs(run));
     NS_ENSURE_SUCCESS(rv, rv);
     MOZ_ASSERT(run);
 
@@ -4769,9 +4761,7 @@ NS_IMETHODIMP
 nsXPCComponents::GetStack(nsIStackFrame * *aStack)
 {
     nsresult rv;
-    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-    if (!xpc)
-        return NS_ERROR_FAILURE;
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     rv = xpc->GetCurrentJSStack(aStack);
     return rv;
 }
diff --git a/js/xpconnect/src/XPCException.cpp b/js/xpconnect/src/XPCException.cpp
index ff90eea0da8..e01d9de53f9 100644
--- a/js/xpconnect/src/XPCException.cpp
+++ b/js/xpconnect/src/XPCException.cpp
@@ -297,9 +297,7 @@ nsXPCException::Initialize(const char *aMessage, nsresult aResult, const char *a
             return rc;
     } else {
         nsresult rv;
-        nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-        if (!xpc)
-            return NS_ERROR_FAILURE;
+        nsXPConnect* xpc = nsXPConnect::XPConnect();
         rv = xpc->GetCurrentJSStack(&mLocation);
         if (NS_FAILED(rv))
             return rv;
@@ -400,11 +398,7 @@ nsXPCException::NewException(const char *aMessage,
             location = aLocation;
             NS_ADDREF(location);
         } else {
-            nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-            if (!xpc) {
-                NS_RELEASE(e);
-                return NS_ERROR_FAILURE;
-            }
+            nsXPConnect* xpc = nsXPConnect::XPConnect();
             rv = xpc->GetCurrentJSStack(&location);
             if (NS_FAILED(rv)) {
                 NS_RELEASE(e);
diff --git a/js/xpconnect/src/XPCJSContextStack.cpp b/js/xpconnect/src/XPCJSContextStack.cpp
index 6abb9dcb687..142cf4ff539 100644
--- a/js/xpconnect/src/XPCJSContextStack.cpp
+++ b/js/xpconnect/src/XPCJSContextStack.cpp
@@ -147,10 +147,7 @@ XPCJSContextStack::GetSafeJSContext()
     if (NS_FAILED(rv))
         return NULL;
 
-    nsRefPtr<nsXPConnect> xpc = nsXPConnect::GetXPConnect();
-    if (!xpc)
-        return NULL;
-
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     XPCJSRuntime* xpcrt = xpc->GetRuntime();
     if (!xpcrt)
         return NULL;
diff --git a/js/xpconnect/src/XPCJSID.cpp b/js/xpconnect/src/XPCJSID.cpp
index 104a33b8a27..bb8979fd47c 100644
--- a/js/xpconnect/src/XPCJSID.cpp
+++ b/js/xpconnect/src/XPCJSID.cpp
@@ -714,10 +714,7 @@ static void
 GetWrapperObject(MutableHandleObject obj)
 {
     obj.set(NULL);
-    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-    if (!xpc)
-        return;
-
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     nsAXPCNativeCallContext *ccxp = NULL;
     xpc->GetCurrentNativeCallContext(&ccxp);
     if (!ccxp)
@@ -769,7 +766,7 @@ nsJSCID::CreateInstance(const JS::Value& iidval, JSContext* cx,
     if (NS_FAILED(rv) || !inst)
         return NS_ERROR_XPC_CI_RETURNED_FAILURE;
 
-    rv = nsXPConnect::GetXPConnect()->WrapNativeToJSVal(cx, obj, inst, nullptr, iid, true, retval, nullptr);
+    rv = nsXPConnect::XPConnect()->WrapNativeToJSVal(cx, obj, inst, nullptr, iid, true, retval, nullptr);
     if (NS_FAILED(rv) || JSVAL_IS_PRIMITIVE(*retval))
         return NS_ERROR_XPC_CANT_CREATE_WN;
     return NS_OK;
@@ -818,7 +815,7 @@ nsJSCID::GetService(const JS::Value& iidval, JSContext* cx,
 
     RootedObject instJSObj(cx);
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-    rv = nsXPConnect::GetXPConnect()->WrapNative(cx, obj, srvc, *iid, getter_AddRefs(holder));
+    rv = nsXPConnect::XPConnect()->WrapNative(cx, obj, srvc, *iid, getter_AddRefs(holder));
     if (NS_FAILED(rv) || !holder ||
         // Assign, not compare
         !(instJSObj = holder->GetJSObject()))
@@ -895,7 +892,7 @@ xpc_NewIDObject(JSContext *cx, HandleObject jsobj, const nsID& aID)
     nsCOMPtr<nsIJSID> iid =
             dont_AddRef(static_cast<nsIJSID*>(nsJSID::NewID(aID)));
     if (iid) {
-        nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+        nsXPConnect* xpc = nsXPConnect::XPConnect();
         if (xpc) {
             nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
             nsresult rv = xpc->WrapNative(cx, jsobj,
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 494834ef0e0..930f46173c6 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -608,9 +608,8 @@ XPCJSRuntime::UnmarkSkippableJSHolders()
 void
 xpc_UnmarkSkippableJSHolders()
 {
-    if (nsXPConnect::GetXPConnect() &&
-        nsXPConnect::GetXPConnect()->GetRuntime()) {
-        nsXPConnect::GetXPConnect()->GetRuntime()->UnmarkSkippableJSHolders();
+    if (nsXPConnect::XPConnect()->GetRuntime()) {
+        nsXPConnect::XPConnect()->GetRuntime()->UnmarkSkippableJSHolders();
     }
 }
 
@@ -2259,7 +2258,7 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
 
     virtual void initExtraZoneStats(JS::Zone *zone, JS::ZoneStats *zStats) MOZ_OVERRIDE {
         // Get the compartment's global.
-        nsXPConnect *xpc = nsXPConnect::GetXPConnect();
+        nsXPConnect *xpc = nsXPConnect::XPConnect();
         AutoSafeJSContext cx;
         JSCompartment *comp = js::GetAnyCompartmentInZone(zone);
         xpc::ZoneStatsExtras *extras = new xpc::ZoneStatsExtras;
@@ -2292,7 +2291,7 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
         GetCompartmentName(c, cName, true);
 
         // Get the compartment's global.
-        nsXPConnect *xpc = nsXPConnect::GetXPConnect();
+        nsXPConnect *xpc = nsXPConnect::XPConnect();
         AutoSafeJSContext cx;
         bool needZone = true;
         RootedObject global(cx, JS_GetGlobalForCompartmentOrNull(cx, c));
@@ -3004,8 +3003,8 @@ XPCRootSetElem::AddToRootSet(XPCLock *lock, XPCRootSetElem **listHead)
 void
 XPCRootSetElem::RemoveFromRootSet(XPCLock *lock)
 {
-    if (nsXPConnect *xpc = nsXPConnect::GetXPConnect())
-        JS::PokeGC(xpc->GetRuntime()->GetJSRuntime());
+    nsXPConnect *xpc = nsXPConnect::XPConnect();
+    JS::PokeGC(xpc->GetRuntime()->GetJSRuntime());
 
     NS_ASSERTION(mSelfp, "Must be linked");
 
diff --git a/js/xpconnect/src/XPCJSWeakReference.cpp b/js/xpconnect/src/XPCJSWeakReference.cpp
index 168fb40fd0a..2e4c22674e1 100644
--- a/js/xpconnect/src/XPCJSWeakReference.cpp
+++ b/js/xpconnect/src/XPCJSWeakReference.cpp
@@ -25,7 +25,7 @@ nsresult xpcJSWeakReference::Init(JSContext* cx, const JS::Value& object)
 
     // See if the object is a wrapped native that supports weak references.
     nsISupports* supports =
-        nsXPConnect::GetXPConnect()->GetNativeOfWrapper(cx, obj);
+        nsXPConnect::XPConnect()->GetNativeOfWrapper(cx, obj);
     nsCOMPtr<nsISupportsWeakReference> supportsWeakRef =
         do_QueryInterface(supports);
     if (supportsWeakRef) {
diff --git a/js/xpconnect/src/XPCQuickStubs.cpp b/js/xpconnect/src/XPCQuickStubs.cpp
index f3104d47ee6..d9efa5e051f 100644
--- a/js/xpconnect/src/XPCQuickStubs.cpp
+++ b/js/xpconnect/src/XPCQuickStubs.cpp
@@ -65,7 +65,7 @@ LookupInterfaceOrAncestor(uint32_t tableSize, const xpc_qsHashEntry *table,
          * supports, including ancestors.
          */
         nsCOMPtr<nsIInterfaceInfo> info;
-        if (NS_FAILED(nsXPConnect::GetXPConnect()->GetInfoForIID(&iid, getter_AddRefs(info))))
+        if (NS_FAILED(nsXPConnect::XPConnect()->GetInfoForIID(&iid, getter_AddRefs(info))))
             return nullptr;
 
         const nsIID *piid;
diff --git a/js/xpconnect/src/XPCThrower.cpp b/js/xpconnect/src/XPCThrower.cpp
index 5248cd4ccbc..2f49f006942 100644
--- a/js/xpconnect/src/XPCThrower.cpp
+++ b/js/xpconnect/src/XPCThrower.cpp
@@ -241,7 +241,7 @@ XPCThrower::ThrowExceptionObject(JSContext* cx, nsIException* e)
                 return false;
             JS_SetPendingException(cx, thrown);
             success = true;
-        } else if ((xpc = nsXPConnect::GetXPConnect())) {
+        } else if ((xpc = nsXPConnect::XPConnect())) {
             JS::RootedObject glob(cx, JS_GetGlobalForScopeChain(cx));
             if (!glob)
                 return false;
diff --git a/js/xpconnect/src/XPCVariant.cpp b/js/xpconnect/src/XPCVariant.cpp
index d42e17c2be2..bb59a377888 100644
--- a/js/xpconnect/src/XPCVariant.cpp
+++ b/js/xpconnect/src/XPCVariant.cpp
@@ -350,12 +350,11 @@ JSBool XPCVariant::InitializeData(JSContext* cx)
 
     // XXX This could be smarter and pick some more interesting iface.
 
-    nsXPConnect*  xpc;
+    nsXPConnect*  xpc = nsXPConnect::XPConnect();
     nsCOMPtr<nsISupports> wrapper;
     const nsIID& iid = NS_GET_IID(nsISupports);
 
-    return nullptr != (xpc = nsXPConnect::GetXPConnect()) &&
-           NS_SUCCEEDED(xpc->WrapJS(cx, jsobj,
+    return NS_SUCCEEDED(xpc->WrapJS(cx, jsobj,
                                     iid, getter_AddRefs(wrapper))) &&
            NS_SUCCEEDED(nsVariant::SetFromInterface(&mData, iid, wrapper));
 }
diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index c447002cea7..f22d62a4d24 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -125,7 +125,7 @@ nsXPCWrappedJSClass::GetNewOrUsed(JSContext* cx, REFNSIID aIID,
 
     if (!clazz) {
         nsCOMPtr<nsIInterfaceInfo> info;
-        nsXPConnect::GetXPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
+        nsXPConnect::XPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
         if (info) {
             bool canScript, isBuiltin;
             if (NS_SUCCEEDED(info->IsScriptable(&canScript)) && canScript &&
@@ -240,7 +240,7 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
     // We so often ask for nsISupports that we can short-circuit the test...
     if (!aIID.Equals(NS_GET_IID(nsISupports))) {
         nsCOMPtr<nsIInterfaceInfo> info;
-        nsXPConnect::GetXPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
+        nsXPConnect::XPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
         if (!info)
             return nullptr;
         bool canScript, isBuiltin;
@@ -276,7 +276,7 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
                     // C++ QI failure. See if that is the case.
                     nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
 
-                    nsXPConnect::GetXPConnect()->
+                    nsXPConnect::XPConnect()->
                         GetWrappedNativeOfJSObject(cx,
                                                    &jsexception.toObject(),
                                                    getter_AddRefs(wrapper));
@@ -684,7 +684,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
 
         *aInstancePtr = nullptr;
 
-        nsXPConnect *xpc = nsXPConnect::GetXPConnect();
+        nsXPConnect *xpc = nsXPConnect::XPConnect();
         nsCOMPtr<nsIScriptSecurityManager> secMan =
             do_QueryInterface(xpc->GetDefaultSecurityManager());
         if (!secMan)
diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp
index 48637662fdb..398b5999254 100644
--- a/js/xpconnect/src/nsCxPusher.cpp
+++ b/js/xpconnect/src/nsCxPusher.cpp
@@ -117,13 +117,7 @@ nsCxPusher::Push(JSContext *cx)
 void
 nsCxPusher::DoPush(JSContext* cx)
 {
-  nsIXPConnect *xpc = nsXPConnect::GetXPConnect();
-  if (!xpc) {
-    // If someone tries to push a cx when we don't have the relevant state,
-    // it's probably safest to just crash.
-    MOZ_CRASH();
-  }
-
+  nsXPConnect *xpc = nsXPConnect::XPConnect();
   // NB: The GetDynamicScriptContext is historical and might not be sane.
   if (cx && nsJSUtils::GetDynamicScriptContext(cx) &&
       xpc::IsJSContextOnStack(cx))
@@ -171,7 +165,6 @@ nsCxPusher::Pop()
 
     return;
   }
-  MOZ_ASSERT(nsXPConnect::GetXPConnect());
 
   // Leave the request before popping.
   mAutoRequest.destroyIfConstructed();
@@ -184,7 +177,7 @@ nsCxPusher::Pop()
   MOZ_ASSERT_IF(mPushedContext, mCompartmentDepthOnEntry ==
                                 js::GetEnterCompartmentDepth(mPushedContext));
   DebugOnly<JSContext*> stackTop;
-  MOZ_ASSERT(mPushedContext == nsXPConnect::GetXPConnect()->GetCurrentJSContext());
+  MOZ_ASSERT(mPushedContext == nsXPConnect::XPConnect()->GetCurrentJSContext());
   xpc::PopJSContext();
 
   if (!mScriptIsRunning && mScx) {
@@ -220,7 +213,7 @@ AutoJSContext::Init(bool aSafe MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
 
   MOZ_GUARD_OBJECT_NOTIFIER_INIT;
 
-  nsIXPConnect *xpc = nsXPConnect::GetXPConnect();
+  nsXPConnect *xpc = nsXPConnect::XPConnect();
   if (!aSafe) {
     mCx = xpc->GetCurrentJSContext();
   }
@@ -243,7 +236,7 @@ AutoSafeJSContext::AutoSafeJSContext(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMP
 
 AutoPushJSContext::AutoPushJSContext(JSContext *aCx) : mCx(aCx)
 {
-  if (mCx && mCx != nsXPConnect::GetXPConnect()->GetCurrentJSContext()) {
+  if (mCx && mCx != nsXPConnect::XPConnect()->GetCurrentJSContext()) {
     mPusher.Push(mCx);
   }
 }
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index cc8d6c02cd2..9b3481b15a2 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -137,48 +137,29 @@ nsXPConnect::~nsXPConnect()
 }
 
 // static
-nsXPConnect*
-nsXPConnect::GetXPConnect()
-{
-    // Do a release-mode assert that we're not doing anything significant in
-    // XPConnect off the main thread. If you're an extension developer hitting
-    // this, you need to change your code. See bug 716167.
-    if (!MOZ_LIKELY(NS_IsMainThread() || NS_IsCycleCollectorThread()))
-        MOZ_CRASH();
-
-    if (!gSelf) {
-        if (gOnceAliveNowDead)
-            return nullptr;
-        gSelf = new nsXPConnect();
-        if (!gSelf)
-            return nullptr;
-
-        if (!gSelf->mRuntime) {
-            NS_RUNTIMEABORT("Couldn't create XPCJSRuntime.");
-        }
-
-        // Initial extra ref to keep the singleton alive
-        // balanced by explicit call to ReleaseXPConnectSingleton()
-        NS_ADDREF(gSelf);
-
-        // Set XPConnect as the main thread observer.
-        //
-        // The cycle collector sometimes calls GetXPConnect, but it should never
-        // be the one that initializes gSelf.
-        MOZ_ASSERT(NS_IsMainThread());
-        if (NS_FAILED(nsThread::SetMainThreadObserver(gSelf))) {
-            NS_RELEASE(gSelf);
-            // Fall through to returning null
-        }
+void
+    nsXPConnect::InitStatics()
+    {
+    gSelf = new nsXPConnect();
+    gOnceAliveNowDead = false;
+    if (!gSelf->mRuntime) {
+        NS_RUNTIMEABORT("Couldn't create XPCJSRuntime.");
+    }
+
+    // Initial extra ref to keep the singleton alive
+    // balanced by explicit call to ReleaseXPConnectSingleton()
+    NS_ADDREF(gSelf);
+
+    // Set XPConnect as the main thread observer.
+    if (NS_FAILED(nsThread::SetMainThreadObserver(gSelf))) {
+        MOZ_CRASH();
     }
-    return gSelf;
 }
 
-// static
 nsXPConnect*
 nsXPConnect::GetSingleton()
 {
-    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     NS_IF_ADDREF(xpc);
     return xpc;
 }
@@ -230,8 +211,7 @@ nsXPConnect::ReleaseXPConnectSingleton()
 XPCJSRuntime*
 nsXPConnect::GetRuntimeInstance()
 {
-    nsXPConnect* xpc = GetXPConnect();
-    NS_ASSERTION(xpc, "Must not be called if XPC failed to initialize");
+    nsXPConnect* xpc = XPConnect();
     return xpc->GetRuntime();
 }
 
@@ -2052,7 +2032,7 @@ NS_EXPORT_(void)
 xpc_ActivateDebugMode()
 {
     XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
-    nsXPConnect::GetXPConnect()->SetDebugModeWhenPossible(true, true);
+    nsXPConnect::XPConnect()->SetDebugModeWhenPossible(true, true);
     nsXPConnect::CheckForDebugMode(rt->GetJSRuntime());
 }
 
@@ -2077,7 +2057,7 @@ bool
 PushJSContext(JSContext *aCx)
 {
     // JSD mumbo jumbo.
-    nsXPConnect *xpc = nsXPConnect::GetXPConnect();
+    nsXPConnect *xpc = nsXPConnect::XPConnect();
     JSRuntime *rt = XPCJSRuntime::Get()->GetJSRuntime();
     if (xpc::gDebugMode != xpc::gDesiredDebugMode) {
         if (!xpc::gDesiredDebugMode) {
@@ -2252,11 +2232,7 @@ void
 DumpJSHeap(FILE* file)
 {
     NS_ABORT_IF_FALSE(NS_IsMainThread(), "Must dump GC heap on main thread.");
-    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-    if (!xpc) {
-        NS_ERROR("Failed to get nsXPConnect instance!");
-        return;
-    }
+    nsXPConnect* xpc = nsXPConnect::XPConnect();
     js::DumpHeapComplete(xpc->GetRuntime()->GetJSRuntime(), file);
 }
 
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 24a03b94b01..489159bd2d6 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -476,8 +476,18 @@ public:
     // non-interface implementation
 public:
     // These get non-addref'd pointers
-    static nsXPConnect*  GetXPConnect();
-    static nsXPConnect*  FastGetXPConnect() { return gSelf ? gSelf : GetXPConnect(); }
+    static nsXPConnect*  XPConnect()
+    {
+        // Do a release-mode assert that we're not doing anything significant in
+        // XPConnect off the main thread. If you're an extension developer hitting
+        // this, you need to change your code. See bug 716167.
+        if (!MOZ_LIKELY(NS_IsMainThread() || NS_IsCycleCollectorThread()))
+            MOZ_CRASH();
+
+        return gSelf;
+    }
+
+    static nsXPConnect*  FastGetXPConnect() { return gSelf ? gSelf : XPConnect(); }
     static XPCJSRuntime* GetRuntimeInstance();
     XPCJSRuntime* GetRuntime() {return mRuntime;}
 
@@ -506,7 +516,7 @@ public:
     static nsXPConnect* GetSingleton();
 
     // Called by module code in dll startup
-    static void InitStatics() { gSelf = nullptr; gOnceAliveNowDead = false; }
+    static void InitStatics();
     // Called by module code on dll shutdown.
     static void ReleaseXPConnectSingleton();
 
@@ -644,7 +654,7 @@ class XPCJSRuntime
 {
 public:
     static XPCJSRuntime* newXPCJSRuntime(nsXPConnect* aXPConnect);
-    static XPCJSRuntime* Get() { return nsXPConnect::GetXPConnect()->GetRuntime(); }
+    static XPCJSRuntime* Get() { return nsXPConnect::XPConnect()->GetRuntime(); }
 
     JSRuntime*     GetJSRuntime() const {return mJSRuntime;}
     nsXPConnect*   GetXPConnect() const {return mXPConnect;}
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index d7a4a07236a..00d6251c1d9 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1935,7 +1935,7 @@ do_QueryInterfaceNative(JSContext* cx, HandleObject wrapper)
             nativeSupports = wn->Native();
         }
     } else {
-        nsIXPConnect *xpc = nsXPConnect::GetXPConnect();
+        nsIXPConnect *xpc = nsXPConnect::XPConnect();
         nativeSupports = xpc->GetNativeOfWrapper(cx, wrapper);
     }
 

From 47624dbb89b9a829a08cde7e29b1b73aacd19af1 Mon Sep 17 00:00:00 2001
From: Kannan Vijayan <kvijayan@mozilla.com>
Date: Thu, 30 May 2013 17:38:49 -0400
Subject: [PATCH 09/85] Bug 831507 - Add generational-gc post-write barriers to
 baseline compiler. r=jandem

---
 js/src/gc/Nursery.h             |   4 +
 js/src/ion/BaselineCompiler.cpp |  94 ++++++++++++--
 js/src/ion/BaselineCompiler.h   |   8 ++
 js/src/ion/BaselineHelpers.h    |   4 +-
 js/src/ion/BaselineIC.cpp       | 217 ++++++++++++++++++++++++--------
 js/src/ion/BaselineIC.h         |   9 +-
 6 files changed, 272 insertions(+), 64 deletions(-)

diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h
index 274ae09f707..d4f4bf1fd73 100644
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -27,6 +27,8 @@ class MinorCollectionTracer;
 namespace ion {
 class CodeGenerator;
 class MacroAssembler;
+class ICStubCompiler;
+class BaselineCompiler;
 }
 
 class Nursery
@@ -189,6 +191,8 @@ class Nursery
     friend class gc::MinorCollectionTracer;
     friend class ion::CodeGenerator;
     friend class ion::MacroAssembler;
+    friend class ion::ICStubCompiler;
+    friend class ion::BaselineCompiler;
 };
 
 } /* namespace js */
diff --git a/js/src/ion/BaselineCompiler.cpp b/js/src/ion/BaselineCompiler.cpp
index 5c5b30a6be6..42de6bb7691 100644
--- a/js/src/ion/BaselineCompiler.cpp
+++ b/js/src/ion/BaselineCompiler.cpp
@@ -23,6 +23,9 @@ using namespace js::ion;
 BaselineCompiler::BaselineCompiler(JSContext *cx, HandleScript script)
   : BaselineCompilerSpecific(cx, script),
     return_(new HeapLabel())
+#ifdef JSGC_GENERATIONAL
+    , postBarrierSlot_(new HeapLabel())
+#endif
 {
 }
 
@@ -90,6 +93,11 @@ BaselineCompiler::compile()
     if (!emitEpilogue())
         return Method_Error;
 
+#ifdef JSGC_GENERATIONAL
+    if (!emitOutOfLinePostBarrierSlot())
+        return Method_Error;
+#endif
+
     if (masm.oom())
         return Method_Error;
 
@@ -264,6 +272,40 @@ BaselineCompiler::emitEpilogue()
     return true;
 }
 
+#ifdef JSGC_GENERATIONAL
+// On input:
+//  R2.scratchReg() contains object being written to.
+//  R1.scratchReg() contains slot index being written to.
+//  Otherwise, baseline stack will be synced, so all other registers are usable as scratch.
+// This calls:
+//    void PostWriteBarrier(JSRuntime *rt, JSObject *obj);
+bool
+BaselineCompiler::emitOutOfLinePostBarrierSlot()
+{
+    masm.bind(postBarrierSlot_);
+
+    Register objReg = R2.scratchReg();
+    GeneralRegisterSet regs(GeneralRegisterSet::All());
+    regs.take(objReg);
+    regs.take(BaselineFrameReg);
+    Register scratch = regs.takeAny();
+#if defined(JS_CPU_ARM)
+    // On ARM, save the link register before calling.  It contains the return
+    // address.  The |masm.ret()| later will pop this into |pc| to return.
+    masm.push(lr);
+#endif
+
+    masm.setupUnalignedABICall(2, scratch);
+    masm.movePtr(ImmWord(cx->runtime), scratch);
+    masm.passABIArg(scratch);
+    masm.passABIArg(objReg);
+    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, PostWriteBarrier));
+
+    masm.ret();
+    return true;
+}
+#endif // JSGC_GENERATIONAL
+
 bool
 BaselineCompiler::emitIC(ICStub *stub, bool isForOp)
 {
@@ -1676,23 +1718,36 @@ BaselineCompiler::emit_JSOP_DELPROP()
     return true;
 }
 
-Address
-BaselineCompiler::getScopeCoordinateAddress(Register reg)
+void
+BaselineCompiler::getScopeCoordinateObject(Register reg)
 {
     ScopeCoordinate sc(pc);
 
     masm.loadPtr(frame.addressOfScopeChain(), reg);
     for (unsigned i = sc.hops; i; i--)
         masm.extractObject(Address(reg, ScopeObject::offsetOfEnclosingScope()), reg);
+}
 
+Address
+BaselineCompiler::getScopeCoordinateAddressFromObject(Register objReg, Register reg)
+{
+    ScopeCoordinate sc(pc);
     Shape *shape = ScopeCoordinateToStaticScopeShape(cx, script, pc);
+
     Address addr;
     if (shape->numFixedSlots() <= sc.slot) {
-        masm.loadPtr(Address(reg, JSObject::offsetOfSlots()), reg);
+        masm.loadPtr(Address(objReg, JSObject::offsetOfSlots()), reg);
         return Address(reg, (sc.slot - shape->numFixedSlots()) * sizeof(Value));
     }
 
-    return Address(reg, JSObject::getFixedSlotOffset(sc.slot));
+    return Address(objReg, JSObject::getFixedSlotOffset(sc.slot));
+}
+
+Address
+BaselineCompiler::getScopeCoordinateAddress(Register reg)
+{
+    getScopeCoordinateObject(reg);
+    return getScopeCoordinateAddressFromObject(reg, reg);
 }
 
 bool
@@ -1720,13 +1775,34 @@ BaselineCompiler::emit_JSOP_CALLALIASEDVAR()
 bool
 BaselineCompiler::emit_JSOP_SETALIASEDVAR()
 {
-    // Sync everything except the top value, so that we can use R0 as scratch
-    // (storeValue does not touch it if the top value is in R0).
-    frame.syncStack(1);
+    // Keep rvalue in R0.
+    frame.popRegsAndSync(1);
+    Register objReg = R2.scratchReg();
 
-    Address address = getScopeCoordinateAddress(R2.scratchReg());
+    getScopeCoordinateObject(objReg);
+    Address address = getScopeCoordinateAddressFromObject(objReg, R1.scratchReg());
     masm.patchableCallPreBarrier(address, MIRType_Value);
-    storeValue(frame.peek(-1), address, R0);
+    masm.storeValue(R0, address);
+    frame.push(R0);
+
+#ifdef JSGC_GENERATIONAL
+    // Fully sync the stack if post-barrier is needed.
+    // Scope coordinate object is already in R2.scratchReg().
+    frame.syncStack(0);
+
+    Nursery &nursery = cx->runtime->gcNursery;
+    Label skipBarrier;
+    Label isTenured;
+    masm.branchTestObject(Assembler::NotEqual, R0, &skipBarrier);
+    masm.branchPtr(Assembler::Below, objReg, ImmWord(nursery.start()), &isTenured);
+    masm.branchPtr(Assembler::Below, objReg, ImmWord(nursery.end()), &skipBarrier);
+
+    masm.bind(&isTenured);
+    masm.call(postBarrierSlot_);
+
+    masm.bind(&skipBarrier);
+#endif
+
     return true;
 }
 
diff --git a/js/src/ion/BaselineCompiler.h b/js/src/ion/BaselineCompiler.h
index 67c901ab9a6..93e8c2ccf28 100644
--- a/js/src/ion/BaselineCompiler.h
+++ b/js/src/ion/BaselineCompiler.h
@@ -176,6 +176,9 @@ class BaselineCompiler : public BaselineCompilerSpecific
 {
     FixedList<Label>            labels_;
     HeapLabel *                 return_;
+#ifdef JSGC_GENERATIONAL
+    HeapLabel *                 postBarrierSlot_;
+#endif
 
     // Native code offset right before the scope chain is initialized.
     CodeOffsetLabel prologueOffset_;
@@ -195,6 +198,9 @@ class BaselineCompiler : public BaselineCompilerSpecific
 
     bool emitPrologue();
     bool emitEpilogue();
+#ifdef JSGC_GENERATIONAL
+    bool emitOutOfLinePostBarrierSlot();
+#endif
     bool emitIC(ICStub *stub, bool isForOp);
     bool emitOpIC(ICStub *stub) {
         return emitIC(stub, true);
@@ -246,6 +252,8 @@ class BaselineCompiler : public BaselineCompilerSpecific
 
     bool addPCMappingEntry(bool addIndexEntry);
 
+    void getScopeCoordinateObject(Register reg);
+    Address getScopeCoordinateAddressFromObject(Register objReg, Register reg);
     Address getScopeCoordinateAddress(Register reg);
 };
 
diff --git a/js/src/ion/BaselineHelpers.h b/js/src/ion/BaselineHelpers.h
index 1c2bd3dc006..795ef4b7447 100644
--- a/js/src/ion/BaselineHelpers.h
+++ b/js/src/ion/BaselineHelpers.h
@@ -11,8 +11,10 @@
 # include "x86/BaselineHelpers-x86.h"
 #elif defined(JS_CPU_X64)
 # include "x64/BaselineHelpers-x64.h"
-#else
+#elif defined(JS_CPU_ARM)
 # include "arm/BaselineHelpers-arm.h"
+#else
+# error "Unknown architecture!"
 #endif
 
 namespace js {
diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp
index 93292f5d4af..b3b36c7ca99 100644
--- a/js/src/ion/BaselineIC.cpp
+++ b/js/src/ion/BaselineIC.cpp
@@ -638,6 +638,37 @@ ICStubCompiler::guardProfilingEnabled(MacroAssembler &masm, Register scratch, La
     masm.branch32(Assembler::Equal, AbsoluteAddress(enabledAddr), Imm32(0), skip);
 }
 
+#ifdef JSGC_GENERATIONAL
+inline bool
+ICStubCompiler::emitPostWriteBarrierSlot(MacroAssembler &masm, Register obj, Register scratch,
+                                         GeneralRegisterSet saveRegs)
+{
+    Nursery &nursery = cx->runtime->gcNursery;
+
+    Label skipBarrier;
+    Label isTenured;
+    masm.branchPtr(Assembler::Below, obj, ImmWord(nursery.start()), &isTenured);
+    masm.branchPtr(Assembler::Below, obj, ImmWord(nursery.end()), &skipBarrier);
+    masm.bind(&isTenured);
+
+    // void PostWriteBarrier(JSRuntime *rt, JSObject *obj);
+#ifdef JS_CPU_ARM
+    saveRegs.add(BaselineTailCallReg);
+#endif
+    saveRegs = GeneralRegisterSet::Intersect(saveRegs, GeneralRegisterSet::Volatile());
+    masm.PushRegsInMask(saveRegs);
+    masm.setupUnalignedABICall(2, scratch);
+    masm.movePtr(ImmWord(cx->runtime), scratch);
+    masm.passABIArg(scratch);
+    masm.passABIArg(obj);
+    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, PostWriteBarrier));
+    masm.PopRegsInMask(saveRegs);
+
+    masm.bind(&skipBarrier);
+    return true;
+}
+#endif // JSGC_GENERATIONAL
+
 //
 // UseCount_Fallback
 //
@@ -4324,12 +4355,13 @@ ICSetElem_Dense::Compiler::generateStubCode(MacroAssembler &masm)
     regs = availableGeneralRegs(2);
     scratchReg = regs.takeAny();
 
+    // Unbox object and key.
+    obj = masm.extractObject(R0, ExtractTemp0);
+    Register key = masm.extractInt32(R1, ExtractTemp1);
+
     // Load obj->elements in scratchReg.
     masm.loadPtr(Address(obj, JSObject::offsetOfElements()), scratchReg);
 
-    // Unbox key.
-    Register key = masm.extractInt32(R1, ExtractTemp1);
-
     // Bounds check.
     Address initLength(scratchReg, ObjectElements::offsetOfInitializedLength());
     masm.branch32(Assembler::BelowOrEqual, initLength, key, &failure);
@@ -4338,32 +4370,50 @@ ICSetElem_Dense::Compiler::generateStubCode(MacroAssembler &masm)
     BaseIndex element(scratchReg, key, TimesEight);
     masm.branchTestMagic(Assembler::Equal, element, &failure);
 
+    // Failure is not possible now.  Free up registers.
+    regs.add(R0);
+    regs.add(R1);
+    regs.takeUnchecked(obj);
+    regs.takeUnchecked(key);
+    Address valueAddr(BaselineStackReg, ICStackValueOffset);
+
     // Convert int32 values to double if convertDoubleElements is set. In this
     // case the heap typeset is guaranteed to contain both int32 and double, so
     // it's okay to store a double.
-    Label convertDoubles, convertDoublesDone;
+    Label dontConvertDoubles;
     Address elementsFlags(scratchReg, ObjectElements::offsetOfFlags());
-    masm.branchTest32(Assembler::NonZero, elementsFlags,
+    masm.branchTest32(Assembler::Zero, elementsFlags,
                       Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS),
-                      &convertDoubles);
-    masm.bind(&convertDoublesDone);
-
-    // It's safe to overwrite R0 now.
-    Address valueAddr(BaselineStackReg, ICStackValueOffset);
-    masm.loadValue(valueAddr, R0);
-    EmitPreBarrier(masm, element, MIRType_Value);
-    masm.storeValue(R0, element);
-    EmitReturnFromIC(masm);
-
-    // Convert to double and jump back. Note that double arrays are only
-    // created by IonMonkey, so if we have no floating-point support
-    // Ion is disabled and there should be no double arrays.
-    masm.bind(&convertDoubles);
+                      &dontConvertDoubles);
+    // Note that double arrays are only created by IonMonkey, so if we have no
+    // floating-point support Ion is disabled and there should be no double arrays.
     if (cx->runtime->jitSupportsFloatingPoint)
-        masm.convertInt32ValueToDouble(valueAddr, R0.scratchReg(), &convertDoublesDone);
+        masm.convertInt32ValueToDouble(valueAddr, regs.getAny(), &dontConvertDoubles);
     else
         masm.breakpoint();
-    masm.jump(&convertDoublesDone);
+    masm.bind(&dontConvertDoubles);
+
+    // Don't overwrite R0 becuase |obj| might overlap with it, and it's needed
+    // for post-write barrier later.
+    ValueOperand tmpVal = regs.takeAnyValue();
+    masm.loadValue(valueAddr, tmpVal);
+    EmitPreBarrier(masm, element, MIRType_Value);
+    masm.storeValue(tmpVal, element);
+    regs.add(key);
+    regs.add(tmpVal);
+#ifdef JSGC_GENERATIONAL
+    Label skipBarrier;
+    masm.branchTestObject(Assembler::NotEqual, tmpVal, &skipBarrier);
+    {
+        Register r = regs.takeAny();
+        GeneralRegisterSet saveRegs;
+        emitPostWriteBarrierSlot(masm, obj, r, saveRegs);
+        regs.add(r);
+    }
+    masm.bind(&skipBarrier);
+#endif
+    EmitReturnFromIC(masm);
+
 
     // Failure case - fail but first unstow R0 and R1
     masm.bind(&failureUnstow);
@@ -4481,12 +4531,13 @@ ICSetElemDenseAddCompiler::generateStubCode(MacroAssembler &masm)
     regs = availableGeneralRegs(2);
     scratchReg = regs.takeAny();
 
+    // Unbox obj and key.
+    obj = masm.extractObject(R0, ExtractTemp0);
+    Register key = masm.extractInt32(R1, ExtractTemp1);
+
     // Load obj->elements in scratchReg.
     masm.loadPtr(Address(obj, JSObject::offsetOfElements()), scratchReg);
 
-    // Unbox key.
-    Register key = masm.extractInt32(R1, ExtractTemp1);
-
     // Bounds check (key == initLength)
     Address initLength(scratchReg, ObjectElements::offsetOfInitializedLength());
     masm.branch32(Assembler::NotEqual, initLength, key, &failure);
@@ -4495,6 +4546,12 @@ ICSetElemDenseAddCompiler::generateStubCode(MacroAssembler &masm)
     Address capacity(scratchReg, ObjectElements::offsetOfCapacity());
     masm.branch32(Assembler::BelowOrEqual, capacity, key, &failure);
 
+    // Failure is not possible now.  Free up registers.
+    regs.add(R0);
+    regs.add(R1);
+    regs.takeUnchecked(obj);
+    regs.takeUnchecked(key);
+
     // Increment initLength before write.
     masm.add32(Imm32(1), initLength);
 
@@ -4505,33 +4562,43 @@ ICSetElemDenseAddCompiler::generateStubCode(MacroAssembler &masm)
     masm.add32(Imm32(1), length);
     masm.bind(&skipIncrementLength);
 
+    Address valueAddr(BaselineStackReg, ICStackValueOffset);
+
     // Convert int32 values to double if convertDoubleElements is set. In this
     // case the heap typeset is guaranteed to contain both int32 and double, so
     // it's okay to store a double.
-    Label convertDoubles, convertDoublesDone;
+    Label dontConvertDoubles;
     Address elementsFlags(scratchReg, ObjectElements::offsetOfFlags());
-    masm.branchTest32(Assembler::NonZero, elementsFlags,
+    masm.branchTest32(Assembler::Zero, elementsFlags,
                       Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS),
-                      &convertDoubles);
-    masm.bind(&convertDoublesDone);
-
-    // Write the value.  No need for write barrier since we're not overwriting an old value.
-    // It's safe to overwrite R0 now.
-    BaseIndex element(scratchReg, key, TimesEight);
-    Address valueAddr(BaselineStackReg, ICStackValueOffset);
-    masm.loadValue(valueAddr, R0);
-    masm.storeValue(R0, element);
-    EmitReturnFromIC(masm);
-
-    // Convert to double and jump back. Note that double arrays are only
-    // created by IonMonkey, so if we have no floating-point support
-    // Ion is disabled and there should be no double arrays.
-    masm.bind(&convertDoubles);
+                      &dontConvertDoubles);
+    // Note that double arrays are only created by IonMonkey, so if we have no
+    // floating-point support Ion is disabled and there should be no double arrays.
     if (cx->runtime->jitSupportsFloatingPoint)
-        masm.convertInt32ValueToDouble(valueAddr, R0.scratchReg(), &convertDoublesDone);
+        masm.convertInt32ValueToDouble(valueAddr, regs.getAny(), &dontConvertDoubles);
     else
         masm.breakpoint();
-    masm.jump(&convertDoublesDone);
+    masm.bind(&dontConvertDoubles);
+
+    // Write the value.  No need for pre-barrier since we're not overwriting an old value.
+    ValueOperand tmpVal = regs.takeAnyValue();
+    BaseIndex element(scratchReg, key, TimesEight);
+    masm.loadValue(valueAddr, tmpVal);
+    masm.storeValue(tmpVal, element);
+    regs.add(key);
+    regs.add(tmpVal);
+#ifdef JSGC_GENERATIONAL
+    Label skipBarrier;
+    masm.branchTestObject(Assembler::NotEqual, tmpVal, &skipBarrier);
+    {
+        Register r = regs.takeAny();
+        GeneralRegisterSet saveRegs;
+        emitPostWriteBarrierSlot(masm, obj, r, saveRegs);
+        regs.add(r);
+    }
+    masm.bind(&skipBarrier);
+#endif
+    EmitReturnFromIC(masm);
 
     // Failure case - fail but first unstow R0 and R1
     masm.bind(&failureUnstow);
@@ -6299,13 +6366,35 @@ ICSetProp_Native::Compiler::generateStubCode(MacroAssembler &masm)
     // Unstow R0 and R1 (object and key)
     EmitUnstowICValues(masm, 2);
 
-    if (!isFixedSlot_)
-        masm.loadPtr(Address(objReg, JSObject::offsetOfSlots()), objReg);
+    regs.add(R0);
+    regs.takeUnchecked(objReg);
+
+    Register holderReg;
+    if (isFixedSlot_) {
+        holderReg = objReg;
+    } else {
+        holderReg = regs.takeAny();
+        masm.loadPtr(Address(objReg, JSObject::offsetOfSlots()), holderReg);
+    }
 
     // Perform the store.
     masm.load32(Address(BaselineStubReg, ICSetProp_Native::offsetOfOffset()), scratch);
-    EmitPreBarrier(masm, BaseIndex(objReg, scratch, TimesOne), MIRType_Value);
-    masm.storeValue(R1, BaseIndex(objReg, scratch, TimesOne));
+    EmitPreBarrier(masm, BaseIndex(holderReg, scratch, TimesOne), MIRType_Value);
+    masm.storeValue(R1, BaseIndex(holderReg, scratch, TimesOne));
+    if (holderReg != objReg)
+        regs.add(holderReg);
+#ifdef JSGC_GENERATIONAL
+    Label skipBarrier;
+    masm.branchTestObject(Assembler::NotEqual, R1, &skipBarrier);
+    {
+        Register scr = regs.takeAny();
+        GeneralRegisterSet saveRegs;
+        saveRegs.add(R1);
+        emitPostWriteBarrierSlot(masm, objReg, scr, saveRegs);
+        regs.add(scr);
+    }
+    masm.bind(&skipBarrier);
+#endif
 
     // The RHS has to be in R0.
     masm.moveValue(R1, R0);
@@ -6400,13 +6489,35 @@ ICSetPropNativeAddCompiler::generateStubCode(MacroAssembler &masm)
     masm.loadPtr(Address(BaselineStubReg, ICSetProp_NativeAdd::offsetOfNewShape()), scratch);
     masm.storePtr(scratch, shapeAddr);
 
-    if (!isFixedSlot_)
-        masm.loadPtr(Address(objReg, JSObject::offsetOfSlots()), objReg);
+    Register holderReg;
+    regs.add(R0);
+    regs.takeUnchecked(objReg);
+    if (isFixedSlot_) {
+        holderReg = objReg;
+    } else {
+        holderReg = regs.takeAny();
+        masm.loadPtr(Address(objReg, JSObject::offsetOfSlots()), holderReg);
+    }
 
     // Perform the store.  No write barrier required since this is a new
     // initialization.
     masm.load32(Address(BaselineStubReg, ICSetProp_NativeAdd::offsetOfOffset()), scratch);
-    masm.storeValue(R1, BaseIndex(objReg, scratch, TimesOne));
+    masm.storeValue(R1, BaseIndex(holderReg, scratch, TimesOne));
+
+    if (holderReg != objReg)
+        regs.add(holderReg);
+
+#ifdef JSGC_GENERATIONAL
+    Label skipBarrier;
+    masm.branchTestObject(Assembler::NotEqual, R1, &skipBarrier);
+    {
+        Register scr = regs.takeAny();
+        GeneralRegisterSet saveRegs;
+        saveRegs.add(R1);
+        emitPostWriteBarrierSlot(masm, objReg, scr, saveRegs);
+    }
+    masm.bind(&skipBarrier);
+#endif
 
     // The RHS has to be in R0.
     masm.moveValue(R1, R0);
@@ -8225,7 +8336,8 @@ ICSetProp_Native::Compiler::getStub(ICStubSpace *space)
 
 ICSetProp_NativeAdd::ICSetProp_NativeAdd(IonCode *stubCode, HandleTypeObject type,
                                          size_t protoChainDepth,
-                                         HandleShape newShape, uint32_t offset)
+                                         HandleShape newShape,
+                                         uint32_t offset)
   : ICUpdatedStub(SetProp_NativeAdd, stubCode),
     type_(type),
     newShape_(newShape),
@@ -8250,7 +8362,8 @@ ICSetProp_NativeAddImpl<ProtoChainDepth>::ICSetProp_NativeAddImpl(IonCode *stubC
 
 ICSetPropNativeAddCompiler::ICSetPropNativeAddCompiler(JSContext *cx, HandleObject obj,
                                                        HandleShape oldShape,
-                                                       size_t protoChainDepth, bool isFixedSlot,
+                                                       size_t protoChainDepth,
+                                                       bool isFixedSlot,
                                                        uint32_t offset)
   : ICStubCompiler(cx, ICStub::SetProp_NativeAdd),
     obj_(cx, obj),
diff --git a/js/src/ion/BaselineIC.h b/js/src/ion/BaselineIC.h
index 607219a9270..18fcbd88165 100644
--- a/js/src/ion/BaselineIC.h
+++ b/js/src/ion/BaselineIC.h
@@ -1046,6 +1046,11 @@ class ICStubCompiler
         return regs;
     }
 
+#ifdef JSGC_GENERATIONAL
+    inline bool emitPostWriteBarrierSlot(MacroAssembler &masm, Register obj, Register scratch,
+                                         GeneralRegisterSet saveRegs);
+#endif
+
   public:
     virtual ICStub *getStub(ICStubSpace *space) = 0;
 
@@ -4552,7 +4557,7 @@ class ICSetProp_Native : public ICUpdatedStub
     }
 
     class Compiler : public ICStubCompiler {
-        HandleObject obj_;
+        RootedObject obj_;
         bool isFixedSlot_;
         uint32_t offset_;
 
@@ -4566,7 +4571,7 @@ class ICSetProp_Native : public ICUpdatedStub
       public:
         Compiler(JSContext *cx, HandleObject obj, bool isFixedSlot, uint32_t offset)
           : ICStubCompiler(cx, ICStub::SetProp_Native),
-            obj_(obj),
+            obj_(cx, obj),
             isFixedSlot_(isFixedSlot),
             offset_(offset)
         {}

From b64aed8e7ce68d9f84978c50134ba1386294dae2 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 14:25:52 -0400
Subject: [PATCH 10/85] Bug 877039 - Set the Web Audio maximum channel count to
 32; r=roc

--HG--
extra : rebase_source : 7e5bb51cd3bd9b4fbe01649af8f14e17cf6b3042
---
 content/media/webaudio/WebAudioUtils.h                    | 2 +-
 content/media/webaudio/test/test_OfflineAudioContext.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/media/webaudio/WebAudioUtils.h b/content/media/webaudio/WebAudioUtils.h
index 7ca51d1aedd..7c559293103 100644
--- a/content/media/webaudio/WebAudioUtils.h
+++ b/content/media/webaudio/WebAudioUtils.h
@@ -23,7 +23,7 @@ namespace dom {
 struct WebAudioUtils {
   // This is an arbitrary large number used to protect against OOMs.
   // We can adjust it later if needed.
-  static const uint32_t MaxChannelCount = 10000;
+  static const uint32_t MaxChannelCount = 32;
 
   static bool FuzzyEqual(float v1, float v2)
   {
diff --git a/content/media/webaudio/test/test_OfflineAudioContext.html b/content/media/webaudio/test/test_OfflineAudioContext.html
index d01f7ada4b9..12b2299bb1f 100644
--- a/content/media/webaudio/test/test_OfflineAudioContext.html
+++ b/content/media/webaudio/test/test_OfflineAudioContext.html
@@ -32,9 +32,9 @@ addLoadEvent(function() {
   expectException(function() {
     new OfflineAudioContext(0, 100, 44100);
   }, DOMException.NOT_SUPPORTED_ERR);
-  new OfflineAudioContext(10000, 100, 44100);
+  new OfflineAudioContext(32, 100, 44100);
   expectException(function() {
-    new OfflineAudioContext(10001, 100, 44100);
+    new OfflineAudioContext(33, 100, 44100);
   }, DOMException.NOT_SUPPORTED_ERR);
   expectException(function() {
     new OfflineAudioContext(2, 0, 44100);

From 574b61e8c5f72b551ba535dc137f97453e5000a7 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 14:27:57 -0400
Subject: [PATCH 11/85] Bug 865806 - Part 1: Continue walking up the frame tree
 when hitting a transparent frame as we're trying to determine whether a given
 element's background is dark or not; r=roc

This heuristic improvement gives us correct dark background detection in
pdf.js, among other cases.

--HG--
extra : rebase_source : 5a8f920da1b63f6452ec709745b2154b6fc17ceb
---
 widget/xpwidgets/nsNativeTheme.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/widget/xpwidgets/nsNativeTheme.cpp b/widget/xpwidgets/nsNativeTheme.cpp
index b0a6185e8a7..3e57f0e8b62 100644
--- a/widget/xpwidgets/nsNativeTheme.cpp
+++ b/widget/xpwidgets/nsNativeTheme.cpp
@@ -691,8 +691,13 @@ nsNativeTheme::IsDarkBackground(nsIFrame* aFrame)
     return false;
 
   nsIFrame* frame = scrollFrame->GetScrolledFrame();
-  nsStyleContext* bgSC;
-  if (nsCSSRendering::FindBackground(frame, &bgSC)) {
+  nsStyleContext* bgSC = nullptr;
+  if (!nsCSSRendering::FindBackground(frame, &bgSC) ||
+      bgSC->StyleBackground()->IsTransparent()) {
+    nsIFrame* backgroundFrame = nsCSSRendering::FindNonTransparentBackgroundFrame(frame, true);
+    nsCSSRendering::FindBackground(backgroundFrame, &bgSC);
+  }
+  if (bgSC) {
     nscolor bgColor = bgSC->StyleBackground()->mBackgroundColor;
     // Consider the background color dark if the sum of the r, g and b values is
     // less than 384 in a semi-transparent document.  This heuristic matches what

From a3d695962d68769139b53b00a880e76589cb92fe Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 30 May 2013 17:46:39 -0400
Subject: [PATCH 12/85] Bug 865377.  Give EventTarget a chrome-only getter that
 returns its global.  r=smaug

The idea is that you then do things like t.dispatchEvent(new t.ownerGlobal.Event("something")).
---
 content/base/public/nsINode.h               |  1 +
 content/base/src/nsINode.cpp                |  9 +++++++++
 content/events/public/EventTarget.h         |  6 ++++++
 content/events/src/nsDOMEventTargetHelper.h |  4 ++++
 dom/base/nsGlobalWindow.h                   |  8 ++++++++
 dom/base/nsPIDOMWindow.h                    | 20 ++++++++++++++++++--
 dom/base/nsPIWindowRoot.h                   |  6 +++---
 dom/base/nsWindowRoot.cpp                   |  6 ++++++
 dom/base/nsWindowRoot.h                     |  1 +
 dom/bindings/Bindings.conf                  | 12 +++++++++++-
 dom/webidl/EventTarget.webidl               |  8 ++++++++
 dom/workers/EventTarget.h                   |  6 ++++++
 12 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index beed3d51dfc..fed0a64cd9e 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -812,6 +812,7 @@ public:
                                 const mozilla::dom::Nullable<bool>& aWantsUntrusted,
                                 mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
   using nsIDOMEventTarget::AddSystemEventListener;
+  virtual nsIDOMWindow* GetOwnerGlobal() MOZ_OVERRIDE;
 
   /**
    * Adds a mutation observer to be notified when this node, or any of its
diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp
index d696a8159aa..03d82f6e59c 100644
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -104,6 +104,7 @@
 #include "DocumentType.h"
 #include <algorithm>
 #include "nsDOMEvent.h"
+#include "nsGlobalWindow.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -1163,6 +1164,14 @@ nsINode::GetContextForEventHandlers(nsresult* aRv)
   return nsContentUtils::GetContextForEventHandlers(this, aRv);
 }
 
+nsIDOMWindow*
+nsINode::GetOwnerGlobal()
+{
+  bool dummy;
+  return nsPIDOMWindow::GetOuterFromCurrentInner(
+    static_cast<nsGlobalWindow*>(OwnerDoc()->GetScriptHandlingObject(dummy)));
+}
+
 bool
 nsINode::UnoptimizableCCNode() const
 {
diff --git a/content/events/public/EventTarget.h b/content/events/public/EventTarget.h
index 51dcda5e784..9d8ebdb1ea0 100644
--- a/content/events/public/EventTarget.h
+++ b/content/events/public/EventTarget.h
@@ -14,6 +14,7 @@
 #include "nsIAtom.h"
 
 class nsDOMEvent;
+class nsIDOMWindow;
 
 namespace mozilla {
 namespace dom {
@@ -64,6 +65,11 @@ public:
   virtual void EventListenerAdded(nsIAtom* aType) {}
   virtual void EventListenerRemoved(nsIAtom* aType) {}
 
+  // Returns an outer window that corresponds to the inner window this event
+  // target is associated with.  Will return null if the inner window is not the
+  // current inner or if there is no window around at all.
+  virtual nsIDOMWindow* GetOwnerGlobal() = 0;
+
 protected:
   EventHandlerNonNull* GetEventHandler(nsIAtom* aType);
   void SetEventHandler(nsIAtom* aType, EventHandlerNonNull* aHandler,
diff --git a/content/events/src/nsDOMEventTargetHelper.h b/content/events/src/nsDOMEventTargetHelper.h
index cc75ced3311..cda3b61aa7a 100644
--- a/content/events/src/nsDOMEventTargetHelper.h
+++ b/content/events/src/nsDOMEventTargetHelper.h
@@ -95,6 +95,10 @@ public:
                        JSContext* aCx,
                        JS::Value* aValue);
   using mozilla::dom::EventTarget::GetEventHandler;
+  virtual nsIDOMWindow* GetOwnerGlobal() MOZ_OVERRIDE
+  {
+    return nsPIDOMWindow::GetOuterFromCurrentInner(GetOwner());
+  }
 
   nsresult CheckInnerWindowCorrectness()
   {
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index d4b80eac02c..608c90f96d6 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -392,6 +392,14 @@ public:
                                 bool aUseCapture,
                                 const mozilla::dom::Nullable<bool>& aWantsUntrusted,
                                 mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
+  virtual nsIDOMWindow* GetOwnerGlobal() MOZ_OVERRIDE
+  {
+    if (IsOuterWindow()) {
+      return this;
+    }
+
+    return GetOuterFromCurrentInner(this);
+  }
 
   // nsITouchEventReceiver
   NS_DECL_NSITOUCHEVENTRECEIVER
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index 28d3cc6f826..5f8863b4687 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -58,8 +58,8 @@ class AudioContext;
 }
 
 #define NS_PIDOMWINDOW_IID \
-{ 0x7202842a, 0x0e24, 0x46dc, \
-  { 0xb2, 0x25, 0xd2, 0x9d, 0x28, 0xda, 0x87, 0xd8 } }
+{ 0xc7f20d00, 0xed38, 0x4d60, \
+ { 0x90, 0xf6, 0x3e, 0xde, 0x7b, 0x71, 0xc3, 0xb3 } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -645,6 +645,22 @@ public:
 
   void AddAudioContext(mozilla::dom::AudioContext* aAudioContext);
 
+  // Given an inner window, return its outer if the inner is the current inner.
+  // Otherwise (argument null or not an inner or not current) return null.
+  static nsPIDOMWindow* GetOuterFromCurrentInner(nsPIDOMWindow* aInner)
+  {
+    if (!aInner) {
+      return nullptr;
+    }
+
+    nsPIDOMWindow* outer = aInner->GetOuterWindow();
+    if (!outer || outer->GetCurrentInnerWindow() != aInner) {
+      return nullptr;
+    }
+
+    return outer;
+  }
+
   // WebIDL-ish APIs
   nsPerformance* GetPerformance();
 
diff --git a/dom/base/nsPIWindowRoot.h b/dom/base/nsPIWindowRoot.h
index bab2d9a9943..57acdeac9a3 100644
--- a/dom/base/nsPIWindowRoot.h
+++ b/dom/base/nsPIWindowRoot.h
@@ -15,10 +15,9 @@ class nsIControllers;
 class nsIController;
 struct JSContext;
 
-// 426C1B56-E38A-435E-B291-BE1557F2A0A2
 #define NS_IWINDOWROOT_IID \
-{ 0xc89780f2, 0x8905, 0x417f, \
-  { 0xa6, 0x62, 0xf6, 0xc, 0xa6, 0xd7, 0xc, 0x91 } }
+{ 0x3f71f50c, 0xa7e0, 0x43bc, \
+ { 0xac, 0x25, 0x4d, 0xbb, 0x88, 0x7b, 0x21, 0x09 } }
 
 class nsPIWindowRoot : public mozilla::dom::EventTarget
 {
@@ -37,6 +36,7 @@ public:
 
   virtual void SetParentTarget(mozilla::dom::EventTarget* aTarget) = 0;
   virtual mozilla::dom::EventTarget* GetParentTarget() = 0;
+  virtual nsIDOMWindow* GetOwnerGlobal() MOZ_OVERRIDE = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsPIWindowRoot, NS_IWINDOWROOT_IID)
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index 2f2000e6368..c238e444e62 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -179,6 +179,12 @@ nsWindowRoot::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
   return NS_OK;
 }
 
+nsIDOMWindow*
+nsWindowRoot::GetOwnerGlobal()
+{
+  return GetWindow();
+}
+
 nsPIDOMWindow*
 nsWindowRoot::GetWindow()
 {
diff --git a/dom/base/nsWindowRoot.h b/dom/base/nsWindowRoot.h
index 1348b399f2b..fcbc7284a28 100644
--- a/dom/base/nsWindowRoot.h
+++ b/dom/base/nsWindowRoot.h
@@ -50,6 +50,7 @@ public:
     mParent = aTarget;
   }
   virtual mozilla::dom::EventTarget* GetParentTarget() { return mParent; }
+  virtual nsIDOMWindow* GetOwnerGlobal() MOZ_OVERRIDE;
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsWindowRoot,
                                                          nsIDOMEventTarget)
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 45d2777c4eb..ef0b36fb4e7 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1213,6 +1213,17 @@ DOMInterfaces = {
     'nativeType': 'mozilla::dom::DOMWheelEvent',
 },
 
+'WindowProxy': [
+{
+    'nativeType': 'nsIDOMWindow',
+    'concrete': False
+},
+{
+    # We need a worker descriptor for WindowProxy because EventTarget exists in
+    # workers.  But it's an external interface, so it'll just map to JSObject*.
+    'workers': True
+}],
+
 'XMLHttpRequest': [
 {
     'nativeType': 'nsXMLHttpRequest',
@@ -1616,7 +1627,6 @@ addExternalIface('URI', nativeType='nsIURI', headerFile='nsIURI.h',
                  notflattened=True)
 addExternalIface('UserDataHandler')
 addExternalIface('Window')
-addExternalIface('WindowProxy', nativeType='nsIDOMWindow')
 addExternalIface('XPathResult', nativeType='nsISupports')
 addExternalIface('XPathExpression')
 addExternalIface('XPathNSResolver')
diff --git a/dom/webidl/EventTarget.webidl b/dom/webidl/EventTarget.webidl
index 2ead21ac25d..ae6cad31c39 100644
--- a/dom/webidl/EventTarget.webidl
+++ b/dom/webidl/EventTarget.webidl
@@ -37,3 +37,11 @@ partial interface EventTarget {
   [ChromeOnly]
   EventHandler getEventHandler(DOMString type);
 };
+
+// Mozilla extension to make firing events on event targets from
+// chrome easier.  This returns the window which can be used to create
+// events to fire at this EventTarget, or null if there isn't one.
+partial interface EventTarget {
+  [ChromeOnly]
+  readonly attribute WindowProxy? ownerGlobal;
+};
diff --git a/dom/workers/EventTarget.h b/dom/workers/EventTarget.h
index 0c672c7927c..0b5a02f6fbc 100644
--- a/dom/workers/EventTarget.h
+++ b/dom/workers/EventTarget.h
@@ -74,6 +74,12 @@ public:
   {
     return nullptr;
   }
+
+  JSObject* GetOwnerGlobal() const
+  {
+    // We have no windows
+    return nullptr;
+  }
 };
 
 END_WORKERS_NAMESPACE

From 7392630c956927167ae1b77c3774fd238193d580 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 30 May 2013 17:46:48 -0400
Subject: [PATCH 13/85] Bug 877540.  Fix remaining unsafe reference hazards in
 browser code.  r=terrence

---
 content/base/public/nsINode.h                 |  4 ++-
 content/base/src/nsFrameMessageManager.cpp    |  5 ++--
 content/base/src/nsINode.cpp                  |  6 ++--
 .../events/src/nsDOMDataContainerEvent.cpp    |  3 +-
 content/events/src/nsDOMDataContainerEvent.h  |  4 +--
 content/events/src/nsDOMMessageEvent.h        |  2 +-
 .../src/nsDOMNotifyAudioAvailableEvent.h      |  4 +--
 .../html/content/src/HTMLCanvasElement.cpp    |  2 +-
 dom/bindings/TypedArray.h                     |  3 +-
 ipc/testshell/TestShellParent.cpp             |  8 +++---
 storage/src/mozStorageStatementRow.cpp        |  4 +--
 toolkit/components/places/PlaceInfo.cpp       |  4 +--
 toolkit/components/telemetry/Telemetry.cpp    | 28 +++++++++----------
 tools/profiler/JSObjectBuilder.cpp            | 12 ++++----
 tools/profiler/SaveProfileTask.cpp            |  4 +--
 .../directory/nsDirectoryViewer.cpp           |  4 +--
 16 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index fed0a64cd9e..7f81bc8960f 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -68,6 +68,7 @@ template<typename T> class Optional;
 
 namespace JS {
 class Value;
+template<typename T> class Handle;
 }
 
 #define NODE_FLAG_BIT(n_) (1U << (n_))
@@ -1581,7 +1582,8 @@ public:
   // HasAttributes is defined inline in Element.h.
   bool HasAttributes() const;
   nsDOMAttributeMap* GetAttributes();
-  JS::Value SetUserData(JSContext* aCx, const nsAString& aKey, JS::Value aData,
+  JS::Value SetUserData(JSContext* aCx, const nsAString& aKey,
+                        JS::Handle<JS::Value> aData,
                         nsIDOMUserDataHandler* aHandler,
                         mozilla::ErrorResult& aError);
   JS::Value GetUserData(JSContext* aCx, const nsAString& aKey,
diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp
index 98f90d49b45..2dadfdb345e 100644
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -338,8 +338,9 @@ GetParamsForMessage(JSContext* aCx,
   //    properly cases when interface is implemented in JS and used
   //    as a dictionary.
   nsAutoString json;
-  JS::Value v = aObject;
-  NS_ENSURE_TRUE(JS_Stringify(aCx, &v, nullptr, JSVAL_NULL, JSONCreator, &json), false);
+  JS::Rooted<JS::Value> v(aCx, aObject);
+  NS_ENSURE_TRUE(JS_Stringify(aCx, v.address(), nullptr, JSVAL_NULL,
+                              JSONCreator, &json), false);
   NS_ENSURE_TRUE(!json.IsEmpty(), false);
 
   JS::Rooted<JS::Value> val(aCx, JS::NullValue());
diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp
index 03d82f6e59c..77a6e866616 100644
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -678,11 +678,13 @@ nsINode::SetUserData(const nsAString &aKey, nsIVariant *aData,
 }
 
 JS::Value
-nsINode::SetUserData(JSContext* aCx, const nsAString& aKey, JS::Value aData,
+nsINode::SetUserData(JSContext* aCx, const nsAString& aKey,
+                     JS::Handle<JS::Value> aData,
                      nsIDOMUserDataHandler* aHandler, ErrorResult& aError)
 {
   nsCOMPtr<nsIVariant> data;
-  aError = nsContentUtils::XPConnect()->JSValToVariant(aCx, &aData,
+  JS::Rooted<JS::Value> dataVal(aCx, aData);
+  aError = nsContentUtils::XPConnect()->JSValToVariant(aCx, dataVal.address(),
                                                        getter_AddRefs(data));
   if (aError.Failed()) {
     return JS::UndefinedValue();
diff --git a/content/events/src/nsDOMDataContainerEvent.cpp b/content/events/src/nsDOMDataContainerEvent.cpp
index 5d1fea04e4f..29de75e941b 100644
--- a/content/events/src/nsDOMDataContainerEvent.cpp
+++ b/content/events/src/nsDOMDataContainerEvent.cpp
@@ -60,7 +60,8 @@ nsDOMDataContainerEvent::SetData(const nsAString& aKey, nsIVariant *aData)
 
 void
 nsDOMDataContainerEvent::SetData(JSContext* aCx, const nsAString& aKey,
-                                 JS::Value aVal, mozilla::ErrorResult& aRv)
+                                 JS::Handle<JS::Value> aVal,
+                                 mozilla::ErrorResult& aRv)
 {
   if (!nsContentUtils::XPConnect()) {
     aRv = NS_ERROR_FAILURE;
diff --git a/content/events/src/nsDOMDataContainerEvent.h b/content/events/src/nsDOMDataContainerEvent.h
index faedbf92af1..c68857d06a9 100644
--- a/content/events/src/nsDOMDataContainerEvent.h
+++ b/content/events/src/nsDOMDataContainerEvent.h
@@ -39,8 +39,8 @@ public:
     return val.forget();
   }
 
-  void SetData(JSContext* aCx, const nsAString& aKey, JS::Value aVal,
-               mozilla::ErrorResult& aRv);
+  void SetData(JSContext* aCx, const nsAString& aKey,
+               JS::Handle<JS::Value> aVal, mozilla::ErrorResult& aRv);
 
 private:
   static PLDHashOperator
diff --git a/content/events/src/nsDOMMessageEvent.h b/content/events/src/nsDOMMessageEvent.h
index 72c17bf663f..d4dda6e733f 100644
--- a/content/events/src/nsDOMMessageEvent.h
+++ b/content/events/src/nsDOMMessageEvent.h
@@ -54,7 +54,7 @@ public:
                         const nsAString& aType,
                         bool aCanBubble,
                         bool aCancelable,
-                        JS::Value aData,
+                        JS::Handle<JS::Value> aData,
                         const nsAString& aOrigin,
                         const nsAString& aLastEventId,
                         nsIDOMWindow* aSource,
diff --git a/content/events/src/nsDOMNotifyAudioAvailableEvent.h b/content/events/src/nsDOMNotifyAudioAvailableEvent.h
index 763c002792e..c02212e08a4 100644
--- a/content/events/src/nsDOMNotifyAudioAvailableEvent.h
+++ b/content/events/src/nsDOMNotifyAudioAvailableEvent.h
@@ -48,8 +48,8 @@ public:
 
   JSObject* GetFrameBuffer(JSContext* aCx, mozilla::ErrorResult& aRv)
   {
-    JS::Value dummy;
-    aRv = GetFrameBuffer(aCx, &dummy);
+    JS::Rooted<JS::Value> dummy(aCx);
+    aRv = GetFrameBuffer(aCx, dummy.address());
     return mCachedArray;
   }
 
diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp
index 505c3cb2dd1..64a87a0e042 100644
--- a/content/html/content/src/HTMLCanvasElement.cpp
+++ b/content/html/content/src/HTMLCanvasElement.cpp
@@ -724,7 +724,7 @@ nsresult
 HTMLCanvasElement::GetContext(const nsAString& aContextId,
                               nsISupports** aContext)
 {
-  return GetContext(aContextId, JS::UndefinedValue(), nullptr, aContext);
+  return GetContext(aContextId, JS::UndefinedHandleValue, nullptr, aContext);
 }
 
 NS_IMETHODIMP
diff --git a/dom/bindings/TypedArray.h b/dom/bindings/TypedArray.h
index 9e179c8fe8a..6531f2f6123 100644
--- a/dom/bindings/TypedArray.h
+++ b/dom/bindings/TypedArray.h
@@ -8,6 +8,7 @@
 #define mozilla_dom_TypedArray_h
 
 #include "jsfriendapi.h"
+#include "js/RootingAPI.h"
 
 namespace mozilla {
 namespace dom {
@@ -65,7 +66,7 @@ struct TypedArray : public TypedArray_base<T,UnboxArray> {
   static inline JSObject*
   Create(JSContext* cx, nsWrapperCache* creator, uint32_t length,
          const T* data = NULL) {
-    JSObject* creatorWrapper;
+    JS::Rooted<JSObject*> creatorWrapper(cx);
     Maybe<JSAutoCompartment> ac;
     if (creator && (creatorWrapper = creator->GetWrapperPreserveColor())) {
       ac.construct(cx, creatorWrapper);
diff --git a/ipc/testshell/TestShellParent.cpp b/ipc/testshell/TestShellParent.cpp
index 4c866b8651e..bb9230be476 100644
--- a/ipc/testshell/TestShellParent.cpp
+++ b/ipc/testshell/TestShellParent.cpp
@@ -100,11 +100,11 @@ TestShellCommandParent::RunCallback(const nsString& aResponse)
   JSString* str = JS_NewUCStringCopyN(mCx, aResponse.get(), aResponse.Length());
   NS_ENSURE_TRUE(str, JS_FALSE);
 
-  JS::Value argv[] = { STRING_TO_JSVAL(str) };
-  unsigned argc = ArrayLength(argv);
+  JS::Rooted<JS::Value> strVal(mCx, JS::StringValue(str));
 
-  JS::Value rval;
-  JSBool ok = JS_CallFunctionValue(mCx, global, mCallback, argc, argv, &rval);
+  JS::Rooted<JS::Value> rval(mCx);
+  JSBool ok = JS_CallFunctionValue(mCx, global, mCallback, 1, strVal.address(),
+				   rval.address());
   NS_ENSURE_TRUE(ok, JS_FALSE);
 
   return JS_TRUE;
diff --git a/storage/src/mozStorageStatementRow.cpp b/storage/src/mozStorageStatementRow.cpp
index b67cff8a3d4..f407d610173 100644
--- a/storage/src/mozStorageStatementRow.cpp
+++ b/storage/src/mozStorageStatementRow.cpp
@@ -95,8 +95,8 @@ StatementRow::GetProperty(nsIXPConnectWrappedNative *aWrapper,
 
       // Copy the blob over to the JS array.
       for (uint32_t i = 0; i < length; i++) {
-        jsval val = INT_TO_JSVAL(blob[i]);
-        if (!::JS_SetElement(aCtx, scope, i, &val)) {
+        JS::Rooted<JS::Value> val(aCtx, INT_TO_JSVAL(blob[i]));
+        if (!::JS_SetElement(aCtx, scope, i, val.address())) {
           *_retval = false;
           return NS_OK;
         }
diff --git a/toolkit/components/places/PlaceInfo.cpp b/toolkit/components/places/PlaceInfo.cpp
index 9164a0fccb9..e9ea95df826 100644
--- a/toolkit/components/places/PlaceInfo.cpp
+++ b/toolkit/components/places/PlaceInfo.cpp
@@ -92,9 +92,9 @@ PlaceInfo::GetVisits(JSContext* aContext,
 
     JS::Rooted<JSObject*> jsobj(aContext, wrapper->GetJSObject());
     NS_ENSURE_STATE(jsobj);
-    JS::Value wrappedVisit = OBJECT_TO_JSVAL(jsobj);
+    JS::Rooted<JS::Value> wrappedVisit(aContext, OBJECT_TO_JSVAL(jsobj));
 
-    JSBool rc = JS_SetElement(aContext, visits, idx, &wrappedVisit);
+    JSBool rc = JS_SetElement(aContext, visits, idx, wrappedVisit.address());
     NS_ENSURE_TRUE(rc, NS_ERROR_UNEXPECTED);
   }
 
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 9200d223061..89ca6d0f90e 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -1516,8 +1516,8 @@ TelemetryImpl::GetChromeHangs(JSContext *cx, JS::Value *ret)
 
   const size_t length = stacks.GetStackCount();
   for (size_t i = 0; i < length; ++i) {
-    JS::Value duration = INT_TO_JSVAL(mHangReports.GetDuration(i));
-    if (!JS_SetElement(cx, durationArray, i, &duration)) {
+    JS::Rooted<JS::Value> duration(cx, INT_TO_JSVAL(mHangReports.GetDuration(i)));
+    if (!JS_SetElement(cx, durationArray, i, duration.address())) {
       return NS_ERROR_FAILURE;
     }
   }
@@ -1553,8 +1553,8 @@ CreateJSStackObject(JSContext *cx, const CombinedStacks &stacks) {
     if (!moduleInfoArray) {
       return nullptr;
     }
-    JS::Value val = OBJECT_TO_JSVAL(moduleInfoArray);
-    if (!JS_SetElement(cx, moduleArray, moduleIndex, &val)) {
+    JS::Rooted<JS::Value> val(cx, OBJECT_TO_JSVAL(moduleInfoArray));
+    if (!JS_SetElement(cx, moduleArray, moduleIndex, val.address())) {
       return nullptr;
     }
 
@@ -1566,7 +1566,7 @@ CreateJSStackObject(JSContext *cx, const CombinedStacks &stacks) {
       return nullptr;
     }
     val = STRING_TO_JSVAL(str);
-    if (!JS_SetElement(cx, moduleInfoArray, index++, &val)) {
+    if (!JS_SetElement(cx, moduleInfoArray, index++, val.address())) {
       return nullptr;
     }
 
@@ -1576,7 +1576,7 @@ CreateJSStackObject(JSContext *cx, const CombinedStacks &stacks) {
       return nullptr;
     }
     val = STRING_TO_JSVAL(id);
-    if (!JS_SetElement(cx, moduleInfoArray, index++, &val)) {
+    if (!JS_SetElement(cx, moduleInfoArray, index++, val.address())) {
       return nullptr;
     }
   }
@@ -1600,8 +1600,8 @@ CreateJSStackObject(JSContext *cx, const CombinedStacks &stacks) {
       return nullptr;
     }
 
-    JS::Value pcArrayVal = OBJECT_TO_JSVAL(pcArray);
-    if (!JS_SetElement(cx, reportArray, i, &pcArrayVal)) {
+    JS::Rooted<JS::Value> pcArrayVal(cx, OBJECT_TO_JSVAL(pcArray));
+    if (!JS_SetElement(cx, reportArray, i, pcArrayVal.address())) {
       return nullptr;
     }
 
@@ -1615,16 +1615,16 @@ CreateJSStackObject(JSContext *cx, const CombinedStacks &stacks) {
       }
       int modIndex = (std::numeric_limits<uint16_t>::max() == frame.mModIndex) ?
         -1 : frame.mModIndex;
-      JS::Value modIndexVal = INT_TO_JSVAL(modIndex);
-      if (!JS_SetElement(cx, framePair, 0, &modIndexVal)) {
+      JS::Rooted<JS::Value> modIndexVal(cx, INT_TO_JSVAL(modIndex));
+      if (!JS_SetElement(cx, framePair, 0, modIndexVal.address())) {
         return nullptr;
       }
-      JS::Value mOffsetVal = INT_TO_JSVAL(frame.mOffset);
-      if (!JS_SetElement(cx, framePair, 1, &mOffsetVal)) {
+      JS::Rooted<JS::Value> mOffsetVal(cx, INT_TO_JSVAL(frame.mOffset));
+      if (!JS_SetElement(cx, framePair, 1, mOffsetVal.address())) {
         return nullptr;
       }
-      JS::Value framePairVal = OBJECT_TO_JSVAL(framePair);
-      if (!JS_SetElement(cx, pcArray, pcIndex, &framePairVal)) {
+      JS::Rooted<JS::Value> framePairVal(cx, OBJECT_TO_JSVAL(framePair));
+      if (!JS_SetElement(cx, pcArray, pcIndex, framePairVal.address())) {
         return nullptr;
       }
     }
diff --git a/tools/profiler/JSObjectBuilder.cpp b/tools/profiler/JSObjectBuilder.cpp
index 635823556ca..484fc6c4963 100644
--- a/tools/profiler/JSObjectBuilder.cpp
+++ b/tools/profiler/JSObjectBuilder.cpp
@@ -92,8 +92,8 @@ JSObjectBuilder::ArrayPush(JSCustomArray *aArray, int value)
   if (!mOk)
     return;
 
-  JS::Value objval = INT_TO_JSVAL(value);
-  mOk = JS_SetElement(mCx, (JSObject*)aArray, length, &objval);
+  JS::Rooted<JS::Value> objval(mCx, INT_TO_JSVAL(value));
+  mOk = JS_SetElement(mCx, (JSObject*)aArray, length, objval.address());
 }
 
 void
@@ -114,8 +114,8 @@ JSObjectBuilder::ArrayPush(JSCustomArray *aArray, const char *value)
   if (!mOk)
     return;
 
-  JS::Value objval = STRING_TO_JSVAL(string);
-  mOk = JS_SetElement(mCx, (JSObject*)aArray, length, &objval);
+  JS::Rooted<JS::Value> objval(mCx, STRING_TO_JSVAL(string));
+  mOk = JS_SetElement(mCx, (JSObject*)aArray, length, objval.address());
 }
 
 void
@@ -130,8 +130,8 @@ JSObjectBuilder::ArrayPush(JSCustomArray *aArray, JSCustomObject *aObject)
   if (!mOk)
     return;
 
-  JS::Value objval = OBJECT_TO_JSVAL((JSObject*)aObject);
-  mOk = JS_SetElement(mCx, (JSObject*)aArray, length, &objval);
+  JS::Rooted<JS::Value> objval(mCx, OBJECT_TO_JSVAL((JSObject*)aObject));
+  mOk = JS_SetElement(mCx, (JSObject*)aArray, length, objval.address());
 }
 
 JSCustomArray*
diff --git a/tools/profiler/SaveProfileTask.cpp b/tools/profiler/SaveProfileTask.cpp
index 2af0e4c9b54..59f08a42ccf 100644
--- a/tools/profiler/SaveProfileTask.cpp
+++ b/tools/profiler/SaveProfileTask.cpp
@@ -70,8 +70,8 @@ SaveProfileTask::Run() {
     if (stream.is_open()) {
       JSAutoCompartment autoComp(cx, obj);
       JSObject* profileObj = profiler_get_profile_jsobject(cx);
-      jsval val = OBJECT_TO_JSVAL(profileObj);
-      JS_Stringify(cx, &val, nullptr, JSVAL_NULL, WriteCallback, &stream);
+      JS::Rooted<JS::Value> val(cx, OBJECT_TO_JSVAL(profileObj));
+      JS_Stringify(cx, val.address(), nullptr, JSVAL_NULL, WriteCallback, &stream);
       stream.close();
       LOGF("Saved to %s", tmpPath.get());
     } else {
diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp
index c141f55f868..5c573ca180c 100644
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -174,13 +174,13 @@ nsHTTPIndex::OnFTPControlLog(bool server, const char *msg)
     params[0] = BOOLEAN_TO_JSVAL(server);
     params[1] = STRING_TO_JSVAL(jsMsgStr);
 
-    JS::Value val;
+    JS::Rooted<JS::Value> val(cx);
     JS_CallFunctionName(cx,
                         global,
                         "OnFTPControlLog",
                         2,
                         params,
-                        &val);
+                        val.address());
     return NS_OK;
 }
 

From cb38fb46c246e58bed914be6ba993ed1586f5977 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 30 May 2013 17:47:00 -0400
Subject: [PATCH 14/85] Bug 877216.  Add CallArgs-like structs for use in DOM
 specialized getters/setters/methods.  r=waldo

---
 dom/bindings/Codegen.py      |  20 +++--
 js/public/CallArgs.h         | 147 ++++++++++++++++++++++-------------
 js/src/ion/CodeGenerator.cpp |   2 +-
 js/src/ion/IonBuilder.cpp    |   3 +-
 js/src/ion/MIR.h             |  13 ++--
 js/src/jsfriendapi.h         |  84 +++++++++++++++++++-
 js/src/shell/js.cpp          |  12 +--
 7 files changed, 204 insertions(+), 77 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index a99648c6b03..8c540487eac 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -5104,7 +5104,7 @@ class CGGenericMethod(CGAbstractBindingMethod):
         return CGIndenter(CGGeneric(
             "const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));\n"
             "MOZ_ASSERT(info->type == JSJitInfo::Method);\n"
-            "JSJitMethodOp method = (JSJitMethodOp)info->op;\n"
+            "JSJitMethodOp method = info->method;\n"
             "return method(cx, obj, self, argc, vp);"))
 
 class CGSpecializedMethod(CGAbstractStaticMethod):
@@ -5240,7 +5240,7 @@ class CGGenericGetter(CGAbstractBindingMethod):
         return CGIndenter(CGGeneric(
             "const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));\n"
             "MOZ_ASSERT(info->type == JSJitInfo::Getter);\n"
-            "JSJitPropertyOp getter = info->op;\n"
+            "JSJitGetterOp getter = info->getter;\n"
             "return getter(cx, obj, self, vp);"))
 
 class CGSpecializedGetter(CGAbstractStaticMethod):
@@ -5324,7 +5324,7 @@ class CGGenericSetter(CGAbstractBindingMethod):
                 "JS::Value* argv = JS_ARGV(cx, vp);\n"
                 "const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));\n"
                 "MOZ_ASSERT(info->type == JSJitInfo::Setter);\n"
-                "JSJitPropertyOp setter = info->op;\n"
+                "JSJitSetterOp setter = info->setter;\n"
                 "if (!setter(cx, obj, self, argv)) {\n"
                 "  return false;\n"
                 "}\n"
@@ -5431,7 +5431,7 @@ class CGMemberJITInfo(CGThing):
                             "")
         return ("\n"
                 "static const JSJitInfo %s = {\n"
-                "  %s,\n"
+                "  { %s },\n"
                 "  %s,\n"
                 "  %s,\n"
                 "  JSJitInfo::%s,\n"
@@ -5445,7 +5445,9 @@ class CGMemberJITInfo(CGThing):
     def define(self):
         if self.member.isAttr():
             getterinfo = ("%s_getterinfo" % self.member.identifier.name)
-            getter = ("(JSJitPropertyOp)get_%s" % self.member.identifier.name)
+            # We need the cast here because JSJitGetterOp has a "void* self"
+            # while we have the right type.
+            getter = ("(JSJitGetterOp)get_%s" % self.member.identifier.name)
             getterinfal = "infallible" in self.descriptor.getExtendedAttributes(self.member, getter=True)
             getterconst = self.member.getExtendedAttribute("Constant")
             getterpure = getterconst or self.member.getExtendedAttribute("Pure")
@@ -5457,7 +5459,9 @@ class CGMemberJITInfo(CGThing):
                                         [self.member.type])
             if not self.member.readonly or self.member.getExtendedAttribute("PutForwards") is not None:
                 setterinfo = ("%s_setterinfo" % self.member.identifier.name)
-                setter = ("(JSJitPropertyOp)set_%s" % self.member.identifier.name)
+                # Actually a JSJitSetterOp, but JSJitGetterOp is first in the
+                # union.
+                setter = ("(JSJitGetterOp)set_%s" % self.member.identifier.name)
                 # Setters are always fallible, since they have to do a typed unwrap.
                 result += self.defineJitInfo(setterinfo, setter, "Setter",
                                              False, False, False,
@@ -5466,8 +5470,8 @@ class CGMemberJITInfo(CGThing):
         if self.member.isMethod():
             methodinfo = ("%s_methodinfo" % self.member.identifier.name)
             name = CppKeywords.checkMethodName(self.member.identifier.name)
-            # Actually a JSJitMethodOp, but JSJitPropertyOp by struct definition.
-            method = ("(JSJitPropertyOp)%s" % name)
+            # Actually a JSJitMethodOp, but JSJitGetterOp is first in the union.
+            method = ("(JSJitGetterOp)%s" % name)
 
             # Methods are infallible if they are infallible, have no arguments
             # to unwrap, and have a return type that's infallible to wrap up for
diff --git a/js/public/CallArgs.h b/js/public/CallArgs.h
index af78fde0a04..a34b2f8cffc 100644
--- a/js/public/CallArgs.h
+++ b/js/public/CallArgs.h
@@ -31,6 +31,7 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/TypeTraits.h"
 
 #include "jstypes.h"
 
@@ -92,30 +93,50 @@ namespace JS {
  * public interface are meant to be used by embedders!  See inline comments to
  * for details.
  */
-class MOZ_STACK_CLASS CallReceiver
+
+namespace detail {
+
+enum UsedRval { IncludeUsedRval, NoUsedRval };
+
+template<UsedRval WantUsedRval>
+class MOZ_STACK_CLASS UsedRvalBase;
+
+template<>
+class MOZ_STACK_CLASS UsedRvalBase<IncludeUsedRval>
 {
   protected:
-#ifdef DEBUG
     mutable bool usedRval_;
     void setUsedRval() const { usedRval_ = true; }
     void clearUsedRval() const { usedRval_ = false; }
-#else
+};
+
+template<>
+class MOZ_STACK_CLASS UsedRvalBase<NoUsedRval>
+{
+  protected:
     void setUsedRval() const {}
     void clearUsedRval() const {}
+};
+
+template<UsedRval WantUsedRval>
+class MOZ_STACK_CLASS CallReceiverBase : public UsedRvalBase<
+#ifdef DEBUG
+        WantUsedRval
+#else
+        NoUsedRval
 #endif
-
+    >
+{
+  protected:
     Value *argv_;
 
-    friend CallReceiver CallReceiverFromVp(Value *vp);
-    friend CallReceiver CallReceiverFromArgv(Value *argv);
-
   public:
     /*
      * Returns the function being called, as an object.  Must not be called
      * after rval() has been used!
      */
     JSObject &callee() const {
-        MOZ_ASSERT(!usedRval_);
+        MOZ_ASSERT(!this->usedRval_);
         return argv_[-2].toObject();
     }
 
@@ -124,7 +145,7 @@ class MOZ_STACK_CLASS CallReceiver
      * rval() has been used!
      */
     HandleValue calleev() const {
-        MOZ_ASSERT(!usedRval_);
+        MOZ_ASSERT(!this->usedRval_);
         return HandleValue::fromMarkedLocation(&argv_[-2]);
     }
 
@@ -160,7 +181,7 @@ class MOZ_STACK_CLASS CallReceiver
      * fails.
      */
     MutableHandleValue rval() const {
-        setUsedRval();
+        this->setUsedRval();
         return MutableHandleValue::fromMarkedLocation(&argv_[-2]);
     }
 
@@ -171,7 +192,7 @@ class MOZ_STACK_CLASS CallReceiver
     Value *base() const { return argv_ - 2; }
 
     Value *spAfterCall() const {
-        setUsedRval();
+        this->setUsedRval();
         return argv_ - 1;
     }
 
@@ -181,7 +202,7 @@ class MOZ_STACK_CLASS CallReceiver
     // it.  You probably don't want to use these!
 
     void setCallee(Value aCalleev) const {
-        clearUsedRval();
+        this->clearUsedRval();
         argv_[-2] = aCalleev;
     }
 
@@ -194,6 +215,15 @@ class MOZ_STACK_CLASS CallReceiver
     }
 };
 
+} // namespace detail
+
+class MOZ_STACK_CLASS CallReceiver : public detail::CallReceiverBase<detail::IncludeUsedRval>
+{
+  private:
+    friend CallReceiver CallReceiverFromVp(Value *vp);
+    friend CallReceiver CallReceiverFromArgv(Value *argv);
+};
+
 MOZ_ALWAYS_INLINE CallReceiver
 CallReceiverFromArgv(Value *argv)
 {
@@ -233,11 +263,63 @@ CallReceiverFromVp(Value *vp)
  * public interface are meant to be used by embedders!  See inline comments to
  * for details.
  */
-class MOZ_STACK_CLASS CallArgs : public CallReceiver
+namespace detail {
+
+template<UsedRval WantUsedRval>
+class MOZ_STACK_CLASS CallArgsBase :
+        public mozilla::Conditional<WantUsedRval == detail::IncludeUsedRval,
+                                    CallReceiver,
+                                    CallReceiverBase<NoUsedRval> >::Type
 {
   protected:
     unsigned argc_;
 
+  public:
+    /* Returns the number of arguments. */
+    unsigned length() const { return argc_; }
+
+    /* Returns the i-th zero-indexed argument. */
+    Value &operator[](unsigned i) const {
+        MOZ_ASSERT(i < argc_);
+        return this->argv_[i];
+    }
+
+    /* Returns a mutable handle for the i-th zero-indexed argument. */
+    MutableHandleValue handleAt(unsigned i) const {
+        MOZ_ASSERT(i < argc_);
+        return MutableHandleValue::fromMarkedLocation(&this->argv_[i]);
+    }
+
+    /*
+     * Returns the i-th zero-indexed argument, or |undefined| if there's no
+     * such argument.
+     */
+    Value get(unsigned i) const {
+        return i < length() ? this->argv_[i] : UndefinedValue();
+    }
+
+    /*
+     * Returns true if the i-th zero-indexed argument is present and is not
+     * |undefined|.
+     */
+    bool hasDefined(unsigned i) const {
+        return i < argc_ && !this->argv_[i].isUndefined();
+    }
+
+  public:
+    // These methods are publicly exposed, but we're less sure of the interface
+    // here than we'd like (because they're hackish and drop assertions).  Try
+    // to avoid using these if you can.
+
+    Value *array() const { return this->argv_; }
+    Value *end() const { return this->argv_ + argc_; }
+};
+
+} // namespace detail
+
+class MOZ_STACK_CLASS CallArgs : public detail::CallArgsBase<detail::IncludeUsedRval>
+{
+  private:
     friend CallArgs CallArgsFromVp(unsigned argc, Value *vp);
     friend CallArgs CallArgsFromSp(unsigned argc, Value *sp);
 
@@ -249,45 +331,6 @@ class MOZ_STACK_CLASS CallArgs : public CallReceiver
         return args;
     }
 
-  public:
-    /* Returns the number of arguments. */
-    unsigned length() const { return argc_; }
-
-    /* Returns the i-th zero-indexed argument. */
-    Value &operator[](unsigned i) const {
-        MOZ_ASSERT(i < argc_);
-        return argv_[i];
-    }
-
-    /* Returns a mutable handle for the i-th zero-indexed argument. */
-    MutableHandleValue handleAt(unsigned i) const {
-        MOZ_ASSERT(i < argc_);
-        return MutableHandleValue::fromMarkedLocation(&argv_[i]);
-    }
-
-    /*
-     * Returns the i-th zero-indexed argument, or |undefined| if there's no
-     * such argument.
-     */
-    Value get(unsigned i) const {
-        return i < length() ? argv_[i] : UndefinedValue();
-    }
-
-    /*
-     * Returns true if the i-th zero-indexed argument is present and is not
-     * |undefined|.
-     */
-    bool hasDefined(unsigned i) const {
-        return i < argc_ && !argv_[i].isUndefined();
-    }
-
-  public:
-    // These methods are publicly exposed, but we're less sure of the interface
-    // here than we'd like (because they're hackish and drop assertions).  Try
-    // to avoid using these if you can.
-
-    Value *array() const { return argv_; }
-    Value *end() const { return argv_ + argc_; }
 };
 
 MOZ_ALWAYS_INLINE CallArgs
diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index d686536bbd0..4d6a04f9460 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1453,7 +1453,7 @@ CodeGenerator::visitCallDOMNative(LCallDOMNative *call)
     masm.passABIArg(argPrivate);
     masm.passABIArg(argArgc);
     masm.passABIArg(argVp);
-    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, target->jitInfo()->op));
+    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, target->jitInfo()->method));
 
     if (target->jitInfo()->isInfallible) {
         masm.loadValue(Address(StackPointer, IonDOMMethodExitFrameLayout::offsetOfResult()),
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 5c6e6ece005..b1fc042fedd 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -7791,7 +7791,8 @@ IonBuilder::jsop_setprop(HandlePropertyName name)
         // properties.
         RootedFunction setter(cx, commonSetter);
         if (isDOM && TestShouldDOMCall(cx, objTypes, setter, JSJitInfo::Setter)) {
-            MSetDOMProperty *set = MSetDOMProperty::New(setter->jitInfo()->op, obj, value);
+            JS_ASSERT(setter->jitInfo()->type == JSJitInfo::Setter);
+            MSetDOMProperty *set = MSetDOMProperty::New(setter->jitInfo()->setter, obj, value);
             if (!set)
                 return false;
 
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index eb2707b3614..85934212490 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -6586,9 +6586,9 @@ class MSetDOMProperty
   : public MAryInstruction<2>,
     public MixPolicy<ObjectPolicy<0>, BoxPolicy<1> >
 {
-    const JSJitPropertyOp func_;
+    const JSJitSetterOp func_;
 
-    MSetDOMProperty(const JSJitPropertyOp func, MDefinition *obj, MDefinition *val)
+    MSetDOMProperty(const JSJitSetterOp func, MDefinition *obj, MDefinition *val)
       : func_(func)
     {
         setOperand(0, obj);
@@ -6598,12 +6598,12 @@ class MSetDOMProperty
   public:
     INSTRUCTION_HEADER(SetDOMProperty)
 
-    static MSetDOMProperty *New(const JSJitPropertyOp func, MDefinition *obj, MDefinition *val)
+    static MSetDOMProperty *New(const JSJitSetterOp func, MDefinition *obj, MDefinition *val)
     {
         return new MSetDOMProperty(func, obj, val);
     }
 
-    const JSJitPropertyOp fun() {
+    const JSJitSetterOp fun() {
         return func_;
     }
 
@@ -6631,6 +6631,7 @@ class MGetDOMProperty
       : info_(jitinfo)
     {
         JS_ASSERT(jitinfo);
+        JS_ASSERT(jitinfo->type == JSJitInfo::Getter);
 
         setOperand(0, obj);
 
@@ -6657,8 +6658,8 @@ class MGetDOMProperty
         return new MGetDOMProperty(info, obj, guard);
     }
 
-    const JSJitPropertyOp fun() {
-        return info_->op;
+    const JSJitGetterOp fun() {
+        return info_->getter;
     }
     bool isInfallible() const {
         return info_->isInfallible;
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index b8302dae8d7..efc53b31729 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -14,6 +14,8 @@
 #include "jspubtd.h"
 #include "jsprvtd.h"
 
+#include "js/CallArgs.h"
+
 /*
  * This macro checks if the stack pointer has exceeded a given limit. If
  * |tolerance| is non-zero, it returns true only if the stack pointer has
@@ -1432,14 +1434,86 @@ JS_GetDataViewByteLength(JSObject *obj);
 JS_FRIEND_API(void *)
 JS_GetDataViewData(JSObject *obj);
 
+/*
+ * A class, expected to be passed by value, which represents the CallArgs for a
+ * JSJitGetterOp.
+ */
+class JSJitGetterCallArgs : protected JS::MutableHandleValue
+{
+  public:
+    explicit JSJitGetterCallArgs(const JS::CallArgs& args)
+      : JS::MutableHandleValue(args.rval())
+    {}
+
+    JS::MutableHandleValue rval() {
+        return *this;
+    }
+};
+
+/*
+ * A class, expected to be passed by value, which represents the CallArgs for a
+ * JSJitSetterOp.
+ */
+class JSJitSetterCallArgs : protected JS::MutableHandleValue
+{
+  public:
+    explicit JSJitSetterCallArgs(const JS::CallArgs& args)
+      : JS::MutableHandleValue(args.handleAt(0))
+    {}
+
+    JS::MutableHandleValue handleAt(unsigned i) {
+        MOZ_ASSERT(i == 0);
+        return *this;
+    }
+
+    unsigned length() const { return 1; }
+
+    // Add get() or maybe hasDefined() as needed
+};
+
+/*
+ * A class, expected to be passed by reference, which represents the CallArgs
+ * for a JSJitMethodOp.
+ */
+class JSJitMethodCallArgs : protected JS::detail::CallArgsBase<JS::detail::NoUsedRval>
+{
+  private:
+    typedef JS::detail::CallArgsBase<JS::detail::NoUsedRval> Base;
+
+  public:
+    explicit JSJitMethodCallArgs(const JS::CallArgs& args) {
+        argv_ = args.array();
+        argc_ = args.length();
+    }
+
+    JS::MutableHandleValue rval() const {
+        return Base::rval();
+    }
+
+    unsigned length() const { return Base::length(); }
+
+    JS::MutableHandleValue handleAt(unsigned i) const {
+        return Base::handleAt(i);
+    }
+
+    bool hasDefined(unsigned i) const {
+        return Base::hasDefined(i);
+    }
+
+    // Add get() as needed
+};
+
 /*
  * This struct contains metadata passed from the DOM to the JS Engine for JIT
  * optimizations on DOM property accessors. Eventually, this should be made
  * available to general JSAPI users, but we are not currently ready to do so.
  */
 typedef bool
-(* JSJitPropertyOp)(JSContext *cx, JSHandleObject thisObj,
-                    void *specializedThis, JS::Value *vp);
+(* JSJitGetterOp)(JSContext *cx, JSHandleObject thisObj,
+                  void *specializedThis, JS::Value *vp);
+typedef bool
+(* JSJitSetterOp)(JSContext *cx, JSHandleObject thisObj,
+                  void *specializedThis, JS::Value *vp);
 typedef bool
 (* JSJitMethodOp)(JSContext *cx, JSHandleObject thisObj,
                   void *specializedThis, unsigned argc, JS::Value *vp);
@@ -1451,7 +1525,11 @@ struct JSJitInfo {
         Method
     };
 
-    JSJitPropertyOp op;
+    union {
+        JSJitGetterOp getter;
+        JSJitSetterOp setter;
+        JSJitMethodOp method;
+    };
     uint32_t protoID;
     uint32_t depth;
     OpType type;
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 95fa579d4a0..b5c474b3ba2 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4604,7 +4604,7 @@ dom_doFoo(JSContext* cx, JSHandleObject obj, void *self, unsigned argc, JS::Valu
 }
 
 const JSJitInfo dom_x_getterinfo = {
-    (JSJitPropertyOp)dom_get_x,
+    { (JSJitGetterOp)dom_get_x },
     0,        /* protoID */
     0,        /* depth */
     JSJitInfo::Getter,
@@ -4613,7 +4613,7 @@ const JSJitInfo dom_x_getterinfo = {
 };
 
 const JSJitInfo dom_x_setterinfo = {
-    (JSJitPropertyOp)dom_set_x,
+    { (JSJitGetterOp)dom_set_x },
     0,        /* protoID */
     0,        /* depth */
     JSJitInfo::Setter,
@@ -4622,7 +4622,7 @@ const JSJitInfo dom_x_setterinfo = {
 };
 
 const JSJitInfo doFoo_methodinfo = {
-    (JSJitPropertyOp)dom_doFoo,
+    { (JSJitGetterOp)dom_doFoo },
     0,        /* protoID */
     0,        /* depth */
     JSJitInfo::Method,
@@ -4684,7 +4684,7 @@ dom_genericGetter(JSContext *cx, unsigned argc, JS::Value *vp)
 
     const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
     MOZ_ASSERT(info->type == JSJitInfo::Getter);
-    JSJitPropertyOp getter = info->op;
+    JSJitGetterOp getter = info->getter;
     return getter(cx, obj, val.toPrivate(), vp);
 }
 
@@ -4707,7 +4707,7 @@ dom_genericSetter(JSContext* cx, unsigned argc, JS::Value* vp)
 
     const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
     MOZ_ASSERT(info->type == JSJitInfo::Setter);
-    JSJitPropertyOp setter = info->op;
+    JSJitSetterOp setter = info->setter;
     if (!setter(cx, obj, val.toPrivate(), argv))
         return false;
     JS_SET_RVAL(cx, vp, UndefinedValue());
@@ -4730,7 +4730,7 @@ dom_genericMethod(JSContext* cx, unsigned argc, JS::Value *vp)
 
     const JSJitInfo *info = FUNCTION_VALUE_TO_JITINFO(JS_CALLEE(cx, vp));
     MOZ_ASSERT(info->type == JSJitInfo::Method);
-    JSJitMethodOp method = (JSJitMethodOp)info->op;
+    JSJitMethodOp method = info->method;
     return method(cx, obj, val.toPrivate(), argc, vp);
 }
 

From 7e3223c2993effd0bdcf60b75f86f67f4c602696 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 30 May 2013 14:49:13 -0700
Subject: [PATCH 15/85] Bug 877390 - Do a blind null check. r=bz

Who knows why this happens, but this appears to be the culprit per crash
reports.
---
 dom/base/nsGlobalWindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 0d796daf3f8..771daef6767 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -7072,8 +7072,9 @@ nsGlobalWindow::FinalClose()
   //   round-trips to the event loop before the call to ReallyCloseWindow. This
   //   allows setTimeout handlers that are set after FinalClose() is called to
   //   run before the window is torn down.
-  bool indirect = nsContentUtils::GetCurrentJSContext() ==
-                  GetContextInternal()->GetNativeContext();
+  bool indirect = GetContextInternal() && // Occasionally null. See bug 877390.
+                  (nsContentUtils::GetCurrentJSContext() ==
+                   GetContextInternal()->GetNativeContext());
   if ((!indirect && nsContentUtils::IsCallerChrome()) ||
       NS_FAILED(nsCloseEvent::PostCloseEvent(this, indirect))) {
     ReallyCloseWindow();

From 98eae44f14862c89978c1bb263f2ddb03a41e0f1 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 31 May 2013 00:19:33 +0200
Subject: [PATCH 16/85] Bug 858377 - Increase time skew to avoid intermittent
 failure in test_393498.js Includes some test cleanups

---
 .../places/tests/bookmarks/test_393498.js     | 147 ++++++++----------
 1 file changed, 66 insertions(+), 81 deletions(-)

diff --git a/toolkit/components/places/tests/bookmarks/test_393498.js b/toolkit/components/places/tests/bookmarks/test_393498.js
index 2cd5c303bd4..775e676c31d 100644
--- a/toolkit/components/places/tests/bookmarks/test_393498.js
+++ b/toolkit/components/places/tests/bookmarks/test_393498.js
@@ -4,114 +4,99 @@
  * 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/. */
 
-try {
-  var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].getService(Ci.nsINavBookmarksService);
-  var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].getService(Ci.nsINavHistoryService);
-} catch(ex) {
-  do_throw("Could not get services\n");
-}
+let observer = {
+  __proto__: NavBookmarkObserver.prototype,
 
-// create and add bookmarks observer
-var observer = {
-  onBeginUpdateBatch: function() {},
-  onEndUpdateBatch: function() {},
-  onItemAdded: function(id, folder, index, itemType, uri) {
+  onItemAdded: function (id, folder, index) {
     this._itemAddedId = id;
     this._itemAddedParent = folder;
     this._itemAddedIndex = index;
   },
-  onItemRemoved: function() {},
-  _itemChangedProperty: null,
-  onItemChanged: function(id, property, isAnnotationProperty, value,
-                          lastModified, itemType) {
+  onItemChanged: function (id, property, isAnnotationProperty, value) {
     this._itemChangedId = id;
     this._itemChangedProperty = property;
     this._itemChanged_isAnnotationProperty = isAnnotationProperty;
     this._itemChangedValue = value;
-  },
-  onItemVisited: function() {},
-  onItemMoved: function() {},
-  QueryInterface: function(iid) {
-    if (iid.equals(Ci.nsINavBookmarkObserver) ||
-        iid.equals(Ci.nsISupports)) {
-      return this;
-    }
-    throw Cr.NS_ERROR_NO_INTERFACE;
   }
 };
-bmsvc.addObserver(observer, false);
+PlacesUtils.bookmarks.addObserver(observer, false);
+
+do_register_cleanup(function () {
+  PlacesUtils.bookmarks.removeObserver(observer);
+});
 
-// main
 function run_test() {
-  var testFolder = bmsvc.createFolder(bmsvc.placesRoot, "test Folder",
-                                      bmsvc.DEFAULT_INDEX);
-  var bookmarkId = bmsvc.insertBookmark(testFolder, uri("http://google.com/"),
-                                   bmsvc.DEFAULT_INDEX, "");
-  do_check_true(observer.itemChangedProperty == null);
+  // We set times in the past to workaround a timing bug due to virtual
+  // machines and the skew between PR_Now() and Date.now(), see bug 427142 and
+  // bug 858377 for details.
+  const PAST_PRTIME = (Date.now() - 86400000) * 1000;
 
-  // We set lastModified in the past to workaround a timing bug on
-  // virtual machines, see bug 427142 for details.
-  var newDate = (Date.now() - 10) * 1000;
-  bmsvc.setItemDateAdded(bookmarkId, newDate);
-  // test notification
+  // Insert a new bookmark.
+  let testFolder = PlacesUtils.bookmarks.createFolder(
+    PlacesUtils.placesRootId, "test Folder",
+    PlacesUtils.bookmarks.DEFAULT_INDEX);
+  let bookmarkId = PlacesUtils.bookmarks.insertBookmark(
+    testFolder, uri("http://google.com/"),
+    PlacesUtils.bookmarks.DEFAULT_INDEX, "");
+
+  // Sanity check.
+  do_check_true(observer.itemChangedProperty === undefined);
+
+  // Set dateAdded in the past and verify the bookmarks cache.
+  PlacesUtils.bookmarks.setItemDateAdded(bookmarkId, PAST_PRTIME);
   do_check_eq(observer._itemChangedProperty, "dateAdded");
-  do_check_eq(observer._itemChangedValue, newDate);
-  // test saved value
-  var dateAdded = bmsvc.getItemDateAdded(bookmarkId);
-  do_check_eq(dateAdded, newDate);
+  do_check_eq(observer._itemChangedValue, PAST_PRTIME);
+  let dateAdded = PlacesUtils.bookmarks.getItemDateAdded(bookmarkId);
+  do_check_eq(dateAdded, PAST_PRTIME);
 
-  // after just inserting, modified should not be set
-  var lastModified = bmsvc.getItemLastModified(bookmarkId);
-  do_check_eq(lastModified, dateAdded);
+  // After just inserting, modified should be the same as dateAdded.
+  do_check_eq(PlacesUtils.bookmarks.getItemLastModified(bookmarkId), dateAdded);
 
-  bmsvc.setItemLastModified(bookmarkId, newDate);
-  // test notification
+  // Set lastModified in the past and verify the bookmarks cache.
+  PlacesUtils.bookmarks.setItemLastModified(bookmarkId, PAST_PRTIME);
   do_check_eq(observer._itemChangedProperty, "lastModified");
-  do_check_eq(observer._itemChangedValue, newDate);
-  // test saved value
-  do_check_eq(bmsvc.getItemLastModified(bookmarkId), newDate);
+  do_check_eq(observer._itemChangedValue, PAST_PRTIME);
+  do_check_eq(PlacesUtils.bookmarks.getItemLastModified(bookmarkId),
+              PAST_PRTIME);
 
-  // set bookmark title
-  bmsvc.setItemTitle(bookmarkId, "Google");
+  // Set bookmark title
+  PlacesUtils.bookmarks.setItemTitle(bookmarkId, "Google");
+
+  // Test notifications.
   do_check_eq(observer._itemChangedId, bookmarkId);
   do_check_eq(observer._itemChangedProperty, "title");
   do_check_eq(observer._itemChangedValue, "Google");
 
-  // check lastModified has been updated
-  do_check_true(bmsvc.getItemLastModified(bookmarkId) > newDate);
+  // Check lastModified has been updated.
+  is_time_ordered(PAST_PRTIME,
+                  PlacesUtils.bookmarks.getItemLastModified(bookmarkId));
 
-  // check that node properties are updated 
-  var query = histsvc.getNewQuery();
-  query.setFolders([testFolder], 1);
-  var result = histsvc.executeQuery(query, histsvc.getNewQueryOptions());
-  var rootNode = result.root;
-  rootNode.containerOpen = true;
-  do_check_eq(rootNode.childCount, 1);
-  var childNode = rootNode.getChild(0);
+  // Check that node properties are updated.
+  let root = PlacesUtils.getFolderContents(testFolder).root;
+  do_check_eq(root.childCount, 1);
+  let childNode = root.getChild(0);
 
   // confirm current dates match node properties
-  do_check_eq(bmsvc.getItemDateAdded(bookmarkId), childNode.dateAdded);
-  do_check_eq(bmsvc.getItemLastModified(bookmarkId), childNode.lastModified);
+  do_check_eq(PlacesUtils.bookmarks.getItemDateAdded(bookmarkId),
+              childNode.dateAdded);
+  do_check_eq(PlacesUtils.bookmarks.getItemLastModified(bookmarkId),
+              childNode.lastModified);
 
-  // test live update of lastModified caused by other changes:
-  // We set lastModified in the past to workaround timers resolution,
-  // see bug 427142 for details.
-  var pastDate = (Date.now() - 10) * 1000;
-  bmsvc.setItemLastModified(bookmarkId, pastDate);
-  // set title (causing update of last modified)
-  var oldLastModified = bmsvc.getItemLastModified(bookmarkId);
-  bmsvc.setItemTitle(bookmarkId, "Google");
-  // test that lastModified is updated
-  is_time_ordered(oldLastModified, childNode.lastModified);
-  // test that node value matches db value
-  do_check_eq(bmsvc.getItemLastModified(bookmarkId), childNode.lastModified);
+  // Test live update of lastModified when setting title.
+  PlacesUtils.bookmarks.setItemLastModified(bookmarkId, PAST_PRTIME);
+  PlacesUtils.bookmarks.setItemTitle(bookmarkId, "Google");
 
-  // test live update of the exposed date apis
-  newDate = Date.now() * 1000;
-  bmsvc.setItemDateAdded(bookmarkId, newDate);
-  do_check_eq(childNode.dateAdded, newDate);
-  bmsvc.setItemLastModified(bookmarkId, newDate);
-  do_check_eq(childNode.lastModified, newDate);
+  // Check lastModified has been updated.
+  is_time_ordered(PAST_PRTIME, childNode.lastModified);
+  // Test that node value matches db value.
+  do_check_eq(PlacesUtils.bookmarks.getItemLastModified(bookmarkId),
+              childNode.lastModified);
 
-  rootNode.containerOpen = false;
+  // Test live update of the exposed date apis.
+  PlacesUtils.bookmarks.setItemDateAdded(bookmarkId, PAST_PRTIME);
+  do_check_eq(childNode.dateAdded, PAST_PRTIME);
+  PlacesUtils.bookmarks.setItemLastModified(bookmarkId, PAST_PRTIME);
+  do_check_eq(childNode.lastModified, PAST_PRTIME);
+
+  root.containerOpen = false;
 }

From 960f8b8a497f00ef516ea6e5153d60e448fd5f57 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 15:38:59 -0700
Subject: [PATCH 17/85] Bug 862377 - Move PromptInputs to their own class.
 r=sriram

---
 mobile/android/base/Makefile.in               |   1 +
 mobile/android/base/Prompt.java               | 192 +---------
 mobile/android/base/PromptInput.java          | 331 ++++++++++++++++++
 .../layout/simple_dropdown_item_1line.xml     |   2 +-
 4 files changed, 339 insertions(+), 187 deletions(-)
 create mode 100644 mobile/android/base/PromptInput.java

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 460235f1595..d29a84b20b5 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -130,6 +130,7 @@ FENNEC_JAVA_FILES = \
   PrivateTab.java \
   ProfileMigrator.java \
   Prompt.java \
+  PromptInput.java \
   PromptService.java \
   Restarter.java \
   SearchEngine.java \
diff --git a/mobile/android/base/Prompt.java b/mobile/android/base/Prompt.java
index 80bb18e1708..a986b8d2516 100644
--- a/mobile/android/base/Prompt.java
+++ b/mobile/android/base/Prompt.java
@@ -105,186 +105,6 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
         }
     }
 
-    private static String formatDateString(String dateFormat, Calendar calendar) {
-        return new SimpleDateFormat(dateFormat).format(calendar.getTime());
-    }
-
-    private class PromptInput {
-        private final JSONObject mJSONInput;
-
-        private final String mLabel;
-        private final String mType;
-        private final String mId;
-        private final String mHint;
-        private final boolean mAutofocus;
-        private final String mValue;
-
-        private View mView;
-
-        public PromptInput(JSONObject aJSONInput) {
-            mJSONInput = aJSONInput;
-            mLabel = getSafeString(aJSONInput, "label");
-            mType = getSafeString(aJSONInput, "type");
-            String id = getSafeString(aJSONInput, "id");
-            mId = TextUtils.isEmpty(id) ? mType : id;
-            mHint = getSafeString(aJSONInput, "hint");
-            mValue = getSafeString(aJSONInput, "value");
-            mAutofocus = getSafeBool(aJSONInput, "autofocus");
-        }
-
-        public View getView() throws UnsupportedOperationException {
-            if (mType.equals("checkbox")) {
-                CheckBox checkbox = new CheckBox(mContext);
-                checkbox.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
-                checkbox.setText(mLabel);
-                checkbox.setChecked(getSafeBool(mJSONInput, "checked"));
-                mView = (View)checkbox;
-            } else if (mType.equals("date")) {
-                try {
-                    DateTimePicker input = new DateTimePicker(mContext, "yyyy-MM-dd", mValue,
-                                                              DateTimePicker.PickersState.DATE);
-                    input.toggleCalendar(true);
-                    mView = (View)input;
-                } catch (UnsupportedOperationException ex) {
-                    // We can't use our custom version of the DatePicker widget because the sdk is too old.
-                    // But we can fallback on the native one.
-                    DatePicker input = new DatePicker(mContext);
-                    try {
-                        if (!TextUtils.isEmpty(mValue)) {
-                            GregorianCalendar calendar = new GregorianCalendar();
-                            calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(mValue));
-                            input.updateDate(calendar.get(Calendar.YEAR),
-                                             calendar.get(Calendar.MONTH),
-                                             calendar.get(Calendar.DAY_OF_MONTH));
-                        }
-                    } catch (Exception e) {
-                        Log.e(LOGTAG, "error parsing format string: " + e);
-                    }
-                    mView = (View)input;
-                }
-            } else if (mType.equals("week")) {
-                DateTimePicker input = new DateTimePicker(mContext, "yyyy-'W'ww", mValue,
-                                                          DateTimePicker.PickersState.WEEK);
-                mView = (View)input;
-            } else if (mType.equals("time")) {
-                TimePicker input = new TimePicker(mContext);
-                input.setIs24HourView(DateFormat.is24HourFormat(mContext));
-
-                GregorianCalendar calendar = new GregorianCalendar();
-                if (!TextUtils.isEmpty(mValue)) {
-                    try {
-                        calendar.setTime(new SimpleDateFormat("kk:mm").parse(mValue));
-                    } catch (Exception e) { }
-                }
-                input.setCurrentHour(calendar.get(GregorianCalendar.HOUR_OF_DAY));
-                input.setCurrentMinute(calendar.get(GregorianCalendar.MINUTE));
-                mView = (View)input;
-            } else if (mType.equals("datetime-local") || mType.equals("datetime")) {
-                DateTimePicker input = new DateTimePicker(mContext, "yyyy-MM-dd kk:mm", mValue,
-                                                          DateTimePicker.PickersState.DATETIME);
-                input.toggleCalendar(true);
-                mView = (View)input;
-            } else if (mType.equals("month")) {
-                DateTimePicker input = new DateTimePicker(mContext, "yyyy-MM", mValue,
-                                                          DateTimePicker.PickersState.MONTH);
-                mView = (View)input;
-            } else if (mType.equals("textbox") || mType.equals("password")) {
-                EditText input = new EditText(mContext);
-                int inputtype = InputType.TYPE_CLASS_TEXT;
-                if (mType.equals("password")) {
-                    inputtype |= InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
-                }
-                input.setInputType(inputtype);
-                input.setText(mValue);
-
-                if (!TextUtils.isEmpty(mHint)) {
-                    input.setHint(mHint);
-                }
-
-                if (mAutofocus) {
-                    input.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-                        @Override
-                        public void onFocusChange(View v, boolean hasFocus) {
-                            if (hasFocus) {
-                                ((InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(v, 0);
-                            }
-                        }
-                    });
-                    input.requestFocus();
-                }
-
-                mView = (View)input;
-            } else if (mType.equals("menulist")) {
-                Spinner spinner = new Spinner(mContext);
-                try {
-                    String[] listitems = getStringArray(mJSONInput, "values");
-                    if (listitems.length > 0) {
-                        ArrayAdapter<String> adapter = new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, listitems);
-                        spinner.setAdapter(adapter);
-                        int selectedIndex = getSafeInt(mJSONInput, "selected");
-                        spinner.setSelection(selectedIndex);
-                    }
-                } catch(Exception ex) { }
-                mView = (View)spinner;
-            } else if (mType.equals("label")) {
-                // not really an input, but a way to add labels and such to the dialog
-                TextView view = new TextView(mContext);
-                view.setText(Html.fromHtml(mLabel));
-                mView = view;
-            }
-            return mView;
-        }
-
-        public String getId() {
-            return mId;
-        }
-
-        public String getValue() {
-            if (mType.equals("checkbox")) {
-                CheckBox checkbox = (CheckBox)mView;
-                return checkbox.isChecked() ? "true" : "false";
-            } else if (mType.equals("textbox") || mType.equals("password")) {
-                EditText edit = (EditText)mView;
-                return edit.getText().toString();
-            } else if (mType.equals("menulist")) {
-                Spinner spinner = (Spinner)mView;
-                return Integer.toString(spinner.getSelectedItemPosition());
-            } else if (mType.equals("time")) {
-                TimePicker tp = (TimePicker)mView;
-                GregorianCalendar calendar =
-                    new GregorianCalendar(0,0,0,tp.getCurrentHour(),tp.getCurrentMinute());
-                return formatDateString("kk:mm",calendar);
-            } else if (mType.equals("label")) {
-                return "";
-            } else if (android.os.Build.VERSION.SDK_INT < 11 && mType.equals("date")) {
-                // We can't use the custom DateTimePicker with a sdk older than 11.
-                // Fallback on the native DatePicker.
-                DatePicker dp = (DatePicker)mView;
-                GregorianCalendar calendar =
-                    new GregorianCalendar(dp.getYear(),dp.getMonth(),dp.getDayOfMonth());
-                return formatDateString("yyyy-MM-dd",calendar);
-            } else {
-                DateTimePicker dp = (DateTimePicker)mView;
-                GregorianCalendar calendar = new GregorianCalendar();
-                calendar.setTimeInMillis(dp.getTimeInMillis());
-                if (mType.equals("date")) {
-                    return formatDateString("yyyy-MM-dd",calendar);
-                } else if (mType.equals("week")) {
-                    return formatDateString("yyyy-'W'ww",calendar);
-                } else if (mType.equals("datetime-local")) {
-                    return formatDateString("yyyy-MM-dd kk:mm",calendar);
-                } else if (mType.equals("datetime")) {
-                    calendar.set(GregorianCalendar.ZONE_OFFSET,0);
-                    calendar.setTimeInMillis(dp.getTimeInMillis());
-                    return formatDateString("yyyy-MM-dd kk:mm",calendar);
-                } else if (mType.equals("month")) {
-                    return formatDateString("yyyy-MM",calendar);
-                }
-            }
-            return "";
-        }
-    }
-
     private View applyInputStyle(View view) {
         view.setPadding(mInputPaddingSize, 0, mInputPaddingSize, 0);
         return view;
@@ -348,7 +168,7 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
         } else if (length == 1) {
             try {
                 ScrollView view = new ScrollView(mContext);
-                view.addView(mInputs[0].getView());
+                view.addView(mInputs[0].getView(mContext));
                 builder.setView(applyInputStyle(view));
             } catch(UnsupportedOperationException ex) {
                 // We cannot display these input widgets with this sdk version,
@@ -363,7 +183,7 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
                 LinearLayout linearLayout = new LinearLayout(mContext);
                 linearLayout.setOrientation(LinearLayout.VERTICAL);
                 for (int i = 0; i < length; i++) {
-                    View content = mInputs[i].getView();
+                    View content = mInputs[i].getView(mContext);
                     linearLayout.addView(content);
                 }
                 ScrollView view = new ScrollView(mContext);
@@ -486,13 +306,13 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
         mInputs = new PromptInput[inputs.length()];
         for (int i = 0; i < mInputs.length; i++) {
             try {
-                mInputs[i] = new PromptInput(inputs.getJSONObject(i));
+                mInputs[i] = PromptInput.getInput(inputs.getJSONObject(i));
             } catch(Exception ex) { }
         }
 
         PromptListItem[] menuitems = getListItemArray(geckoObject, "listitems");
         mSelected = getBooleanArray(geckoObject, "selected");
-        boolean multiple = getSafeBool(geckoObject, "multiple");
+        boolean multiple = geckoObject.optBoolean("multiple");
         show(title, text, menuitems, multiple);
     }
 
@@ -528,7 +348,7 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
         }
     }
 
-    private String[] getStringArray(JSONObject aObject, String aName) {
+    public static String[] getStringArray(JSONObject aObject, String aName) {
         JSONArray items = getSafeArray(aObject, aName);
         int length = items.length();
         String[] list = new String[length];
@@ -540,7 +360,7 @@ public class Prompt implements OnClickListener, OnCancelListener, OnItemClickLis
         return list;
     }
 
-    private boolean[] getBooleanArray(JSONObject aObject, String aName) {
+    private static boolean[] getBooleanArray(JSONObject aObject, String aName) {
         JSONArray items = new JSONArray();
         try {
             items = aObject.getJSONArray(aName);
diff --git a/mobile/android/base/PromptInput.java b/mobile/android/base/PromptInput.java
new file mode 100644
index 00000000000..70a04e942e6
--- /dev/null
+++ b/mobile/android/base/PromptInput.java
@@ -0,0 +1,331 @@
+/* -*- 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;
+
+import org.mozilla.gecko.util.GeckoEventResponder;
+import org.mozilla.gecko.util.ThreadUtils;
+import org.mozilla.gecko.widget.DateTimePicker;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CheckedTextView;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.TimePicker;
+import android.content.Context;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.text.format.DateFormat;
+import android.util.Log;
+import android.text.Html;
+import android.widget.ArrayAdapter;
+import android.view.ViewGroup.LayoutParams;
+import android.view.inputmethod.InputMethodManager;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+
+class PromptInput {
+    private final JSONObject mJSONInput;
+
+    protected final String mLabel;
+    protected final String mType;
+    protected final String mId;
+    protected final String mValue;
+    protected View mView;
+    public static final String LOGTAG = "GeckoPromptInput";
+
+    public static class EditInput extends PromptInput {
+        protected final String mHint;
+        protected final boolean mAutofocus;
+        public static final String INPUT_TYPE = "textbox";
+
+        public EditInput(JSONObject object) {
+            super(object);
+            mHint = object.optString("hint");
+            mAutofocus = object.optBoolean("autofocus");
+        }
+
+        public View getView(final Context context) throws UnsupportedOperationException {
+            EditText input = new EditText(context);
+            input.setInputType(InputType.TYPE_CLASS_TEXT);
+            input.setText(mValue);
+
+            if (!TextUtils.isEmpty(mHint)) {
+                input.setHint(mHint);
+            }
+
+            if (mAutofocus) {
+                input.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                    @Override
+                    public void onFocusChange(View v, boolean hasFocus) {
+                        if (hasFocus) {
+                            ((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(v, 0);
+                        }
+                    }
+                });
+                input.requestFocus();
+            }
+
+            mView = (View)input;
+            return mView;
+        }
+
+        public String getValue() {
+            EditText edit = (EditText)mView;
+            return edit.getText().toString();
+        }
+    }
+
+    public static class PasswordInput extends EditInput {
+        public static final String INPUT_TYPE = "password";
+        public PasswordInput(JSONObject obj) {
+            super(obj);
+        }
+
+        public View getView(Context context) throws UnsupportedOperationException {
+            EditText input = (EditText) super.getView(context);
+            input.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+            return input;
+        }
+
+        public String getValue() {
+            EditText edit = (EditText)mView;
+            return edit.getText().toString();
+        }
+    }
+
+    public static class CheckboxInput extends PromptInput {
+        public static final String INPUT_TYPE = "checkbox";
+        private boolean mChecked;
+
+        public CheckboxInput(JSONObject obj) {
+            super(obj);
+            mChecked = obj.optBoolean("checked");
+        }
+
+        public View getView(Context context) throws UnsupportedOperationException {
+            CheckBox checkbox = new CheckBox(context);
+            checkbox.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+            checkbox.setText(mLabel);
+            checkbox.setChecked(mChecked);
+            mView = (View)checkbox;
+            return mView;
+        }
+
+        public String getValue() {
+            CheckBox checkbox = (CheckBox)mView;
+            return checkbox.isChecked() ? "true" : "false";
+        }
+    }
+
+    public static class DateTimeInput extends PromptInput {
+        public static final String[] INPUT_TYPES = new String[] {
+            "date",
+            "week",
+            "time",
+            "datetime-local",
+            "month"
+        };
+
+        public DateTimeInput(JSONObject obj) {
+            super(obj);
+        }
+
+        public View getView(Context context) throws UnsupportedOperationException {
+            if (mType.equals("date")) {
+                try {
+                    DateTimePicker input = new DateTimePicker(context, "yyyy-MM-dd", mValue,
+                                                              DateTimePicker.PickersState.DATE);
+                    input.toggleCalendar(true);
+                    mView = (View)input;
+                } catch (UnsupportedOperationException ex) {
+                    // We can't use our custom version of the DatePicker widget because the sdk is too old.
+                    // But we can fallback on the native one.
+                    DatePicker input = new DatePicker(context);
+                    try {
+                        if (!TextUtils.isEmpty(mValue)) {
+                            GregorianCalendar calendar = new GregorianCalendar();
+                            calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(mValue));
+                            input.updateDate(calendar.get(Calendar.YEAR),
+                                             calendar.get(Calendar.MONTH),
+                                             calendar.get(Calendar.DAY_OF_MONTH));
+                        }
+                    } catch (Exception e) {
+                        Log.e(LOGTAG, "error parsing format string: " + e);
+                    }
+                    mView = (View)input;
+                }
+            } else if (mType.equals("week")) {
+                DateTimePicker input = new DateTimePicker(context, "yyyy-'W'ww", mValue,
+                                                          DateTimePicker.PickersState.WEEK);
+                mView = (View)input;
+            } else if (mType.equals("time")) {
+                TimePicker input = new TimePicker(context);
+                input.setIs24HourView(DateFormat.is24HourFormat(context));
+
+                GregorianCalendar calendar = new GregorianCalendar();
+                if (!TextUtils.isEmpty(mValue)) {
+                    try {
+                        calendar.setTime(new SimpleDateFormat("kk:mm").parse(mValue));
+                    } catch (Exception e) { }
+                }
+                input.setCurrentHour(calendar.get(GregorianCalendar.HOUR_OF_DAY));
+                input.setCurrentMinute(calendar.get(GregorianCalendar.MINUTE));
+                mView = (View)input;
+            } else if (mType.equals("datetime-local") || mType.equals("datetime")) {
+                DateTimePicker input = new DateTimePicker(context, "yyyy-MM-dd kk:mm", mValue,
+                                                          DateTimePicker.PickersState.DATETIME);
+                input.toggleCalendar(true);
+                mView = (View)input;
+            } else if (mType.equals("month")) {
+                DateTimePicker input = new DateTimePicker(context, "yyyy-MM", mValue,
+                                                          DateTimePicker.PickersState.MONTH);
+                mView = (View)input;
+            }
+            return mView;
+        }
+
+        private static String formatDateString(String dateFormat, Calendar calendar) {
+            return new SimpleDateFormat(dateFormat).format(calendar.getTime());
+        }
+
+        public String getValue() {
+            if (android.os.Build.VERSION.SDK_INT < 11 && mType.equals("date")) {
+                // We can't use the custom DateTimePicker with a sdk older than 11.
+                // Fallback on the native DatePicker.
+                DatePicker dp = (DatePicker)mView;
+                GregorianCalendar calendar =
+                    new GregorianCalendar(dp.getYear(),dp.getMonth(),dp.getDayOfMonth());
+                return formatDateString("yyyy-MM-dd",calendar);
+            } else if (mType.equals("time")) {
+                TimePicker tp = (TimePicker)mView;
+                GregorianCalendar calendar =
+                    new GregorianCalendar(0,0,0,tp.getCurrentHour(),tp.getCurrentMinute());
+                return formatDateString("kk:mm",calendar);
+            } else {
+                DateTimePicker dp = (DateTimePicker)mView;
+                GregorianCalendar calendar = new GregorianCalendar();
+                calendar.setTimeInMillis(dp.getTimeInMillis());
+                if (mType.equals("date")) {
+                    return formatDateString("yyyy-MM-dd",calendar);
+                } else if (mType.equals("week")) {
+                    return formatDateString("yyyy-'W'ww",calendar);
+                } else if (mType.equals("datetime-local")) {
+                    return formatDateString("yyyy-MM-dd kk:mm",calendar);
+                } else if (mType.equals("datetime")) {
+                    calendar.set(GregorianCalendar.ZONE_OFFSET,0);
+                    calendar.setTimeInMillis(dp.getTimeInMillis());
+                    return formatDateString("yyyy-MM-dd kk:mm",calendar);
+                } else if (mType.equals("month")) {
+                    return formatDateString("yyyy-MM",calendar);
+                }
+            }
+            return super.getValue();
+        }
+    }
+
+    public static class MenulistInput extends PromptInput {
+        public static final String INPUT_TYPE = "menulist";
+        private static String[] mListitems;
+        private static int mSelected;
+
+        public MenulistInput(JSONObject obj) {
+            super(obj);
+            mListitems = Prompt.getStringArray(obj, "values");
+            mSelected = obj.optInt("selected");
+        }
+
+        public View getView(final Context context) throws UnsupportedOperationException {
+            Spinner spinner = new Spinner(context, Spinner.MODE_DIALOG);
+            try {
+                if (mListitems.length > 0) {
+                    ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, R.layout.simple_dropdown_item_1line, mListitems);
+                    spinner.setAdapter(adapter);
+                    spinner.setSelection(mSelected);
+                }
+            } catch(Exception ex) { }
+
+            mView = (View)spinner;
+            return mView;
+        }
+
+        public String getValue() {
+            Spinner spinner = (Spinner)mView;
+            return Integer.toString(spinner.getSelectedItemPosition());
+        }
+    }
+
+    public static class LabelInput extends PromptInput {
+        public static final String INPUT_TYPE = "label";
+        public LabelInput(JSONObject obj) {
+            super(obj);
+        }
+
+        public View getView(Context context) throws UnsupportedOperationException {
+            // not really an input, but a way to add labels and such to the dialog
+            TextView view = new TextView(context);
+            view.setText(Html.fromHtml(mLabel));
+            mView = view;
+            return mView;
+        }
+
+        public String getValue() {
+            return "";
+        }
+    }
+
+    public PromptInput(JSONObject obj) {
+        mJSONInput = obj;
+        mLabel = obj.optString("label");
+        mType = obj.optString("type");
+        String id = obj.optString("id");
+        mId = TextUtils.isEmpty(id) ? mType : id;
+        mValue = obj.optString("value");
+    }
+
+    public static PromptInput getInput(JSONObject obj) {
+        String type = obj.optString("type");
+        if (EditInput.INPUT_TYPE.equals(type)) {
+            return new EditInput(obj);
+        } else if (PasswordInput.INPUT_TYPE.equals(type)) {
+            return new PasswordInput(obj);
+        } else if (CheckboxInput.INPUT_TYPE.equals(type)) {
+            return new CheckboxInput(obj);
+        } else if (MenulistInput.INPUT_TYPE.equals(type)) {
+            return new MenulistInput(obj);
+        } else if (LabelInput.INPUT_TYPE.equals(type)) {
+            return new LabelInput(obj);
+        } else {
+            for (String dtType : DateTimeInput.INPUT_TYPES) {
+                if (dtType.equals(type)) {
+                    return new DateTimeInput(obj);
+                }
+            }
+        }
+        return null;
+    }
+
+    public View getView(Context context) throws UnsupportedOperationException {
+        return null;
+    }
+
+    public String getId() {
+        return mId;
+    }
+
+    public String getValue() {
+        return "";
+    }
+}
diff --git a/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml b/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml
index bc1c7999e44..19f82facddb 100644
--- a/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml
+++ b/mobile/android/base/resources/layout/simple_dropdown_item_1line.xml
@@ -20,5 +20,5 @@
     android:textAppearance="@style/TextAppearance.Widget.TextView"
     android:singleLine="true"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
     android:ellipsize="marquee"/>

From 1b090be859b69a4a97f88b9f6d052e4c9923d3ec Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 15:18:47 -0700
Subject: [PATCH 18/85] Bug 862377 - Allow adding inputs to doorhangers.
 r=sriram

---
 mobile/android/base/DoorHanger.java           | 50 +++++++++++++++----
 .../base/resources/layout/doorhanger.xml      |  7 +++
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/DoorHanger.java b/mobile/android/base/DoorHanger.java
index e14d15438df..d5f9efb3d7b 100644
--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -11,6 +11,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.content.Context;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
@@ -18,19 +19,23 @@ import android.text.style.URLSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DoorHanger extends LinearLayout implements Button.OnClickListener {
     private static final String LOGTAG = "GeckoDoorHanger";
 
-    private GeckoApp mActivity;
     // The popup that holds this doorhanger
     private DoorHangerPopup mPopup;
     private LinearLayout mChoicesLayout;
     private TextView mTextView;
+    private List<PromptInput> mInputs;
 
     // LayoutParams used for adding button layouts
     static private LayoutParams mLayoutParams;
@@ -48,13 +53,12 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
     private boolean mPersistWhileVisible = false;
     private long mTimeout = 0;
 
-    DoorHanger(GeckoApp aActivity, DoorHangerPopup aPopup, int aTabId, String aValue) {
-        super(aActivity);
+    DoorHanger(Context context, DoorHangerPopup popup, int tabId, String value) {
+        super(context);
 
-        mActivity = aActivity;
-        mPopup = aPopup;
-        mTabId = aTabId;
-        mValue = aValue;
+        mPopup = popup;
+        mTabId = tabId;
+        mValue = value;
     }
  
     int getTabId() {
@@ -77,7 +81,7 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
     void init(String message, JSONArray buttons, JSONObject options) {
         setOrientation(VERTICAL);
 
-        LayoutInflater.from(mActivity).inflate(R.layout.doorhanger, this);
+        LayoutInflater.from(getContext()).inflate(R.layout.doorhanger, this);
         setVisibility(View.GONE);
 
         mTextView = (TextView) findViewById(R.id.doorhanger_title);
@@ -114,13 +118,13 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
                                              LayoutParams.FILL_PARENT,
                                              1.0f);
 
-        Button button = (Button) LayoutInflater.from(mActivity).inflate(R.layout.doorhanger_button, null);
+        Button button = (Button) LayoutInflater.from(getContext()).inflate(R.layout.doorhanger_button, null);
         button.setText(aText);
         button.setTag(Integer.toString(aCallback));
         button.setOnClickListener(this);
 
         if (mChoicesLayout.getChildCount() > 0) {
-            Divider divider = new Divider(mActivity, null);
+            Divider divider = new Divider(getContext(), null);
             divider.setOrientation(Divider.Orientation.VERTICAL);
             divider.setBackgroundColor(0xFFD1D5DA);
             mChoicesLayout.addView(divider);
@@ -138,6 +142,14 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
             // If the checkbox is being used, pass its value
             if (mCheckBox != null)
                 response.put("checked", mCheckBox.isChecked());
+
+            if (mInputs != null) {
+                JSONObject inputs = new JSONObject();
+                for (PromptInput input : mInputs) {
+                    inputs.put(input.getId(), input.getValue());
+                }
+                response.put("inputs", inputs);
+            }
         } catch (JSONException e) {
             Log.e(LOGTAG, "Error creating onClick response", e);
         }
@@ -151,7 +163,7 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
         mPopup.updatePopup();
     }
 
-    private void setOptions(JSONObject options) {
+    private void setOptions(final JSONObject options) {
         try {
             mPersistence = options.getInt("persistence");
         } catch (JSONException e) { }
@@ -186,6 +198,22 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
             mTextView.setMovementMethod(LinkMovementMethod.getInstance());
         } catch (JSONException e) { }
 
+        final JSONArray inputs = options.optJSONArray("inputs");
+        if (inputs != null) {
+            mInputs = new ArrayList<PromptInput>();
+
+            final ViewGroup group = (ViewGroup) findViewById(R.id.doorhanger_inputs);
+            group.setVisibility(VISIBLE);
+
+            for (int i = 0; i < inputs.length(); i++) {
+                try {
+                    PromptInput pi = PromptInput.getInput(inputs.getJSONObject(i));
+                    mInputs.add(pi);
+                    group.addView(pi.getView(getContext()));
+                } catch(JSONException ex) { }
+            }
+        }
+
         try {
             String checkBoxText = options.getString("checkbox");
             mCheckBox = (CheckBox) findViewById(R.id.doorhanger_checkbox);
diff --git a/mobile/android/base/resources/layout/doorhanger.xml b/mobile/android/base/resources/layout/doorhanger.xml
index 591575ca71f..983d5943994 100644
--- a/mobile/android/base/resources/layout/doorhanger.xml
+++ b/mobile/android/base/resources/layout/doorhanger.xml
@@ -14,6 +14,13 @@
               android:textColorLink="@color/doorhanger_link"
               android:padding="10dp"/>
 
+    <LinearLayout android:id="@+id/doorhanger_inputs"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:gravity="right"
+              android:visibility="gone"/>
+
     <CheckBox android:id="@+id/doorhanger_checkbox"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"

From 5939a0d1fbc367bfb89fd9f993553ebba51cd1be Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 15:18:47 -0700
Subject: [PATCH 19/85] Bug 862377 - Show spinners on webrtc doorhangers.
 r=lucasr

---
 mobile/android/chrome/content/WebrtcUI.js     | 107 +++++++++++++-----
 mobile/android/chrome/content/browser.js      |   2 +-
 .../locales/en-US/chrome/browser.properties   |   8 ++
 3 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/mobile/android/chrome/content/WebrtcUI.js b/mobile/android/chrome/content/WebrtcUI.js
index 09ed031b477..fd4dc7b1622 100644
--- a/mobile/android/chrome/content/WebrtcUI.js
+++ b/mobile/android/chrome/content/WebrtcUI.js
@@ -27,28 +27,71 @@ var WebrtcUI = {
     );
   },
 
-  getDeviceButtons: function(aDevices, aCallID, stringBundle) {
-    let buttons = [{
-      label: stringBundle.GetStringFromName("getUserMedia.denyRequest.label"),
+  getDeviceButtons: function(audioDevices, videoDevices, aCallID) {
+    return [{
+      label: Strings.browser.GetStringFromName("getUserMedia.denyRequest.label"),
       callback: function() {
         Services.obs.notifyObservers(null, "getUserMedia:response:deny", aCallID);
       }
-    }];
-    for (let device of aDevices) {
-      let button = {
-        label: stringBundle.GetStringFromName("getUserMedia.shareRequest.label"),
-        callback: function() {
-          let allowedDevices = Cc["@mozilla.org/supports-array;1"].createInstance(Ci.nsISupportsArray);
-          allowedDevices.AppendElement(device);
-          Services.obs.notifyObservers(allowedDevices, "getUserMedia:response:allow", aCallID);
-          // Show browser-specific indicator for the active camera/mic access.
-          // XXX: Mobile?
-        }
-      };
-      buttons.push(button);
-    }
+    },
+    {
+      label: Strings.browser.GetStringFromName("getUserMedia.shareRequest.label"),
+      callback: function(checked /* ignored */, inputs) {
+        let allowedDevices = Cc["@mozilla.org/supports-array;1"].createInstance(Ci.nsISupportsArray);
 
-    return buttons;
+        let audioId = 0;
+        if (inputs && inputs.audioDevice != undefined)
+          audioId = inputs.audioDevice;
+        if (audioDevices[audioId])
+          allowedDevices.AppendElement(audioDevices[audioId]);
+
+        let videoId = 0;
+        if (inputs && inputs.videoDevice != undefined)
+          videoId = inputs.videoDevice;
+        if (videoDevices[videoId])
+          allowedDevices.AppendElement(videoDevices[videoId]);
+
+        Services.obs.notifyObservers(allowedDevices, "getUserMedia:response:allow", aCallID);
+        // TODO: Show tab-specific indicator for the active camera/mic access.
+      }
+    }];
+  },
+
+  // Get a list of string names for devices. Ensures that none of the strings are blank
+  _getList: function(aDevices, aType) {
+    let defaultCount = 0;
+    return aDevices.map(function(device) {
+        // if this is a Camera input, convert the name to something readable
+        let res = /Camera\ \d+,\ Facing (front|back)/.exec(device.name);
+        if (res)
+          return Strings.browser.GetStringFromName("getUserMedia." + aType + "." + res[1]);
+
+        if (device.name.trim() == "") {
+          defaultCount++;
+          return Strings.browser.formatStringFromName("getUserMedia." + aType + ".default", [defaultCount], 1);
+        }
+        return device.name
+      }, this);
+  },
+
+  _addDevicesToOptions: function(aDevices, aType, aOptions, extraOptions) {
+    if (aDevices.length) {
+
+      // Filter out empty items from the list
+      let list = this._getList(aDevices, aType);
+      if (extraOptions)
+        list = list.concat(extraOptions);
+
+      if (list.length > 0) {
+        aOptions.inputs.push({
+          id: aType,
+          type: "menulist",
+          label: Strings.browser.GetStringFromName("getUserMedia." + aType + ".prompt"),
+          values: list
+        });
+
+      }
+    }
   },
 
   prompt: function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) {
@@ -80,17 +123,29 @@ var WebrtcUI = {
 
     let host = aBrowser.contentDocument.documentURIObject.asciiHost;
     let requestor = BrowserApp.manifest ? "'" + BrowserApp.manifest.name  + "'" : host;
-    let stringBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-    let message = stringBundle.formatStringFromName("getUserMedia.share" + requestType + ".message", [ requestor ], 1);
+    let message = Strings.browser.formatStringFromName("getUserMedia.share" + requestType + ".message", [ requestor ], 1);
 
-    if (audioDevices.length) {
-      let buttons = this.getDeviceButtons(audioDevices, aCallID, stringBundle);
-      NativeWindow.doorhanger.show(message, "webrtc-request-audio", buttons, BrowserApp.selectedTab.id);
+    let options = { inputs: [] };
+    // if the users only option would be to select "No Audio" or "No Video"
+    // i.e. we're only showing audio or only video and there is only one device for that type
+    // don't bother showing a menulist to select from
+    var extraItems = null;
+    if (videoDevices.length > 1 || audioDevices.length > 0) {
+      // Only show the No Video option if there are also Audio devices to choose from
+      if (audioDevices.length > 0)
+        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoDevice.none") ];
+      this._addDevicesToOptions(videoDevices, "videoDevice", options, extraItems);
     }
 
-    if (videoDevices.length) {
-      let buttons = this.getDeviceButtons(videoDevices, aCallID, stringBundle);
-      NativeWindow.doorhanger.show(message, "webrtc-request-video", buttons, BrowserApp.selectedTab.id);
+    if (audioDevices.length > 1 || videoDevices.length > 0) {
+      // Only show the No Audio option if there are also Video devices to choose from
+      if (videoDevices.length > 0)
+        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.audioDevice.none") ];
+      this._addDevicesToOptions(audioDevices, "audioDevice", options, extraItems);
     }
+
+    let buttons = this.getDeviceButtons(audioDevices, videoDevices, aCallID);
+
+    NativeWindow.doorhanger.show(message, "webrtc-request", buttons, BrowserApp.selectedTab.id, options);
   }
 }
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 385727da12a..87aacc51b5c 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1674,7 +1674,7 @@ var NativeWindow = {
       if (this.doorhanger._callbacks[reply_id]) {
         // Pass the value of the optional checkbox to the callback
         let checked = data["checked"];
-        this.doorhanger._callbacks[reply_id].cb(checked);
+        this.doorhanger._callbacks[reply_id].cb(checked, data.inputs);
 
         let prompt = this.doorhanger._callbacks[reply_id].prompt;
         for (let id in this.doorhanger._callbacks) {
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index c22b6d9f092..30e380dbd92 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -256,6 +256,14 @@ getUserMedia.shareMicrophone.message = Would you like to share your microphone w
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.denyRequest.label = Don't Share
 getUserMedia.shareRequest.label = Share
+getUserMedia.videoDevice.default = Camera %S
+getUserMedia.videoDevice.front = Front facing
+getUserMedia.videoDevice.back = Back facing
+getUserMedia.videoDevice.none = No Video
+getUserMedia.videoDevice.prompt = Camera to use
+getUserMedia.audioDevice.default = Microphone %S
+getUserMedia.audioDevice.none = No Audio
+getUserMedia.audioDevice.prompt = Microphone to use
 getUserMedia.sharingCamera.message = You are currently sharing your camera with %S.
 getUserMedia.sharingMicrophone.message = You are currently sharing your microphone with %S.
 getUserMedia.sharingCameraAndMicrophone.message = You are currently sharing your camera and microphone with %S.

From 1a68dfbc8df0fc904fd8c1478d06ee55fc651659 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 15:18:47 -0700
Subject: [PATCH 20/85] Bug 862377 - Style spinners on doorhangers. r=sriram

---
 mobile/android/base/DoorHanger.java           | 69 ++++++++++++++++++-
 mobile/android/base/PromptInput.java          | 36 ++++++++--
 .../base/resources/layout/doorhanger.xml      |  4 +-
 .../base/resources/values-v11/dimens.xml      |  1 +
 .../base/resources/values-v11/styles.xml      | 14 ++--
 .../base/resources/values-v11/themes.xml      |  2 +
 .../android/base/resources/values/dimens.xml  |  4 ++
 .../android/base/resources/values/styles.xml  | 12 ++--
 .../android/base/resources/values/themes.xml  |  5 +-
 9 files changed, 122 insertions(+), 25 deletions(-)

diff --git a/mobile/android/base/DoorHanger.java b/mobile/android/base/DoorHanger.java
index d5f9efb3d7b..4a59a2865f8 100644
--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -12,6 +12,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.content.Context;
+import android.graphics.Rect;
+import android.os.Build;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
@@ -23,6 +25,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
+import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -37,6 +40,10 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
     private TextView mTextView;
     private List<PromptInput> mInputs;
 
+    private static int mInputPadding = -1;
+    private static int mSpinnerTextColor = -1;
+    private static int mSpinnerTextSize = -1;
+
     // LayoutParams used for adding button layouts
     static private LayoutParams mLayoutParams;
     private final int mTabId;
@@ -59,6 +66,16 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
         mPopup = popup;
         mTabId = tabId;
         mValue = value;
+
+        if (mInputPadding == -1) {
+            mInputPadding = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding_spinners);
+        }
+        if (mSpinnerTextColor == -1) {
+            mSpinnerTextColor = getResources().getColor(R.color.text_color_primary_disable_only);
+        }
+        if (mSpinnerTextSize == -1) {
+            mSpinnerTextSize = getResources().getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
+        }
     }
  
     int getTabId() {
@@ -207,9 +224,12 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
 
             for (int i = 0; i < inputs.length(); i++) {
                 try {
-                    PromptInput pi = PromptInput.getInput(inputs.getJSONObject(i));
-                    mInputs.add(pi);
-                    group.addView(pi.getView(getContext()));
+                    PromptInput input = PromptInput.getInput(inputs.getJSONObject(i));
+                    mInputs.add(input);
+
+                    View v = input.getView(getContext());
+                    styleInput(input, v);
+                    group.addView(v);
                 } catch(JSONException ex) { }
             }
         }
@@ -222,6 +242,49 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
         } catch (JSONException e) { }
     }
 
+    private void styleInput(PromptInput input, View view) {
+        if (input instanceof PromptInput.MenulistInput) {
+            styleSpinner(input, view);
+        } else {
+            // add some top and bottom padding to separate inputs
+            view.setPadding(0, mInputPadding,
+                            0, mInputPadding);
+        }
+    }
+
+    private void styleSpinner(PromptInput input, View view) {
+        PromptInput.MenulistInput spinInput = (PromptInput.MenulistInput) input;
+        // Spinners have some intrinsic padding of their own. This aligns things so that
+        // the spinner text, spinner label text, and main doorhanger text are all aligned
+
+        // First get the padding of the selected view inside the spinner. Since the spinner
+        // hasn't been shown yet, we get this view directly from the adapter.
+        SpinnerAdapter a = spinInput.spinner.getAdapter();
+        View dropView = a.getView(0, null, spinInput.spinner);
+        int left = 0;
+        if (dropView != null) {
+            left = dropView.getPaddingLeft();
+        }
+
+        // Then get the intrinsic padding built into the background image of the spinner.
+        int p = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding);
+        Rect rect = new Rect();
+        spinInput.spinner.getBackground().getPadding(rect);
+
+        // Now offset the entire spinner view enough so that when the background drawable
+        // padding and the textview's padding are added, the text is aligned
+        // with the doorhanger text.
+        view.setPadding(p - rect.left - left, 0, rect.right, mInputPadding);
+
+        if (spinInput.textView != null) {
+            spinInput.textView.setTextColor(mSpinnerTextColor);
+            spinInput.textView.setTextSize(mSpinnerTextSize);
+
+            // If this spinner has a label, offset it to also be aligned with the doorhanger text.
+            spinInput.textView.setPadding(rect.left + left, 0, 0, 0);
+        }
+    }
+
     // This method checks with persistence and timeout options to see if
     // it's okay to remove a doorhanger.
     boolean shouldRemove() {
diff --git a/mobile/android/base/PromptInput.java b/mobile/android/base/PromptInput.java
index 70a04e942e6..b93f74de489 100644
--- a/mobile/android/base/PromptInput.java
+++ b/mobile/android/base/PromptInput.java
@@ -12,15 +12,18 @@ import org.mozilla.gecko.widget.DateTimePicker;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CheckedTextView;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TimePicker;
-import android.content.Context;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
@@ -202,7 +205,7 @@ class PromptInput {
         }
 
         public String getValue() {
-            if (android.os.Build.VERSION.SDK_INT < 11 && mType.equals("date")) {
+            if (Build.VERSION.SDK_INT < 11 && mType.equals("date")) {
                 // We can't use the custom DateTimePicker with a sdk older than 11.
                 // Fallback on the native DatePicker.
                 DatePicker dp = (DatePicker)mView;
@@ -241,6 +244,9 @@ class PromptInput {
         private static String[] mListitems;
         private static int mSelected;
 
+        public Spinner spinner;
+        public AllCapsTextView textView;
+
         public MenulistInput(JSONObject obj) {
             super(obj);
             mListitems = Prompt.getStringArray(obj, "values");
@@ -248,21 +254,37 @@ class PromptInput {
         }
 
         public View getView(final Context context) throws UnsupportedOperationException {
-            Spinner spinner = new Spinner(context, Spinner.MODE_DIALOG);
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+                spinner = new Spinner(context);
+            } else {
+                spinner = new Spinner(context, Spinner.MODE_DIALOG);
+            }
             try {
                 if (mListitems.length > 0) {
-                    ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, R.layout.simple_dropdown_item_1line, mListitems);
+                    ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_spinner_item, mListitems);
+                    adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
                     spinner.setAdapter(adapter);
                     spinner.setSelection(mSelected);
                 }
             } catch(Exception ex) { }
 
-            mView = (View)spinner;
-            return mView;
+            if (!TextUtils.isEmpty(mLabel)) {
+                LinearLayout container = new LinearLayout(context);
+                container.setOrientation(LinearLayout.VERTICAL);
+
+                textView = new AllCapsTextView(context, null);
+                textView.setText(mLabel);
+                container.addView(textView);
+
+                container.addView(spinner);
+                return container;
+            }
+
+            return spinner;
         }
 
         public String getValue() {
-            Spinner spinner = (Spinner)mView;
             return Integer.toString(spinner.getSelectedItemPosition());
         }
     }
diff --git a/mobile/android/base/resources/layout/doorhanger.xml b/mobile/android/base/resources/layout/doorhanger.xml
index 983d5943994..35b31be7204 100644
--- a/mobile/android/base/resources/layout/doorhanger.xml
+++ b/mobile/android/base/resources/layout/doorhanger.xml
@@ -12,10 +12,10 @@
               android:textAppearance="?android:attr/textAppearanceMedium"
               android:textColor="@color/doorhanger_text"
               android:textColorLink="@color/doorhanger_link"
-              android:padding="10dp"/>
+              android:padding="@dimen/doorhanger_padding"/>
 
     <LinearLayout android:id="@+id/doorhanger_inputs"
-              android:layout_width="fill_parent"
+              android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:orientation="vertical"
               android:gravity="right"
diff --git a/mobile/android/base/resources/values-v11/dimens.xml b/mobile/android/base/resources/values-v11/dimens.xml
index 271ea86df62..3abad7528dc 100644
--- a/mobile/android/base/resources/values-v11/dimens.xml
+++ b/mobile/android/base/resources/values-v11/dimens.xml
@@ -6,5 +6,6 @@
 <resources>
 
     <dimen name="tabs_counter_size">22sp</dimen>
+    <dimen name="doorhanger_spinner_textsize">6sp</dimen>
 
 </resources>
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index 517d6edd0f9..32b42146a77 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -73,15 +73,17 @@
          <item name="android:dividerHeight">1dp</item>
     </style>
 
-    <!-- Spinner Item -->
-    <style name="SpinnerItem" parent="@android:style/Widget.Holo.Light.TextView.SpinnerItem">
-         <item name="android:textColor">#FFFFFFFF</item>
-         <item name="android:textSize">18sp</item>
-    </style>
-
     <!-- Spinner DropDown Item -->
     <style name="SpinnerDropDownItem" parent="@android:style/Widget.Holo.DropDownItem.Spinner">
          <item name="android:textColor">#FF222222</item>
     </style>
 
+    <style name="Widget.Spinner" parent="android:style/Widget.Holo.Light.Spinner">
+        <item name="android:minWidth">@dimen/doorhanger_input_width</item>
+    </style>
+
+    <style name="Widget.TextView.SpinnerItem" parent="android:style/Widget.Holo.Light.TextView.SpinnerItem">
+        <item name="android:textColor">#FF000000</item>
+    </style>
+
 </resources>
diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml
index f444ba44862..8a65645599d 100644
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -42,6 +42,8 @@
         <item name="android:windowBackground">@color/background_normal</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:listViewStyle">@style/Widget.ListView</item>
+        <item name="android:spinnerStyle">@style/Widget.Spinner</item>
+        <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
     </style>
 
 </resources>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 754b01ec0b1..4961292324b 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -36,6 +36,10 @@
 
     <!-- Max width of the doorhanger on tablets -->
     <dimen name="doorhanger_width">400dp</dimen>
+    <dimen name="doorhanger_input_width">250dp</dimen>
+    <dimen name="doorhanger_spinner_textsize">9sp</dimen>
+    <dimen name="doorhanger_padding">15dp</dimen>
+    <dimen name="doorhanger_padding_spinners">10dp</dimen>
 
     <dimen name="flow_layout_spacing">6dp</dimen>
     <dimen name="menu_item_icon">21dp</dimen>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 2e266698051..8b0927af5ec 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -40,10 +40,6 @@
         <item name="android:textAppearance">@style/TextAppearance.Widget.TextView</item>
     </style>
 
-    <style name="Widget.TextView.SpinnerItem">
-        <item name="android:textAppearance">@style/TextAppearance.Widget.TextView</item>
-    </style>
-
     <style name="Widget.ListView" parent="Widget.BaseListView">
         <item name="android:divider">#D1D5DA</item>
         <item name="android:dividerHeight">1dp</item>
@@ -436,7 +432,13 @@
     <style name="PopupAnimation">
         <item name="@android:windowEnterAnimation">@anim/popup_show</item>
         <item name="@android:windowExitAnimation">@anim/popup_hide</item>
-    </style>   
+    </style>
+
+    <style name="Widget.Spinner" parent="android:style/Widget.Spinner">
+        <item name="android:minWidth">@dimen/doorhanger_input_width</item>
+    </style>
+
+    <style name="Widget.TextView.SpinnerItem" parent="android:style/Widget.TextView.SpinnerItem"/>
 
     <style name="MenuItemDefault">
           <item name="android:textSize">16sp</item>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index 8f3dddf3712..12122c361f3 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -80,9 +80,10 @@
         <item name="android:buttonStyle">@style/Widget.Button</item>
         <item name="android:dropDownItemStyle">@style/Widget.DropDownItem</item>
         <item name="android:editTextStyle">@style/Widget.EditText</item>
-        <item name="android:spinnerDropDownItemStyle">@style/TextAppearance.Widget.TextView</item>
-        <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
         <item name="android:textViewStyle">@style/Widget.TextView</item>
+
+        <item name="android:spinnerStyle">@style/Widget.Spinner</item>
+        <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
     </style>
 
     <style name="Gecko.AwesomeBar" parent="GeckoAwesomeBarBase">

From 5bec7b2cf17932fc2b03db01949fd595786bd735 Mon Sep 17 00:00:00 2001
From: Tim Abraldes <tabraldes@mozilla.com>
Date: Thu, 30 May 2013 12:03:22 -0700
Subject: [PATCH 21/85] bug 875900. When processing a SecurityChange event,
 only change the security indicator icon if the event is related to the
 currently selected tab. r=mbrubeck

---
 browser/metro/base/content/WebProgress.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/browser/metro/base/content/WebProgress.js b/browser/metro/base/content/WebProgress.js
index 836a7d86200..5fce39ab031 100644
--- a/browser/metro/base/content/WebProgress.js
+++ b/browser/metro/base/content/WebProgress.js
@@ -64,15 +64,19 @@ const WebProgress = {
 
   _securityChange: function _securityChange(aJson, aTab) {
     let state = aJson.state;
-    let identityBox = document.getElementById("identity-box-inner");
     let nsIWebProgressListener = Ci.nsIWebProgressListener;
 
     if (state & nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL) {
-      aTab._identityState = identityBox.className = "verifiedIdentity";
+      aTab._identityState = "verifiedIdentity";
     } else if (state & nsIWebProgressListener.STATE_IS_SECURE) {
-      aTab._identityState = identityBox.className = "verifiedDomain";
+      aTab._identityState = "verifiedDomain";
     } else {
-      aTab._identityState = identityBox.className = "";
+      aTab._identityState = "";
+    }
+
+    if (aTab == Browser.selectedTab) {
+      let identityBox = document.getElementById("identity-box-inner");
+      identityBox.className = aTab._identityState;
     }
   },
 

From f66b82ce2e1afa1aca8fa573c633154f9c944410 Mon Sep 17 00:00:00 2001
From: Sean Stangl <sstangl@mozilla.com>
Date: Tue, 28 May 2013 14:21:21 -0700
Subject: [PATCH 22/85] Bug 876976 - Speed up array creation for global regexp
 matches. r=h4writer

---
 js/src/jsstr.cpp | 109 ++++++++++++++++++++++++-----------------------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 1f7e5aa8692..57d8683daee 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -1693,77 +1693,87 @@ class StringRegExpGuard
 };
 
 static bool
-DoMatchLocal(JSContext *cx, RegExpStatics *res, Handle<JSLinearString*> linearStr,
-             RegExpShared &re, MutableHandleValue rval)
+DoMatchLocal(JSContext *cx, CallArgs args, RegExpStatics *res, Handle<JSLinearString*> input,
+             RegExpShared &re)
 {
-    size_t charsLen = linearStr->length();
+    size_t charsLen = input->length();
+    const jschar *chars = input->chars();
+
     size_t i = 0;
     ScopedMatchPairs matches(&cx->tempLifoAlloc());
-    RegExpRunStatus status = re.execute(cx, linearStr->getChars(cx), charsLen, &i, matches);
+    RegExpRunStatus status = re.execute(cx, chars, charsLen, &i, matches);
     if (status == RegExpRunStatus_Error)
         return false;
 
-    /* Emulate ExecuteRegExpLegacy() behavior. */
     if (status == RegExpRunStatus_Success_NotFound) {
-        rval.setNull();
+        args.rval().setNull();
         return true;
     }
 
-    res->updateFromMatchPairs(cx, linearStr, matches);
-    return CreateRegExpMatchResult(cx, linearStr, matches, rval);
+    res->updateFromMatchPairs(cx, input, matches);
+
+    RootedValue rval(cx);
+    if (!CreateRegExpMatchResult(cx, input, chars, charsLen, matches, &rval))
+        return false;
+
+    args.rval().set(rval);
+    return true;
 }
 
 static bool
-BuildGlobalMatchArray(JSContext *cx, HandleString matchesInput, const MatchPair &pair, size_t count,
-                      MutableHandleObject array)
+DoMatchGlobal(JSContext *cx, CallArgs args, RegExpStatics *res, Handle<JSLinearString*> input,
+              RegExpShared &re)
 {
-    JS_ASSERT(count <= JSID_INT_MAX);  /* by max string length */
-    JS_ASSERT(pair.check());
+    size_t charsLen = input->length();
+    const jschar *chars = input->chars();
 
-    if (!array)
-        array.set(NewDenseEmptyArray(cx));
-    if (!array)
-        return false;
+    AutoValueVector elements(cx);
 
-    JSString *str = js_NewDependentString(cx, matchesInput, pair.start, pair.length());
-    if (!str)
-        return false;
+    MatchPair match;
+    size_t i = 0; /* Index used for iterating through the string. */
+    size_t lastMatch = 0; /* Index of last successful match. */
 
-    RootedValue v(cx);
-    v.setString(str);
-    return JSObject::defineElement(cx, array, count, v);
-}
-
-static bool
-DoMatchGlobal(JSContext *cx, RegExpStatics *res, Handle<JSLinearString*> linearPtr, RegExpShared &re,
-              MutableHandleObject array)
-{
-    size_t charsLen = linearPtr->length();
-
-    size_t prevMatch = 0;
-    bool isMatchFound = false;
-    for (size_t count = 0, i = 0, curMatch = 0; i <= charsLen; ++count) {
+    /* Accumulate results for each match. */
+    while (i <= charsLen) {
         if (!JS_CHECK_OPERATION_LIMIT(cx))
             return false;
 
-        MatchPair match;
-        RegExpRunStatus status = re.executeMatchOnly(cx, linearPtr->chars(), charsLen, &i, match);
+        size_t i_orig = i;
+
+        RegExpRunStatus status = re.executeMatchOnly(cx, chars, charsLen, &i, match);
         if (status == RegExpRunStatus_Error)
             return false;
-
         if (status == RegExpRunStatus_Success_NotFound)
             break;
 
-        isMatchFound = true;
-        prevMatch = curMatch;
-        curMatch = i;
-        if (!BuildGlobalMatchArray(cx, linearPtr, match, count, array))
+        lastMatch = i_orig;
+
+        /* Extract the matched substring, root it, and remember it for later. */
+        JSLinearString *str = js_NewDependentString(cx, input, match.start, match.length());
+        if (!str)
             return false;
+        if (!elements.append(StringValue(str)))
+            return false;
+
         if (match.isEmpty())
             ++i;
     }
-    if (isMatchFound)
-        res->updateLazily(cx, linearPtr, &re, prevMatch);
+
+    /* If unmatched, return null. */
+    if (elements.empty()) {
+        args.rval().setNull();
+        return true;
+    }
+
+    /* The last successful match updates the RegExpStatics. */
+    res->updateLazily(cx, input, &re, lastMatch);
+
+    /* Copy the rooted vector into the array object. */
+    JSObject *array = NewDenseCopiedArray(cx, elements.length(), elements.begin());
+    if (!array)
+        return false;
+
+    args.rval().setObject(*array);
     return true;
 }
 
@@ -1822,18 +1832,9 @@ js::str_match(JSContext *cx, unsigned argc, Value *vp)
     if (!linearStr)
         return false;
 
-    if (g.regExp().global()) {
-        RootedObject array(cx);
-        if (!DoMatchGlobal(cx, res, linearStr, g.regExp(), &array))
-            return false;
-        args.rval().setObjectOrNull(array);
-    } else {
-        RootedValue rval(cx);
-        if (!DoMatchLocal(cx, res, linearStr, g.regExp(), &rval))
-            return false;
-        args.rval().set(rval);
-    }
-    return true;
+    if (g.regExp().global())
+        return DoMatchGlobal(cx, args, res, linearStr, g.regExp());
+    return DoMatchLocal(cx, args, res, linearStr, g.regExp());
 }
 
 JSBool

From 2382f32122c8a28a7f488a07ec0d1c4689bdcf2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 30 May 2013 20:02:49 +0200
Subject: [PATCH 23/85] Bug 876044, r=dolske

--HG--
extra : rebase_source : c0210f896e12fafeb0b59725472c79b55f014caa
---
 .../en-US/chrome/browser/browser.properties   |  8 ++---
 browser/modules/webrtcUI.jsm                  | 32 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index d16583f4579..9707161df45 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -433,7 +433,7 @@ identity.loggedIn.description = Signed in as: %S
 identity.loggedIn.signOut.label = Sign Out
 identity.loggedIn.signOut.accessKey = O
 
-# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -447,9 +447,9 @@ getUserMedia.shareSelectedDevices.label = Share Selected Device;Share Selected D
 getUserMedia.shareSelectedDevices.accesskey = S
 getUserMedia.denyRequest.label = Don't Share
 getUserMedia.denyRequest.accesskey = D
-getUserMedia.sharingCamera.message = You are currently sharing your camera with %S.
-getUserMedia.sharingMicrophone.message = You are currently sharing your microphone with %S.
-getUserMedia.sharingCameraAndMicrophone.message = You are currently sharing your camera and microphone with %S.
+getUserMedia.sharingCamera.message2 = You are currently sharing your camera with this page.
+getUserMedia.sharingMicrophone.message2 = You are currently sharing your microphone with this page.
+getUserMedia.sharingCameraAndMicrophone.message2 = You are currently sharing your camera and microphone with this page.
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
diff --git a/browser/modules/webrtcUI.jsm b/browser/modules/webrtcUI.jsm
index ea517b9cf50..5b212ed0cb6 100644
--- a/browser/modules/webrtcUI.jsm
+++ b/browser/modules/webrtcUI.jsm
@@ -57,22 +57,24 @@ this.webrtcUI = {
 }
 
 function getBrowserForWindowId(aWindowID) {
-  let contentWindow = Services.wm.getOuterWindowWithId(aWindowID);
-  return contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                      .getInterface(Ci.nsIWebNavigation)
-                      .QueryInterface(Ci.nsIDocShell)
-                      .chromeEventHandler;
+  return getBrowserForWindow(Services.wm.getOuterWindowWithId(aWindowID));
+}
+
+function getBrowserForWindow(aContentWindow) {
+  return aContentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                       .getInterface(Ci.nsIWebNavigation)
+                       .QueryInterface(Ci.nsIDocShell)
+                       .chromeEventHandler;
 }
 
 function handleRequest(aSubject, aTopic, aData) {
   let {windowID: windowID, callID: callID} = JSON.parse(aData);
 
-  let browser = getBrowserForWindowId(windowID);
   let params = aSubject.QueryInterface(Ci.nsIMediaStreamOptions);
 
-  browser.ownerDocument.defaultView.navigator.mozGetUserMediaDevices(
+  Services.wm.getMostRecentWindow(null).navigator.mozGetUserMediaDevices(
     function (devices) {
-      prompt(browser, callID, params.audio, params.video || params.picture, devices);
+      prompt(windowID, callID, params.audio, params.video || params.picture, devices);
     },
     function (error) {
       // bug 827146 -- In the future, the UI should catch NO_DEVICES_FOUND
@@ -91,7 +93,7 @@ function denyRequest(aCallID, aError) {
   Services.obs.notifyObservers(msg, "getUserMedia:response:deny", aCallID);
 }
 
-function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) {
+function prompt(aWindowID, aCallID, aAudioRequested, aVideoRequested, aDevices) {
   let audioDevices = [];
   let videoDevices = [];
   for (let device of aDevices) {
@@ -120,8 +122,10 @@ function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) {
     return;
   }
 
-  let host = aBrowser.contentDocument.documentURIObject.asciiHost;
-  let chromeDoc = aBrowser.ownerDocument;
+  let contentWindow = Services.wm.getOuterWindowWithId(aWindowID);
+  let host = contentWindow.document.documentURIObject.asciiHost;
+  let browser = getBrowserForWindow(contentWindow);
+  let chromeDoc = browser.ownerDocument;
   let chromeWin = chromeDoc.defaultView;
   let stringBundle = chromeWin.gNavigatorBundle;
   let message = stringBundle.getFormattedString("getUserMedia.share" + requestType + ".message",
@@ -195,7 +199,7 @@ function prompt(aBrowser, aCallID, aAudioRequested, aVideoRequested, aDevices) {
 
   let options = null;
 
-  chromeWin.PopupNotifications.show(aBrowser, "webRTC-shareDevices", message,
+  chromeWin.PopupNotifications.show(browser, "webRTC-shareDevices", message,
                                     "webRTC-shareDevices-notification-icon", mainAction,
                                     secondaryActions, options);
 }
@@ -231,10 +235,8 @@ function showBrowserSpecificIndicator(aBrowser) {
 
   let chromeWin = aBrowser.ownerDocument.defaultView;
   let stringBundle = chromeWin.gNavigatorBundle;
-  let host = aBrowser.contentDocument.documentURIObject.asciiHost;
 
-  let message = stringBundle.getFormattedString("getUserMedia.sharing" + captureState + ".message",
-                                                [ host ]);
+  let message = stringBundle.getString("getUserMedia.sharing" + captureState + ".message2");
   let mainAction = null;
   let secondaryActions = null;
   let options = {

From 73752245a0d4a8326aa213b69bf4f5481302fcc5 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 30 May 2013 16:26:38 -0700
Subject: [PATCH 24/85] Bug 873670 - Always show active reader mode icon when
 viewing a page in reader mode. r=lucasr

---
 mobile/android/base/BrowserToolbar.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index a2b066cf7ae..69853893202 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -799,19 +799,20 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
         setSiteSecurityVisibility(mShowSiteSecurity && !isLoading);
 
         // Handle the readerMode image and visibility: We show the reader mode button if 1) you can
-        // enter reader mode for current page or 2) if you're already in reader mode and can exit back,
+        // enter reader mode for current page or 2) if you're already in reader mode,
         // in which case we show the reader mode "close" (reader_active) icon.
-        boolean exitableReaderMode = false;
+        boolean inReaderMode = false;
         Tab tab = Tabs.getInstance().getSelectedTab();
         if (tab != null)
-            exitableReaderMode = ReaderModeUtils.isAboutReader(tab.getURL()) && tab.canDoBack();
-        mReader.setImageResource(exitableReaderMode ? R.drawable.reader_active : R.drawable.reader);
-        mReader.setVisibility(!isLoading && (mShowReader || exitableReaderMode) ? View.VISIBLE : View.GONE);
+            inReaderMode = ReaderModeUtils.isAboutReader(tab.getURL());
+        mReader.setImageResource(inReaderMode ? R.drawable.reader_active : R.drawable.reader);
+
+        mReader.setVisibility(!isLoading && (mShowReader || inReaderMode) ? View.VISIBLE : View.GONE);
 
         // We want title to fill the whole space available for it when there are icons
         // being shown on the right side of the toolbar as the icons already have some
         // padding in them. This is just to avoid wasting space when icons are shown.
-        mTitle.setPadding(0, 0, (!isLoading && !(mShowReader || exitableReaderMode) ? mTitlePadding : 0), 0);
+        mTitle.setPadding(0, 0, (!isLoading && !(mShowReader || inReaderMode) ? mTitlePadding : 0), 0);
 
         updateFocusOrder();
     }

From 40a83e5fe16fb1043c4454a4a3cf290879be001e Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 30 May 2013 16:26:38 -0700
Subject: [PATCH 25/85] Bug 877729 - Remove getUrlForAboutReader and use
 getUrlFromAboutReader instead. r=lucasr

---
 mobile/android/base/ReaderModeUtils.java | 11 -----------
 mobile/android/base/Tab.java             |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/mobile/android/base/ReaderModeUtils.java b/mobile/android/base/ReaderModeUtils.java
index ff800b8e58c..51c0d99deb0 100644
--- a/mobile/android/base/ReaderModeUtils.java
+++ b/mobile/android/base/ReaderModeUtils.java
@@ -75,15 +75,4 @@ public class ReaderModeUtils {
 
         return aboutReaderUrl;
     }
-
-    /**
-     * Performs the inverse of getAboutReaderForUrl.
-     */
-    public static String getUrlForAboutReader(String aboutReaderUrl) {
-        String query = Uri.parse(aboutReaderUrl).getQuery();
-
-        // It would be nice if we could use Uri.getQueryParameter, but that
-        // doesn't work because "about:reader" isn't a hierarchical URI.
-        return query.substring(4, query.indexOf("&readingList="));
-    }
 }
diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java
index 9d8f2172732..f33d22893d6 100644
--- a/mobile/android/base/Tab.java
+++ b/mobile/android/base/Tab.java
@@ -428,7 +428,7 @@ public class Tab {
 
     public void toggleReaderMode() {
         if (ReaderModeUtils.isAboutReader(mUrl)) {
-            Tabs.getInstance().loadUrl(ReaderModeUtils.getUrlForAboutReader(mUrl));
+            Tabs.getInstance().loadUrl(ReaderModeUtils.getUrlFromAboutReader(mUrl));
         } else if (mReaderEnabled) {
             mEnteringReaderMode = true;
             Tabs.getInstance().loadUrl(ReaderModeUtils.getAboutReaderForUrl(mUrl, mId, mReadingListItem));

From 2286d2480d60dc3ef44b2280c8bfcddf0f44cc64 Mon Sep 17 00:00:00 2001
From: Xin Zhang <magicxinzhang@gmail.com>
Date: Tue, 28 May 2013 10:40:05 -0700
Subject: [PATCH 26/85] Bug 722788 - Use integer math to parse
 sufficiently-small decimal numbers in JSON text.  r=waldo

--HG--
extra : rebase_source : 8bd72909ce94b65ce68b8cb3b64b42948fe24026
---
 js/src/jsnum.cpp      | 18 ++++++++++++++++++
 js/src/jsnum.h        |  9 +++++++++
 js/src/jsonparser.cpp | 12 +++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index 5562db863f1..96256fd14e6 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -174,6 +174,24 @@ ComputeAccurateBinaryBaseInteger(const jschar *start, const jschar *end, int bas
     return value;
 }
 
+double
+js::ParseDecimalNumber(const JS::TwoByteChars chars)
+{
+    MOZ_ASSERT(chars.length() > 0);
+    uint64_t dec = 0;
+    RangedPtr<jschar> s = chars.start(), end = chars.end();
+    do {
+        jschar c = *s;
+        MOZ_ASSERT('0' <= c && c <= '9');
+        uint8_t digit = c - '0';
+        uint64_t next = dec * 10 + digit;
+        MOZ_ASSERT(next < DOUBLE_INTEGRAL_PRECISION_LIMIT,
+                   "next value won't be an integrally-precise double");
+        dec = next;
+    } while (++s < end);
+    return static_cast<double>(dec);
+}
+
 bool
 js::GetPrefixInteger(JSContext *cx, const jschar *start, const jschar *end, int base,
                      const jschar **endp, double *dp)
diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index 7daa28996da..e5d05792884 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -108,6 +108,15 @@ NumberToCString(JSContext *cx, ToCStringBuf *cbuf, double d, int base = 10);
  */
 const double DOUBLE_INTEGRAL_PRECISION_LIMIT = uint64_t(1) << 53;
 
+/*
+ * Parse a decimal number encoded in |chars|.  The decimal number must be
+ * sufficiently small that it will not overflow the integrally-precise range of
+ * the double type -- that is, the number will be smaller than
+ * DOUBLE_INTEGRAL_PRECISION_LIMIT
+ */
+extern double
+ParseDecimalNumber(const JS::TwoByteChars chars);
+
 /*
  * Compute the positive integer of the given base described immediately at the
  * start of the range [start, end) -- no whitespace-skipping, no magical
diff --git a/js/src/jsonparser.cpp b/js/src/jsonparser.cpp
index 4eb5ba0c50f..ad16db019cc 100644
--- a/js/src/jsonparser.cpp
+++ b/js/src/jsonparser.cpp
@@ -222,8 +222,18 @@ JSONParser::readNumber()
 
     /* Fast path: no fractional or exponent part. */
     if (current == end || (*current != '.' && *current != 'e' && *current != 'E')) {
-        const jschar *dummy;
+        TwoByteChars chars(digitStart.get(), current - digitStart);
+        if (chars.length() < strlen("9007199254740992")) {
+            // If the decimal number is shorter than the length of 2**53, (the
+            // largest number a double can represent with integral precision),
+            // parse it using a decimal-only parser.  This comparison is
+            // conservative but faster than a fully-precise check.
+            double d = ParseDecimalNumber(chars);
+            return numberToken(negative ? -d : d);
+        }
+
         double d;
+        const jschar *dummy;
         if (!GetPrefixInteger(cx, digitStart.get(), current.get(), 10, &dummy, &d))
             return token(OOM);
         JS_ASSERT(current == dummy);

From bb39a16a0ed8c0677ccf5e34491571cd84065685 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Thu, 23 May 2013 15:28:31 -0700
Subject: [PATCH 27/85] Bug 794323 - Remove the legacy JSON parsing mode, now
 that Firefox session store code doesn't need it.  r=luke for the JS bits,
 r=jlebar for the DOM bits, r=mak77 for the browser/toolkit bits

--HG--
extra : rebase_source : b7a422eb52fe8e435143dfcc435d56e4886859e6
---
 .../places/tests/unit/bookmarks.glue.json     |   2 +-
 dom/interfaces/json/nsIJSON.idl               |  29 +----
 dom/src/json/nsJSON.cpp                       |  56 ++-------
 dom/src/json/nsJSON.h                         |   8 +-
 js/src/builtin/Eval.cpp                       |   2 +-
 js/src/jit-test/tests/ion/bug725062.js        |   7 --
 js/src/json.cpp                               | 111 +++++++++---------
 js/src/json.h                                 |  37 ++----
 js/src/jsonparser.cpp                         |  38 ------
 js/src/jsonparser.h                           |  11 +-
 js/src/moz.build                              |   1 -
 js/src/shell/js.cpp                           |  27 -----
 js/src/tests/ecma_5/extensions/legacy-JSON.js |  55 ---------
 toolkit/components/places/PlacesUtils.jsm     |   8 +-
 14 files changed, 80 insertions(+), 312 deletions(-)
 delete mode 100644 js/src/jit-test/tests/ion/bug725062.js
 delete mode 100644 js/src/tests/ecma_5/extensions/legacy-JSON.js

diff --git a/browser/components/places/tests/unit/bookmarks.glue.json b/browser/components/places/tests/unit/bookmarks.glue.json
index 7047903310f..7f639e46266 100644
--- a/browser/components/places/tests/unit/bookmarks.glue.json
+++ b/browser/components/places/tests/unit/bookmarks.glue.json
@@ -1 +1 @@
-{"title":"","id":1,"dateAdded":1233157910552624,"lastModified":1233157955206833,"type":"text/x-moz-place-container","root":"placesRoot","children":[{"title":"Bookmarks Menu","id":2,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157993171424,"type":"text/x-moz-place-container","root":"bookmarksMenuFolder","children":[{"title":"examplejson","id":27,"parent":2,"dateAdded":1233157972101126,"lastModified":1233157984999673,"type":"text/x-moz-place","uri":"http://example.com/"}]},{"index":1,"title":"Bookmarks Toolbar","id":3,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157972101126,"annos":[{"name":"bookmarkProperties/description","flags":0,"expires":4,"mimeType":null,"type":3,"value":"Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar"}],"type":"text/x-moz-place-container","root":"toolbarFolder","children":[{"title":"examplejson","id":26,"parent":3,"dateAdded":1233157972101126,"lastModified":1233157984999673,"type":"text/x-moz-place","uri":"http://example.com/"}]},{"index":2,"title":"Tags","id":4,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157910582667,"type":"text/x-moz-place-container","root":"tagsFolder","children":[]},{"index":3,"title":"Unsorted Bookmarks","id":5,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157911033315,"type":"text/x-moz-place-container","root":"unfiledBookmarksFolder","children":[]},]}
+{"title":"","id":1,"dateAdded":1233157910552624,"lastModified":1233157955206833,"type":"text/x-moz-place-container","root":"placesRoot","children":[{"title":"Bookmarks Menu","id":2,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157993171424,"type":"text/x-moz-place-container","root":"bookmarksMenuFolder","children":[{"title":"examplejson","id":27,"parent":2,"dateAdded":1233157972101126,"lastModified":1233157984999673,"type":"text/x-moz-place","uri":"http://example.com/"}]},{"index":1,"title":"Bookmarks Toolbar","id":3,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157972101126,"annos":[{"name":"bookmarkProperties/description","flags":0,"expires":4,"mimeType":null,"type":3,"value":"Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar"}],"type":"text/x-moz-place-container","root":"toolbarFolder","children":[{"title":"examplejson","id":26,"parent":3,"dateAdded":1233157972101126,"lastModified":1233157984999673,"type":"text/x-moz-place","uri":"http://example.com/"}]},{"index":2,"title":"Tags","id":4,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157910582667,"type":"text/x-moz-place-container","root":"tagsFolder","children":[]},{"index":3,"title":"Unsorted Bookmarks","id":5,"parent":1,"dateAdded":1233157910552624,"lastModified":1233157911033315,"type":"text/x-moz-place-container","root":"unfiledBookmarksFolder","children":[]}]}
diff --git a/dom/interfaces/json/nsIJSON.idl b/dom/interfaces/json/nsIJSON.idl
index fdc1189f73d..a3dd0aba7bb 100644
--- a/dom/interfaces/json/nsIJSON.idl
+++ b/dom/interfaces/json/nsIJSON.idl
@@ -13,9 +13,9 @@ interface nsIScriptGlobalObject;
 [ptr] native JSContext(JSContext);
 
 /**
- * Encode and decode JSON text.
+ * Don't use this!  Use JSON.parse and JSON.stringify directly.
  */
-[scriptable, uuid(43845d58-1054-47fb-8be3-970b3f7bd7ea)]
+[scriptable, uuid(083aebb0-7790-43b2-ae81-9e404e626236)]
 interface nsIJSON : nsISupports
 {
   /**
@@ -54,29 +54,4 @@ interface nsIJSON : nsISupports
 
   // Make sure you GCroot the result of this function before using it.
   [noscript] jsval    decodeToJSVal(in AString str, in JSContext cx);
-
-
-  /*
-   * Decode a JSON string, but also accept some strings in non-JSON format, as
-   * the decoding methods here did previously before tightening.
-   *
-   * This method is provided only as a temporary transition path for users of
-   * the old code who depended on the ability to decode leniently; new users
-   * should use JSON.parse.
-   *
-   * This method must only be called from script.
-   *
-   * @param str the string to parse
-   */
-  [implicit_jscontext]
-  jsval legacyDecode(in AString str);
-
-  /* Identical to legacyDecode, but decode the contents of stream. */
-  [implicit_jscontext]
-  jsval legacyDecodeFromStream(in nsIInputStream stream,
-                               in long contentLength);
-
-  /* Identical to legacyDecode, but decode into a jsval. */
-  // Make sure you GCroot the result of this function before using it.
-  [noscript] jsval    legacyDecodeToJSVal(in AString str, in JSContext cx);
 };
diff --git a/dom/src/json/nsJSON.cpp b/dom/src/json/nsJSON.cpp
index ad26aa9e3ae..8f749eed046 100644
--- a/dom/src/json/nsJSON.cpp
+++ b/dom/src/json/nsJSON.cpp
@@ -401,8 +401,7 @@ nsJSON::DecodeInternal(JSContext* cx,
                        nsIInputStream *aStream,
                        int32_t aContentLength,
                        bool aNeedsConverter,
-                       JS::Value* aRetval,
-                       DecodingMode mode /* = STRICT */)
+                       JS::Value* aRetval)
 {
   // Consume the stream
   nsCOMPtr<nsIChannel> jsonChannel;
@@ -419,7 +418,7 @@ nsJSON::DecodeInternal(JSContext* cx,
     return NS_ERROR_FAILURE;
 
   nsRefPtr<nsJSONListener> jsonListener =
-    new nsJSONListener(cx, aRetval, aNeedsConverter, mode);
+    new nsJSONListener(cx, aRetval, aNeedsConverter);
 
   //XXX this stream pattern should be consolidated in netwerk
   rv = jsonListener->OnStartRequest(jsonChannel, nullptr);
@@ -468,44 +467,6 @@ nsJSON::DecodeInternal(JSContext* cx,
   return NS_OK;
 }
 
-
-NS_IMETHODIMP
-nsJSON::LegacyDecode(const nsAString& json, JSContext* cx, JS::Value* aRetval)
-{
-  const PRUnichar *data;
-  uint32_t len = NS_StringGetData(json, &data);
-  nsCOMPtr<nsIInputStream> stream;
-  nsresult rv = NS_NewByteInputStream(getter_AddRefs(stream),
-                                      (const char*) data,
-                                      len * sizeof(PRUnichar),
-                                      NS_ASSIGNMENT_DEPEND);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return DecodeInternal(cx, stream, len, false, aRetval, LEGACY);
-}
-
-NS_IMETHODIMP
-nsJSON::LegacyDecodeFromStream(nsIInputStream *aStream, int32_t aContentLength,
-                               JSContext* cx, JS::Value* aRetval)
-{
-  return DecodeInternal(cx, aStream, aContentLength, true, aRetval, LEGACY);
-}
-
-NS_IMETHODIMP
-nsJSON::LegacyDecodeToJSVal(const nsAString &str, JSContext *cx, JS::Value *result)
-{
-  JS::RootedValue reviver(cx, JS::NullValue()), value(cx);
-
-  JS::StableCharPtr chars(static_cast<const jschar*>(PromiseFlatString(str).get()),
-                          str.Length());
-  if (!js::ParseJSONWithReviver(cx, chars, str.Length(), reviver,
-                                &value, LEGACY)) {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  *result = value;
-  return NS_OK;
-}
-
 nsresult
 NS_NewJSON(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
@@ -520,12 +481,10 @@ NS_NewJSON(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 }
 
 nsJSONListener::nsJSONListener(JSContext *cx, JS::Value *rootVal,
-                               bool needsConverter,
-                               DecodingMode mode /* = STRICT */)
+                               bool needsConverter)
   : mNeedsConverter(needsConverter), 
     mCx(cx),
-    mRootVal(rootVal),
-    mDecodingMode(mode)
+    mRootVal(rootVal)
 {
 }
 
@@ -568,10 +527,9 @@ nsJSONListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
 
   JS::StableCharPtr chars(reinterpret_cast<const jschar*>(mBufferedChars.Elements()),
                           mBufferedChars.Length());
-  JSBool ok = js::ParseJSONWithReviver(mCx, chars,
-                                       (uint32_t) mBufferedChars.Length(),
-                                       reviver, &value,
-                                       mDecodingMode);
+  JSBool ok = JS_ParseJSONWithReviver(mCx, chars.get(),
+                                      uint32_t(mBufferedChars.Length()),
+                                      reviver, value.address());
 
   *mRootVal = value;
   mBufferedChars.TruncateLength(0);
diff --git a/dom/src/json/nsJSON.h b/dom/src/json/nsJSON.h
index bf188b10bfe..dd278530447 100644
--- a/dom/src/json/nsJSON.h
+++ b/dom/src/json/nsJSON.h
@@ -7,7 +7,6 @@
 #define nsJSON_h__
 
 #include "jsapi.h"
-#include "json.h"
 #include "nsIJSON.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
@@ -61,8 +60,7 @@ protected:
                           nsIInputStream* aStream,
                           int32_t aContentLength,
                           bool aNeedsConverter,
-                          JS::Value* aRetVal,
-                          DecodingMode mode = STRICT);
+                          JS::Value* aRetVal);
   nsCOMPtr<nsIURI> mURI;
 };
 
@@ -72,8 +70,7 @@ NS_NewJSON(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 class nsJSONListener : public nsIStreamListener
 {
 public:
-  nsJSONListener(JSContext *cx, JS::Value *rootVal, bool needsConverter,
-                 DecodingMode mode);
+  nsJSONListener(JSContext *cx, JS::Value *rootVal, bool needsConverter);
   virtual ~nsJSONListener();
 
   NS_DECL_ISUPPORTS
@@ -87,7 +84,6 @@ protected:
   nsCOMPtr<nsIUnicodeDecoder> mDecoder;
   nsCString mSniffBuffer;
   nsTArray<PRUnichar> mBufferedChars;
-  DecodingMode mDecodingMode;
   nsresult ProcessBytes(const char* aBuffer, uint32_t aByteLength);
   nsresult ConsumeConverted(const char* aBuffer, uint32_t aByteLength);
   nsresult Consume(const PRUnichar *data, uint32_t len);
diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
index cc7396b9573..d4c8fe5e38b 100644
--- a/js/src/builtin/Eval.cpp
+++ b/js/src/builtin/Eval.cpp
@@ -177,7 +177,7 @@ TryEvalJSON(JSContext *cx, JSScript *callerScript,
             if (cp == end) {
                 bool isArray = (chars[0] == '[');
                 JSONParser parser(cx, isArray ? chars : chars + 1U, isArray ? length : length - 2,
-                                  JSONParser::StrictJSON, JSONParser::NoError);
+                                  JSONParser::NoError);
                 RootedValue tmp(cx);
                 if (!parser.parse(&tmp))
                     return EvalJSON_Failure;
diff --git a/js/src/jit-test/tests/ion/bug725062.js b/js/src/jit-test/tests/ion/bug725062.js
deleted file mode 100644
index fa4d337761f..00000000000
--- a/js/src/jit-test/tests/ion/bug725062.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// |jit-test| error: InternalError
-function rec(x, self) {
-    if (a = parseLegacyJSON("[1 , ]").length)
-        self(x - 001 , self);
-    self(NaN, self);
-}
-rec(1, rec);
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 36f02bac821..f223e71b86c 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -46,58 +46,6 @@ Class js::JSONClass = {
     JS_ConvertStub
 };
 
-/* ES5 15.12.2. */
-JSBool
-js_json_parse(JSContext *cx, unsigned argc, Value *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    /* Step 1. */
-    JSString *str = (argc >= 1) ? ToString<CanGC>(cx, args[0]) : cx->names().undefined;
-    if (!str)
-        return false;
-
-    JSStableString *stable = str->ensureStable(cx);
-    if (!stable)
-        return false;
-
-    JS::Anchor<JSString *> anchor(stable);
-
-    RootedValue reviver(cx, (argc >= 2) ? args[1] : UndefinedValue());
-
-    /* Steps 2-5. */
-    return ParseJSONWithReviver(cx, stable->chars(), stable->length(), reviver, args.rval());
-}
-
-/* ES5 15.12.3. */
-JSBool
-js_json_stringify(JSContext *cx, unsigned argc, Value *vp)
-{
-    RootedObject replacer(cx, (argc >= 2 && vp[3].isObject())
-                              ? &vp[3].toObject()
-                              : NULL);
-    RootedValue value(cx, (argc >= 1) ? vp[2] : UndefinedValue());
-    RootedValue space(cx, (argc >= 3) ? vp[4] : UndefinedValue());
-
-    StringBuffer sb(cx);
-    if (!js_Stringify(cx, &value, replacer, space, sb))
-        return false;
-
-    // XXX This can never happen to nsJSON.cpp, but the JSON object
-    // needs to support returning undefined. So this is a little awkward
-    // for the API, because we want to support streaming writers.
-    if (!sb.empty()) {
-        JSString *str = sb.finishString();
-        if (!str)
-            return false;
-        vp->setString(str);
-    } else {
-        vp->setUndefined();
-    }
-
-    return true;
-}
-
 static inline bool IsQuoteSpecialCharacter(jschar c)
 {
     JS_STATIC_ASSERT('\b' < ' ');
@@ -855,13 +803,12 @@ Revive(JSContext *cx, HandleValue reviver, MutableHandleValue vp)
     return Walk(cx, obj, id, reviver, vp);
 }
 
-JSBool
+bool
 js::ParseJSONWithReviver(JSContext *cx, StableCharPtr chars, size_t length, HandleValue reviver,
-                         MutableHandleValue vp, DecodingMode decodingMode /* = STRICT */)
+                         MutableHandleValue vp)
 {
     /* 15.12.2 steps 2-3. */
-    JSONParser parser(cx, chars, length,
-                      decodingMode == STRICT ? JSONParser::StrictJSON : JSONParser::LegacyJSON);
+    JSONParser parser(cx, chars, length);
     if (!parser.parse(vp))
         return false;
 
@@ -880,6 +827,58 @@ json_toSource(JSContext *cx, unsigned argc, Value *vp)
 }
 #endif
 
+/* ES5 15.12.2. */
+JSBool
+js_json_parse(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    /* Step 1. */
+    JSString *str = (argc >= 1) ? ToString<CanGC>(cx, args[0]) : cx->names().undefined;
+    if (!str)
+        return false;
+
+    JSStableString *stable = str->ensureStable(cx);
+    if (!stable)
+        return false;
+
+    JS::Anchor<JSString *> anchor(stable);
+
+    RootedValue reviver(cx, (argc >= 2) ? args[1] : UndefinedValue());
+
+    /* Steps 2-5. */
+    return ParseJSONWithReviver(cx, stable->chars(), stable->length(), reviver, args.rval());
+}
+
+/* ES5 15.12.3. */
+JSBool
+js_json_stringify(JSContext *cx, unsigned argc, Value *vp)
+{
+    RootedObject replacer(cx, (argc >= 2 && vp[3].isObject())
+                              ? &vp[3].toObject()
+                              : NULL);
+    RootedValue value(cx, (argc >= 1) ? vp[2] : UndefinedValue());
+    RootedValue space(cx, (argc >= 3) ? vp[4] : UndefinedValue());
+
+    StringBuffer sb(cx);
+    if (!js_Stringify(cx, &value, replacer, space, sb))
+        return false;
+
+    // XXX This can never happen to nsJSON.cpp, but the JSON object
+    // needs to support returning undefined. So this is a little awkward
+    // for the API, because we want to support streaming writers.
+    if (!sb.empty()) {
+        JSString *str = sb.finishString();
+        if (!str)
+            return false;
+        vp->setString(str);
+    } else {
+        vp->setUndefined();
+    }
+
+    return true;
+}
+
 static const JSFunctionSpec json_static_methods[] = {
 #if JS_HAS_TOSOURCE
     JS_FN(js_toSource_str,  json_toSource,      0, 0),
diff --git a/js/src/json.h b/js/src/json.h
index 7fa2c117c80..a199391c681 100644
--- a/js/src/json.h
+++ b/js/src/json.h
@@ -7,42 +7,25 @@
 #ifndef json_h___
 #define json_h___
 
-#include "jsprvtd.h"
-#include "jspubtd.h"
-#include "jsapi.h"
-
+#include "js/CharacterEncoding.h"
+#include "js/RootingAPI.h"
+#include "js/Value.h"
 #include "js/Vector.h"
-
-#define JSON_MAX_DEPTH  2048
-#define JSON_PARSER_BUFSIZE 1024
+#include "vm/StringBuffer.h"
 
 extern JSObject *
 js_InitJSONClass(JSContext *cx, js::HandleObject obj);
 
 extern JSBool
-js_Stringify(JSContext *cx, js::MutableHandleValue vp,
-             JSObject *replacer, js::Value space,
-             js::StringBuffer &sb);
-
-// Avoid build errors on certain platforms that define these names as constants
-#undef STRICT
-#undef LEGACY
-
-/*
- * The type of JSON decoding to perform.  Strict decoding is to-the-spec;
- * legacy decoding accepts a few non-JSON syntaxes historically accepted by the
- * implementation.  (Full description of these deviations is deliberately
- * omitted.)  New users should use strict decoding rather than legacy decoding,
- * as legacy decoding might be removed at a future time.
- */
-enum DecodingMode { STRICT, LEGACY };
+js_Stringify(JSContext *cx, js::MutableHandleValue vp, JSObject *replacer,
+             js::Value space, js::StringBuffer &sb);
 
 namespace js {
 
-extern JS_FRIEND_API(JSBool)
-ParseJSONWithReviver(JSContext *cx, JS::StableCharPtr chars, size_t length, HandleValue filter,
-                     MutableHandleValue vp, DecodingMode decodingMode = STRICT);
+extern bool
+ParseJSONWithReviver(JSContext *cx, JS::StableCharPtr chars, size_t length, HandleValue reviver,
+                     MutableHandleValue vp);
 
-} /* namespace js */
+} // namespace js
 
 #endif /* json_h___ */
diff --git a/js/src/jsonparser.cpp b/js/src/jsonparser.cpp
index ad16db019cc..f5e549a066e 100644
--- a/js/src/jsonparser.cpp
+++ b/js/src/jsonparser.cpp
@@ -465,19 +465,6 @@ JSONParser::advancePropertyName()
     if (*current == '"')
         return readString<PropertyName>();
 
-    if (parsingMode == LegacyJSON && *current == '}') {
-        /*
-         * Previous JSON parsing accepted trailing commas in non-empty object
-         * syntax, and some users depend on this.  (Specifically, Places data
-         * serialization in versions of Firefox before 4.0.  We can remove this
-         * mode when profile upgrades from 3.6 become unsupported.)  Permit
-         * such trailing commas only when legacy parsing is specifically
-         * requested.
-         */
-        current++;
-        return token(ObjectClose);
-    }
-
     error("expected double-quoted property name");
     return token(Error);
 }
@@ -659,13 +646,6 @@ JSONParser::parse(MutableHandleValue vp)
                 }
                 goto JSONValue;
             }
-            if (token == ObjectClose) {
-                JS_ASSERT(state == FinishObjectMember);
-                JS_ASSERT(parsingMode == LegacyJSON);
-                if (!finishObject(&value, stack.back().properties()))
-                    return false;
-                break;
-            }
             if (token == OOM)
                 return false;
             if (token != Error)
@@ -754,24 +734,6 @@ JSONParser::parse(MutableHandleValue vp)
               }
 
               case ArrayClose:
-                if (parsingMode == LegacyJSON &&
-                    !stack.empty() &&
-                    stack.back().state == FinishArrayElement) {
-                    /*
-                     * Previous JSON parsing accepted trailing commas in
-                     * non-empty array syntax, and some users depend on this.
-                     * (Specifically, Places data serialization in versions of
-                     * Firefox prior to 4.0.  We can remove this mode when
-                     * profile upgrades from 3.6 become unsupported.)  Permit
-                     * such trailing commas only when specifically
-                     * instructed to do so.
-                     */
-                    if (!finishArray(&value, stack.back().elements()))
-                        return false;
-                    break;
-                }
-                /* FALL THROUGH */
-
               case ObjectClose:
               case Colon:
               case Comma:
diff --git a/js/src/jsonparser.h b/js/src/jsonparser.h
index f29cff1afba..e54c4f29c88 100644
--- a/js/src/jsonparser.h
+++ b/js/src/jsonparser.h
@@ -21,7 +21,6 @@ class JSONParser : private AutoGCRooter
 {
   public:
     enum ErrorHandling { RaiseError, NoError };
-    enum ParsingMode { StrictJSON, LegacyJSON };
 
   private:
     /* Data members */
@@ -32,7 +31,6 @@ class JSONParser : private AutoGCRooter
 
     Value v;
 
-    const ParsingMode parsingMode;
     const ErrorHandling errorHandling;
 
     enum Token { String, Number, True, False, Null,
@@ -113,20 +111,13 @@ class JSONParser : private AutoGCRooter
   public:
     /* Public API */
 
-    /*
-     * Create a parser for the provided JSON data.  The parser will accept
-     * certain legacy, non-JSON syntax if decodingMode is LegacyJSON.
-     * Description of this syntax is deliberately omitted: new code should only
-     * use strict JSON parsing.
-     */
+    /* Create a parser for the provided JSON data. */
     JSONParser(JSContext *cx, JS::StableCharPtr data, size_t length,
-               ParsingMode parsingMode = StrictJSON,
                ErrorHandling errorHandling = RaiseError)
       : AutoGCRooter(cx, JSONPARSER),
         cx(cx),
         current(data),
         end((data + length).get(), data.get(), length),
-        parsingMode(parsingMode),
         errorHandling(errorHandling),
         stack(cx),
         freeElements(cx),
diff --git a/js/src/moz.build b/js/src/moz.build
index ffacc4365a3..4f833297232 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -41,7 +41,6 @@ EXPORTS += [
     'jsdhash.h',
     'jsfriendapi.h',
     'jslock.h',
-    'json.h',
     'jsperf.h',
     'jsprf.h',
     'jsprototypes.h',
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index b5c474b3ba2..1b032e6fdc5 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -3506,28 +3506,6 @@ NewGlobal(JSContext *cx, unsigned argc, jsval *vp)
     return true;
 }
 
-static JSBool
-ParseLegacyJSON(JSContext *cx, unsigned argc, jsval *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    if (argc != 1 || !JSVAL_IS_STRING(args[0])) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_INVALID_ARGS, "parseLegacyJSON");
-        return false;
-    }
-
-    JSString *str = JSVAL_TO_STRING(args[0]);
-
-    size_t length;
-    const jschar *chars = JS_GetStringCharsAndLength(cx, str, &length);
-    if (!chars)
-        return false;
-
-    RootedValue value(cx, NullValue());
-    return js::ParseJSONWithReviver(cx, StableCharPtr(chars, length), length,
-                                    value, args.rval(), LEGACY);
-}
-
 static JSBool
 EnableStackWalkingAssertion(JSContext *cx, unsigned argc, jsval *vp)
 {
@@ -3895,11 +3873,6 @@ static JSFunctionSpecWithHelp shell_functions[] = {
 "  Return a new global object in a new compartment. If obj\n"
 "  is given, the compartment will be in the same zone as obj."),
 
-    JS_FN_HELP("parseLegacyJSON", ParseLegacyJSON, 1, 0,
-"parseLegacyJSON(str)",
-"  Parse str as legacy JSON, returning the result if the\n"
-"  parse succeeded and throwing a SyntaxError if not."),
-
     JS_FN_HELP("enableStackWalkingAssertion", EnableStackWalkingAssertion, 1, 0,
 "enableStackWalkingAssertion(enabled)",
 "  Enables or disables a particularly expensive assertion in stack-walking\n"
diff --git a/js/src/tests/ecma_5/extensions/legacy-JSON.js b/js/src/tests/ecma_5/extensions/legacy-JSON.js
deleted file mode 100644
index 1bf332e114b..00000000000
--- a/js/src/tests/ecma_5/extensions/legacy-JSON.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell) -- needs parseLegacyJSON
-// Any copyright is dedicated to the Public Domain.
-// http://creativecommons.org/licenses/publicdomain/
-
-try
-{
-  parseLegacyJSON("[,]");
-  throw new Error("didn't throw");
-}
-catch (e)
-{
-  assertEq(e instanceof SyntaxError, true, "didn't get syntax error, got: " + e);
-}
-
-try
-{
-  parseLegacyJSON("{,}");
-  throw new Error("didn't throw");
-}
-catch (e)
-{
-  assertEq(e instanceof SyntaxError, true, "didn't get syntax error, got: " + e);
-}
-
-assertEq(parseLegacyJSON("[1,]").length, 1);
-assertEq(parseLegacyJSON("[1, ]").length, 1);
-assertEq(parseLegacyJSON("[1 , ]").length, 1);
-assertEq(parseLegacyJSON("[1 ,]").length, 1);
-assertEq(parseLegacyJSON("[1,2,]").length, 2);
-assertEq(parseLegacyJSON("[1,2, ]").length, 2);
-assertEq(parseLegacyJSON("[1,2 , ]").length, 2);
-assertEq(parseLegacyJSON("[1,2 ,]").length, 2);
-
-assertEq(parseLegacyJSON('{"a": 2,}').a, 2);
-assertEq(parseLegacyJSON('{"a": 2, }').a, 2);
-assertEq(parseLegacyJSON('{"a": 2 , }').a, 2);
-assertEq(parseLegacyJSON('{"a": 2 ,}').a, 2);
-
-var obj;
-
-obj = parseLegacyJSON('{"a": 2,"b": 3,}');
-assertEq(obj.a + obj.b, 5);
-obj = parseLegacyJSON('{"a": 2,"b": 3, }');
-assertEq(obj.a + obj.b, 5);
-obj = parseLegacyJSON('{"a": 2,"b": 3 , }');
-assertEq(obj.a + obj.b, 5);
-obj = parseLegacyJSON('{"a": 2,"b": 3 ,}');
-assertEq(obj.a + obj.b, 5);
-
-/******************************************************************************/
-
-if (typeof reportCompare === "function")
-  reportCompare(true, true);
-
-print("Tests complete");
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index cb0cb1e2a0f..1785b2392f9 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -688,13 +688,7 @@ this.PlacesUtils = {
       case this.TYPE_X_MOZ_PLACE:
       case this.TYPE_X_MOZ_PLACE_SEPARATOR:
       case this.TYPE_X_MOZ_PLACE_CONTAINER:
-        var json = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
-        // Old profiles (pre-Firefox 4) may contain bookmarks.json files with
-        // trailing commas, which we once accepted but no longer do -- except
-        // when decoded using the legacy decoder.  This can be reverted to
-        // json.decode (better yet, to the ECMA-standard JSON.parse) when we no
-        // longer support upgrades from pre-Firefox 4 profiles.
-        nodes = json.legacyDecode("[" + blob + "]");
+        nodes = JSON.parse("[" + blob + "]");
         break;
       case this.TYPE_X_MOZ_URL:
         var parts = blob.split("\n");

From 1221330586ad3596a91f6c8473a24715a9c48346 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Fri, 24 May 2013 13:55:26 -0700
Subject: [PATCH 28/85] #include minimization, MOZ_STACK_CLASS application, and
 other minor jsonparser.h cleanups.  No bug, r=lumpy

--HG--
extra : rebase_source : cacc7a0bd2668f247c09bdb6c487755c9a008f90
---
 js/src/jsonparser.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/js/src/jsonparser.h b/js/src/jsonparser.h
index e54c4f29c88..bf7289be714 100644
--- a/js/src/jsonparser.h
+++ b/js/src/jsonparser.h
@@ -9,15 +9,13 @@
 
 #include "mozilla/Attributes.h"
 
-#include "jscntxt.h"
-#include "jsstr.h"
+#include "jsapi.h"
+
+#include "vm/String.h"
 
 namespace js {
 
-/*
- * NB: This class must only be used on the stack.
- */
-class JSONParser : private AutoGCRooter
+class MOZ_STACK_CLASS JSONParser : private AutoGCRooter
 {
   public:
     enum ErrorHandling { RaiseError, NoError };
@@ -141,23 +139,23 @@ class JSONParser : private AutoGCRooter
      * otherwise return true and set *vp to |undefined|.  (JSON syntax can't
      * represent |undefined|, so the JSON data couldn't have specified it.)
      */
-    bool parse(js::MutableHandleValue vp);
+    bool parse(MutableHandleValue vp);
 
   private:
-    js::Value numberValue() const {
+    Value numberValue() const {
         JS_ASSERT(lastToken == Number);
         JS_ASSERT(v.isNumber());
         return v;
     }
 
-    js::Value stringValue() const {
+    Value stringValue() const {
         JS_ASSERT(lastToken == String);
         JS_ASSERT(v.isString());
         return v;
     }
 
     JSAtom *atomValue() const {
-        js::Value strval = stringValue();
+        Value strval = stringValue();
         return &strval.toString()->asAtom();
     }
 
@@ -171,7 +169,7 @@ class JSONParser : private AutoGCRooter
     }
 
     Token stringToken(JSString *str) {
-        this->v = js::StringValue(str);
+        this->v = StringValue(str);
 #ifdef DEBUG
         lastToken = String;
 #endif
@@ -179,7 +177,7 @@ class JSONParser : private AutoGCRooter
     }
 
     Token numberToken(double d) {
-        this->v = js::NumberValue(d);
+        this->v = NumberValue(d);
 #ifdef DEBUG
         lastToken = Number;
 #endif

From 590f37edd9555873b29c68f490e75b6aa4903a83 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Fri, 31 May 2013 11:34:52 +1200
Subject: [PATCH 29/85] Bug 870400 - Calculate audio timestamps for WMF based
 on audio frames played, rather than trusting the container's timestamps.
 r=padenot

---
 content/media/wmf/WMFReader.cpp | 66 ++++++++++++++++++++++++++++++---
 content/media/wmf/WMFReader.h   | 11 ++++++
 2 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/content/media/wmf/WMFReader.cpp b/content/media/wmf/WMFReader.cpp
index f975de5530e..a680651d9d8 100644
--- a/content/media/wmf/WMFReader.cpp
+++ b/content/media/wmf/WMFReader.cpp
@@ -48,10 +48,13 @@ WMFReader::WMFReader(AbstractMediaDecoder* aDecoder)
     mVideoWidth(0),
     mVideoHeight(0),
     mVideoStride(0),
+    mAudioFrameSum(0),
+    mAudioFrameOffset(0),
     mHasAudio(false),
     mHasVideo(false),
     mCanSeek(false),
     mUseHwAccel(false),
+    mMustRecaptureAudioPosition(true),
     mIsMP3Enabled(WMFDecoder::IsMP3Supported())
 {
   NS_ASSERTION(NS_IsMainThread(), "Must be on main thread.");
@@ -605,6 +608,31 @@ GetSampleDuration(IMFSample* aSample)
   return HNsToUsecs(duration);
 }
 
+HRESULT
+HNsToFrames(int64_t aHNs, uint32_t aRate, int64_t* aOutFrames)
+{
+  MOZ_ASSERT(aOutFrames);
+  const int64_t HNS_PER_S = USECS_PER_S * 10;
+  CheckedInt<int64_t> i = aHNs;
+  i *= aRate;
+  i /= HNS_PER_S;
+  NS_ENSURE_TRUE(i.isValid(), E_FAIL);
+  *aOutFrames = i.value();
+  return S_OK;
+}
+
+HRESULT
+FramesToUsecs(int64_t aSamples, uint32_t aRate, int64_t* aOutUsecs)
+{
+  MOZ_ASSERT(aOutUsecs);
+  CheckedInt<int64_t> i = aSamples;
+  i *= USECS_PER_S;
+  i /= aRate;
+  NS_ENSURE_TRUE(i.isValid(), E_FAIL);
+  *aOutUsecs = i.value();
+  return S_OK;
+}
+
 bool
 WMFReader::DecodeAudioData()
 {
@@ -660,11 +688,33 @@ WMFReader::DecodeAudioData()
   memcpy(pcmSamples.get(), data, currentLength);
   buffer->Unlock();
 
-  int64_t offset = mDecoder->GetResource()->Tell();
-  int64_t timestamp = HNsToUsecs(timestampHns);
-  int64_t duration = GetSampleDuration(sample);
+  // We calculate the timestamp and the duration based on the number of audio
+  // frames we've already played. We don't trust the timestamp stored on the
+  // IMFSample, as sometimes it's wrong, possibly due to buggy encoders?
 
-  mAudioQueue.Push(new AudioData(offset,
+  // If this sample block comes after a discontinuity (i.e. a gap or seek)
+  // reset the frame counters, and capture the timestamp. Future timestamps
+  // will be offset from this block's timestamp.
+  UINT32 discontinuity = false;
+  sample->GetUINT32(MFSampleExtension_Discontinuity, &discontinuity);
+  if (mMustRecaptureAudioPosition || discontinuity) {
+    mAudioFrameSum = 0;
+    hr = HNsToFrames(timestampHns, mAudioRate, &mAudioFrameOffset);
+    NS_ENSURE_TRUE(SUCCEEDED(hr), false);
+    mMustRecaptureAudioPosition = false;
+  }
+
+  int64_t timestamp;
+  hr = FramesToUsecs(mAudioFrameOffset + mAudioFrameSum, mAudioRate, &timestamp);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), false);
+
+  mAudioFrameSum += numFrames;
+
+  int64_t duration;
+  hr = FramesToUsecs(numFrames, mAudioRate, &duration);
+  NS_ENSURE_TRUE(SUCCEEDED(hr), false);
+
+  mAudioQueue.Push(new AudioData(mDecoder->GetResource()->Tell(),
                                  timestamp,
                                  duration,
                                  numFrames,
@@ -901,7 +951,7 @@ WMFReader::DecodeVideoFrame(bool &aKeyframeSkip,
 
   #ifdef LOG_SAMPLE_DECODE
   LOG("Decoded video sample timestamp=%lld duration=%lld stride=%d height=%u flags=%u",
-      timestamp, duration, stride, mVideoHeight, flags);
+      timestamp, duration, mVideoStride, mVideoHeight, flags);
   #endif
 
   if ((flags & MF_SOURCE_READERF_ENDOFSTREAM)) {
@@ -930,6 +980,12 @@ WMFReader::Seek(int64_t aTargetUs,
   nsresult rv = ResetDecode();
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // Mark that we must recapture the audio frame count from the next sample.
+  // WMF doesn't set a discontinuity marker when we seek to time 0, so we
+  // must remember to recapture the audio frame offset and reset the frame
+  // sum on the next audio packet we decode.
+  mMustRecaptureAudioPosition = true;
+
   AutoPropVar var;
   HRESULT hr = InitPropVariantFromInt64(UsecsToHNs(aTargetUs), &var);
   NS_ENSURE_TRUE(SUCCEEDED(hr), NS_ERROR_FAILURE);
diff --git a/content/media/wmf/WMFReader.h b/content/media/wmf/WMFReader.h
index 54f9431a674..674e766dcea 100644
--- a/content/media/wmf/WMFReader.h
+++ b/content/media/wmf/WMFReader.h
@@ -91,6 +91,17 @@ private:
   uint32_t mVideoHeight;
   uint32_t mVideoStride;
 
+  // The offset, in audio frames, at which playback started since the
+  // last discontinuity.
+  int64_t mAudioFrameOffset;
+  // The number of audio frames that we've played since the last
+  // discontinuity.
+  int64_t mAudioFrameSum;
+  // True if we need to re-initialize mAudioFrameOffset and mAudioFrameSum
+  // from the next audio packet we decode. This happens after a seek, since
+  // WMF doesn't mark a stream as having a discontinuity after a seek(0).
+  bool mMustRecaptureAudioPosition;
+
   bool mHasAudio;
   bool mHasVideo;
   bool mCanSeek;

From ceb33f4d35de74980f63b7c09b861bfe43fe5ea7 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Thu, 30 May 2013 17:37:22 -0600
Subject: [PATCH 30/85] Bug 850026 - Allow metadata objects to be associated
 with JS objects, and add a hook for attaching metadata to newly created
 objects, r=luke.

---
 js/src/builtin/TestingFunctions.cpp          | 80 ++++++++++++++++++++
 js/src/ion/IonMacroAssembler.cpp             |  5 ++
 js/src/jit-test/tests/basic/metadata-hook.js | 39 ++++++++++
 js/src/jsarray.cpp                           | 19 +----
 js/src/jsarray.h                             |  4 -
 js/src/jscntxtinlines.h                      |  3 +
 js/src/jscompartment.cpp                     |  1 +
 js/src/jscompartment.h                       |  2 +
 js/src/jsfriendapi.cpp                       | 22 ++++++
 js/src/jsfriendapi.h                         | 25 +++++-
 js/src/jsiter.cpp                            |  2 +-
 js/src/jsobj.cpp                             | 33 +++++---
 js/src/jsobj.h                               |  4 +
 js/src/jsobjinlines.h                        | 22 ++++++
 js/src/jsscript.cpp                          |  4 +-
 js/src/jstypedarray.cpp                      |  4 +-
 js/src/vm/ArgumentsObject.cpp                |  2 +-
 js/src/vm/ScopeObject.cpp                    |  6 +-
 js/src/vm/Shape-inl.h                        | 17 ++++-
 js/src/vm/Shape.cpp                          | 67 +++++++++++++---
 js/src/vm/Shape.h                            | 36 +++++----
 21 files changed, 329 insertions(+), 68 deletions(-)
 create mode 100644 js/src/jit-test/tests/basic/metadata-hook.js

diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index b957389384e..7e4eca66796 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -892,6 +892,74 @@ js::testingFunc_inParallelSection(JSContext *cx, unsigned argc, jsval *vp)
     return true;
 }
 
+static JSObject *objectMetadataFunction = NULL;
+
+static JSObject *
+ShellObjectMetadataCallback(JSContext *cx)
+{
+    Value thisv = UndefinedValue();
+
+    Value rval;
+    if (!Invoke(cx, thisv, ObjectValue(*objectMetadataFunction), 0, NULL, &rval)) {
+        cx->clearPendingException();
+        return NULL;
+    }
+
+    return rval.isObject() ? &rval.toObject() : NULL;
+}
+
+static JSBool
+SetObjectMetadataCallback(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    args.rval().setUndefined();
+
+    if (argc == 0 || !args[0].isObject() || !args[0].toObject().isFunction()) {
+        if (objectMetadataFunction)
+            JS_RemoveObjectRoot(cx, &objectMetadataFunction);
+        objectMetadataFunction = NULL;
+        js::SetObjectMetadataCallback(cx, NULL);
+        return true;
+    }
+
+    if (!objectMetadataFunction && !JS_AddObjectRoot(cx, &objectMetadataFunction))
+        return false;
+
+    objectMetadataFunction = &args[0].toObject();
+    js::SetObjectMetadataCallback(cx, ShellObjectMetadataCallback);
+    return true;
+}
+
+static JSBool
+SetObjectMetadata(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (argc != 2 || !args[0].isObject() || !args[1].isObject()) {
+        JS_ReportError(cx, "Both arguments must be objects");
+        return false;
+    }
+
+    args.rval().setUndefined();
+
+    RootedObject obj(cx, &args[0].toObject());
+    RootedObject metadata(cx, &args[1].toObject());
+    return SetObjectMetadata(cx, obj, metadata);
+}
+
+static JSBool
+GetObjectMetadata(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (argc != 1 || !args[0].isObject()) {
+        JS_ReportError(cx, "Argument must be an object");
+        return false;
+    }
+
+    args.rval().setObjectOrNull(GetObjectMetadata(&args[0].toObject()));
+    return true;
+}
+
 #ifndef JS_ION
 JSBool
 js::IsAsmJSCompilationAvailable(JSContext *cx, unsigned argc, Value *vp)
@@ -1079,6 +1147,18 @@ static JSFunctionSpecWithHelp TestingFunctions[] = {
 "inParallelSection()",
 "  True if this code is executing within a parallel section."),
 
+    JS_FN_HELP("setObjectMetadataCallback", SetObjectMetadataCallback, 1, 0,
+"setObjectMetadataCallback(fn)",
+"  Specify function to supply metadata for all newly created objects."),
+
+    JS_FN_HELP("setObjectMetadata", SetObjectMetadata, 2, 0,
+"setObjectMetadata(obj, metadataObj)",
+"  Change the metadata for an object."),
+
+    JS_FN_HELP("getObjectMetadata", GetObjectMetadata, 1, 0,
+"getObjectMetadata(obj)",
+"  Get the metadata for an object."),
+
     JS_FS_HELP_END
 };
 
diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp
index a4069ce3298..1ef01393853 100644
--- a/js/src/ion/IonMacroAssembler.cpp
+++ b/js/src/ion/IonMacroAssembler.cpp
@@ -433,6 +433,11 @@ MacroAssembler::newGCThing(const Register &result, gc::AllocKind allocKind, Labe
     branch32(Assembler::NotEqual, result, Imm32(0), fail);
 #endif
 
+    // Don't execute the inline path if the compartment has an object metadata callback,
+    // as the metadata to use for the object may vary between executions of the op.
+    if (GetIonContext()->compartment->objectMetadataCallback)
+        jump(fail);
+
 #ifdef JSGC_GENERATIONAL
     Nursery &nursery = zone->rt->gcNursery;
     if (nursery.isEnabled() && allocKind <= gc::FINALIZE_OBJECT_LAST) {
diff --git a/js/src/jit-test/tests/basic/metadata-hook.js b/js/src/jit-test/tests/basic/metadata-hook.js
new file mode 100644
index 00000000000..383303149a6
--- /dev/null
+++ b/js/src/jit-test/tests/basic/metadata-hook.js
@@ -0,0 +1,39 @@
+
+x = [1,2,3];
+setObjectMetadata(x, {y:0});
+assertEq(getObjectMetadata(x).y, 0);
+
+incallback = false;
+count = 0;
+
+setObjectMetadataCallback(function(obj) {
+    if (incallback)
+      return null;
+    incallback = true;
+    var res = {count:++count, location:Error().stack};
+    incallback = false;
+    return res;
+  });
+
+function Foo() {
+  this.x = 0;
+  this.y = 1;
+}
+
+function f() {
+  w = new Foo();
+  x = [1,2,3];
+  y = [2,3,5];
+  z = {a:0,b:1};
+}
+f();
+
+var wc = getObjectMetadata(w).count;
+var xc = getObjectMetadata(x).count;
+var yc = getObjectMetadata(y).count;
+var zc = getObjectMetadata(z).count;
+
+assertEq(xc > wc, true);
+assertEq(yc > xc, true);
+assertEq(zc > yc, true);
+assertEq(/\.js/.test(getObjectMetadata(x).location), true);
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index e22e89e8e4b..bdf4037188d 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -132,19 +132,6 @@ js::StringIsArrayIndex(JSLinearString *str, uint32_t *indexp)
     return false;
 }
 
-Shape *
-js::GetDenseArrayShape(JSContext *cx, HandleObject globalObj)
-{
-    JS_ASSERT(globalObj);
-
-    JSObject *proto = globalObj->global().getOrCreateArrayPrototype(cx);
-    if (!proto)
-        return NULL;
-
-    return EmptyShape::getInitialShape(cx, &ArrayClass, proto, proto->getParent(),
-                                       gc::FINALIZE_OBJECT0);
-}
-
 bool
 DoubleIndexToId(JSContext *cx, double index, MutableHandleId id)
 {
@@ -2821,7 +2808,8 @@ js_InitArrayClass(JSContext *cx, HandleObject obj)
     if (!type)
         return NULL;
 
-    RootedShape shape(cx, EmptyShape::getInitialShape(cx, &ArrayClass, TaggedProto(proto), proto->getParent(),
+    RootedShape shape(cx, EmptyShape::getInitialShape(cx, &ArrayClass, TaggedProto(proto),
+                                                      proto->getParent(), NewObjectMetadata(cx),
                                                       gc::FINALIZE_OBJECT0));
 
     RootedObject arrayProto(cx, JSObject::createArray(cx, gc::FINALIZE_OBJECT4, gc::TenuredHeap, shape, type, 0));
@@ -2890,6 +2878,7 @@ NewArray(JSContext *cx, uint32_t length, JSObject *protoArg, NewObjectKind newKi
 
     NewObjectCache::EntryIndex entry = -1;
     if (newKind == GenericObject &&
+        !cx->compartment->objectMetadataCallback &&
         cache.lookupGlobal(&ArrayClass, cx->global(), allocKind, &entry))
     {
         RootedObject obj(cx, cache.newObjectFromHit(cx, entry, GetInitialHeap(newKind, &ArrayClass)));
@@ -2919,7 +2908,7 @@ NewArray(JSContext *cx, uint32_t length, JSObject *protoArg, NewObjectKind newKi
      * See JSObject::createArray.
      */
     RootedShape shape(cx, EmptyShape::getInitialShape(cx, &ArrayClass, TaggedProto(proto),
-                                                      cx->global(), gc::FINALIZE_OBJECT0));
+                                                      cx->global(), NewObjectMetadata(cx), gc::FINALIZE_OBJECT0));
     if (!shape)
         return NULL;
 
diff --git a/js/src/jsarray.h b/js/src/jsarray.h
index 4ee48cdb6e4..400e07a00a0 100644
--- a/js/src/jsarray.h
+++ b/js/src/jsarray.h
@@ -87,10 +87,6 @@ WouldDefinePastNonwritableLength(JSContext *cx, HandleObject obj, uint32_t index
 extern bool
 CanonicalizeArrayLengthValue(JSContext *cx, HandleValue v, uint32_t *canonicalized);
 
-/* Get the common shape used by all dense arrays with a prototype at globalObj. */
-extern Shape *
-GetDenseArrayShape(JSContext *cx, HandleObject globalObj);
-
 extern JSBool
 GetLengthProperty(JSContext *cx, HandleObject obj, uint32_t *lengthp);
 
diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h
index 1d15a4c5a6b..a3ecc4a32ce 100644
--- a/js/src/jscntxtinlines.h
+++ b/js/src/jscntxtinlines.h
@@ -110,6 +110,9 @@ NewObjectCache::fillType(EntryIndex entry, Class *clasp, js::types::TypeObject *
 inline JSObject *
 NewObjectCache::newObjectFromHit(JSContext *cx, EntryIndex entry_, js::gc::InitialHeap heap)
 {
+    // The new object cache does not account for metadata attached via callbacks.
+    JS_ASSERT(!cx->compartment->objectMetadataCallback);
+
     JS_ASSERT(unsigned(entry_) < mozilla::ArrayLength(entries));
     Entry *entry = &entries[entry_];
 
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index a764a88cc52..5a201ddd7db 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -42,6 +42,7 @@ JSCompartment::JSCompartment(Zone *zone)
     lastCodeRelease(0),
     analysisLifoAlloc(ANALYSIS_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
     data(NULL),
+    objectMetadataCallback(NULL),
     lastAnimationTime(0),
     regExps(rt),
     propertyTree(thisForCtor()),
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 5ef60b106ff..14a6f7ed429 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -182,6 +182,8 @@ struct JSCompartment
 
     void                         *data;
 
+    js::ObjectMetadataCallback   objectMetadataCallback;
+
   private:
     js::WrapperMap               crossCompartmentWrappers;
 
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 2518542fc87..054b7db7d53 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1053,6 +1053,28 @@ js::AutoCTypesActivityCallback::AutoCTypesActivityCallback(JSContext *cx,
         callback(cx, beginType);
 }
 
+JS_FRIEND_API(void)
+js::SetObjectMetadataCallback(JSContext *cx, ObjectMetadataCallback callback)
+{
+    // Clear any jitcode in the runtime, which behaves differently depending on
+    // whether there is a creation callback.
+    ReleaseAllJITCode(cx->runtime->defaultFreeOp());
+
+    cx->compartment->objectMetadataCallback = callback;
+}
+
+JS_FRIEND_API(bool)
+js::SetObjectMetadata(JSContext *cx, JSHandleObject obj, JSHandleObject metadata)
+{
+    return JSObject::setMetadata(cx, obj, metadata);
+}
+
+JS_FRIEND_API(JSObject *)
+js::GetObjectMetadata(JSObject *obj)
+{
+    return obj->getMetadata();
+}
+
 JS_FRIEND_API(JSBool)
 js_DefineOwnProperty(JSContext *cx, JSObject *objArg, jsid idArg,
                      const js::PropertyDescriptor& descriptor, JSBool *bp)
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index efc53b31729..182c0229a39 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -324,8 +324,9 @@ struct TypeObject {
 };
 
 struct BaseShape {
-    js::Class   *clasp;
-    JSObject    *parent;
+    js::Class *clasp;
+    JSObject *parent;
+    JSObject *_1;
     JSCompartment *compartment;
 };
 
@@ -1696,6 +1697,26 @@ assertEnteredPolicy(JSContext *cx, JSObject *obj, jsid id);
 inline void assertEnteredPolicy(JSContext *cx, JSObject *obj, jsid id) {};
 #endif
 
+typedef JSObject *
+(* ObjectMetadataCallback)(JSContext *cx);
+
+/*
+ * Specify a callback to invoke when creating each JS object in the current
+ * compartment, which may return a metadata object to associate with the
+ * object. Objects with different metadata have different shape hierarchies,
+ * so for efficiency, objects should generally try to share metadata objects.
+ */
+JS_FRIEND_API(void)
+SetObjectMetadataCallback(JSContext *cx, ObjectMetadataCallback callback);
+
+/* Manipulate the metadata associated with an object. */
+
+JS_FRIEND_API(bool)
+SetObjectMetadata(JSContext *cx, JSHandleObject obj, JSHandleObject metadata);
+
+JS_FRIEND_API(JSObject *)
+GetObjectMetadata(JSObject *obj);
+
 } /* namespace js */
 
 extern JS_FRIEND_API(JSBool)
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 4a730c2841b..31930785831 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -378,7 +378,7 @@ NewPropertyIteratorObject(JSContext *cx, unsigned flags)
             return NULL;
 
         Class *clasp = &PropertyIteratorObject::class_;
-        RootedShape shape(cx, EmptyShape::getInitialShape(cx, clasp, NULL, NULL,
+        RootedShape shape(cx, EmptyShape::getInitialShape(cx, clasp, NULL, NULL, NewObjectMetadata(cx),
                                                           ITERATOR_FINALIZE_KIND));
         if (!shape)
             return NULL;
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 0dc5a31fbfd..97c12cad4e0 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1115,6 +1115,7 @@ JSObject::sealOrFreeze(JSContext *cx, HandleObject obj, ImmutabilityType it)
         RootedShape last(cx, EmptyShape::getInitialShape(cx, obj->getClass(),
                                                          obj->getTaggedProto(),
                                                          obj->getParent(),
+                                                         obj->getMetadata(),
                                                          obj->numFixedSlots(),
                                                          obj->lastProperty()->getObjectFlags()));
         if (!last)
@@ -1246,7 +1247,7 @@ NewObject(JSContext *cx, Class *clasp, types::TypeObject *type_, JSObject *paren
     RootedTypeObject type(cx, type_);
 
     RootedShape shape(cx, EmptyShape::getInitialShape(cx, clasp, TaggedProto(type->proto),
-                                                      parent, kind));
+                                                      parent, NewObjectMetadata(cx), kind));
     if (!shape)
         return NULL;
 
@@ -1287,7 +1288,9 @@ js::NewObjectWithGivenProto(JSContext *cx, js::Class *clasp,
     NewObjectCache &cache = cx->runtime->newObjectCache;
 
     NewObjectCache::EntryIndex entry = -1;
-    if (proto.isObject() && newKind == GenericObject &&
+    if (proto.isObject() &&
+        newKind == GenericObject &&
+        !cx->compartment->objectMetadataCallback &&
         (!parent || parent == proto.toObject()->getParent()) && !proto.toObject()->isGlobal())
     {
         if (cache.lookupProto(clasp, proto.toObject(), allocKind, &entry)) {
@@ -1345,7 +1348,11 @@ js::NewObjectWithClassProtoCommon(JSContext *cx, js::Class *clasp, JSObject *pro
     NewObjectCache &cache = cx->runtime->newObjectCache;
 
     NewObjectCache::EntryIndex entry = -1;
-    if (parentArg->isGlobal() && protoKey != JSProto_Null && newKind == GenericObject) {
+    if (parentArg->isGlobal() &&
+        protoKey != JSProto_Null &&
+        newKind == GenericObject &&
+        !cx->compartment->objectMetadataCallback)
+    {
         if (cache.lookupGlobal(clasp, &parentArg->asGlobal(), allocKind, &entry)) {
             JSObject *obj = cache.newObjectFromHit(cx, entry, GetInitialHeap(newKind, clasp));
             if (obj)
@@ -1387,7 +1394,10 @@ js::NewObjectWithType(JSContext *cx, HandleTypeObject type, JSObject *parent, gc
     NewObjectCache &cache = cx->runtime->newObjectCache;
 
     NewObjectCache::EntryIndex entry = -1;
-    if (parent == type->proto->getParent() && newKind == GenericObject) {
+    if (parent == type->proto->getParent() &&
+        newKind == GenericObject &&
+        !cx->compartment->objectMetadataCallback)
+    {
         if (cache.lookupType(&ObjectClass, type, allocKind, &entry)) {
             JSObject *obj = cache.newObjectFromHit(cx, entry, GetInitialHeap(newKind, &ObjectClass));
             if (obj)
@@ -1493,10 +1503,13 @@ CreateThisForFunctionWithType(JSContext *cx, HandleTypeObject type, JSObject *pa
          */
         gc::AllocKind kind = type->newScript->allocKind;
         RootedObject res(cx, NewObjectWithType(cx, type, parent, kind, newKind));
-        if (res) {
-            RootedShape shape(cx, type->newScript->shape);
-            JS_ALWAYS_TRUE(JSObject::setLastProperty(cx, res, shape));
-        }
+        if (!res)
+            return NULL;
+        RootedObject metadata(cx, res->getMetadata());
+        RootedShape shape(cx, type->newScript->shape);
+        JS_ALWAYS_TRUE(JSObject::setLastProperty(cx, res, shape));
+        if (metadata && !JSObject::setMetadata(cx, res, metadata))
+            return NULL;
         return res;
     }
 
@@ -1859,7 +1872,7 @@ JSObject::ReserveForTradeGuts(JSContext *cx, JSObject *aArg, JSObject *bArg,
         if (!a->generateOwnShape(cx))
             return false;
     } else {
-        reserved.newbshape = EmptyShape::getInitialShape(cx, aClass, aProto, a->getParent(),
+        reserved.newbshape = EmptyShape::getInitialShape(cx, aClass, aProto, a->getParent(), a->getMetadata(),
                                                          b->tenuredGetAllocKind());
         if (!reserved.newbshape)
             return false;
@@ -1868,7 +1881,7 @@ JSObject::ReserveForTradeGuts(JSContext *cx, JSObject *aArg, JSObject *bArg,
         if (!b->generateOwnShape(cx))
             return false;
     } else {
-        reserved.newashape = EmptyShape::getInitialShape(cx, bClass, bProto, b->getParent(),
+        reserved.newashape = EmptyShape::getInitialShape(cx, bClass, bProto, b->getParent(), b->getMetadata(),
                                                          a->tenuredGetAllocKind());
         if (!reserved.newashape)
             return false;
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 2276aa691c2..66802779eef 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -528,6 +528,10 @@ class JSObject : public js::ObjectImpl
      */
     inline JSObject *enclosingScope();
 
+    /* Access the metadata on an object. */
+    inline JSObject *getMetadata() const;
+    static bool setMetadata(JSContext *cx, js::HandleObject obj, js::HandleObject newMetadata);
+
     inline js::GlobalObject &global() const;
     using js::ObjectImpl::compartment;
 
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 2603c568c52..d807c11138d 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -251,6 +251,12 @@ JSObject::getParent() const
     return lastProperty()->getObjectParent();
 }
 
+inline JSObject *
+JSObject::getMetadata() const
+{
+    return lastProperty()->getObjectMetadata();
+}
+
 inline JSObject *
 JSObject::enclosingScope()
 {
@@ -308,6 +314,7 @@ JSObject::canRemoveLastProperty()
     JS_ASSERT(!inDictionaryMode());
     js::Shape *previous = lastProperty()->previous().get();
     return previous->getObjectParent() == lastProperty()->getObjectParent()
+        && previous->getObjectMetadata() == lastProperty()->getObjectMetadata()
         && previous->getObjectFlags() == lastProperty()->getObjectFlags();
 }
 
@@ -1684,9 +1691,12 @@ CopyInitializerObject(JSContext *cx, HandleObject baseobj, NewObjectKind newKind
     if (!obj)
         return NULL;
 
+    RootedObject metadata(cx, obj->getMetadata());
     RootedShape lastProp(cx, baseobj->lastProperty());
     if (!JSObject::setLastProperty(cx, obj, lastProp))
         return NULL;
+    if (metadata && !JSObject::setMetadata(cx, obj, metadata))
+        return NULL;
 
     return obj;
 }
@@ -1793,6 +1803,18 @@ DefineConstructorAndPrototype(JSContext *cx, HandleObject obj, JSProtoKey key, H
                               JSObject **ctorp = NULL,
                               gc::AllocKind ctorKind = JSFunction::FinalizeKind);
 
+static JS_ALWAYS_INLINE JSObject *
+NewObjectMetadata(JSContext *cx)
+{
+    // The metadata callback is invoked before each created object, except when
+    // analysis is active as the callback may reenter JS.
+    if (JS_UNLIKELY((size_t)cx->compartment->objectMetadataCallback) && !cx->compartment->activeAnalysis) {
+        gc::AutoSuppressGC suppress(cx);
+        return cx->compartment->objectMetadataCallback(cx);
+    }
+    return NULL;
+}
+
 } /* namespace js */
 
 extern JSObject *
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index dc755d8f293..47d7363d136 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -93,7 +93,7 @@ Bindings::initWithTemporaryStorage(JSContext *cx, InternalBindingsHandle self,
     gc::AllocKind allocKind = gc::FINALIZE_OBJECT2_BACKGROUND;
     JS_ASSERT(gc::GetGCKindSlots(allocKind) == CallObject::RESERVED_SLOTS);
     RootedShape initial(cx,
-        EmptyShape::getInitialShape(cx, &CallClass, NULL, cx->global(),
+        EmptyShape::getInitialShape(cx, &CallClass, NULL, cx->global(), NULL,
                                     allocKind, BaseShape::VAROBJ | BaseShape::DELEGATE));
     if (!initial)
         return false;
@@ -118,7 +118,7 @@ Bindings::initWithTemporaryStorage(JSContext *cx, InternalBindingsHandle self,
             return false;
 #endif
 
-        StackBaseShape base(cx->compartment, &CallClass, cx->global(),
+        StackBaseShape base(cx->compartment, &CallClass, cx->global(), NULL,
                             BaseShape::VAROBJ | BaseShape::DELEGATE);
 
         UnownedBaseShape *nbase = BaseShape::getUnowned(cx, base);
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 479ef380583..10adff6784a 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -559,7 +559,7 @@ ArrayBufferObject::create(JSContext *cx, uint32_t nbytes, uint8_t *contents)
     JS_ASSERT(obj->getClass() == &ArrayBufferClass);
 
     js::Shape *empty = EmptyShape::getInitialShape(cx, &ArrayBufferClass,
-                                                   obj->getProto(), obj->getParent(),
+                                                   obj->getProto(), obj->getParent(), obj->getMetadata(),
                                                    gc::FINALIZE_OBJECT16_BACKGROUND);
     if (!empty)
         return NULL;
@@ -1785,7 +1785,7 @@ class TypedArrayTemplate
         // would just boil down to a slightly slower wrapper around the
         // following code anyway:
         js::Shape *empty = EmptyShape::getInitialShape(cx, fastClass(),
-                                                       obj->getProto(), obj->getParent(),
+                                                       obj->getProto(), obj->getParent(), obj->getMetadata(),
                                                        gc::FINALIZE_OBJECT8_BACKGROUND,
                                                        BaseShape::NOT_EXTENSIBLE);
         if (!empty)
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index 27f6fa3db09..158f8bdc4db 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -187,7 +187,7 @@ ArgumentsObject::create(JSContext *cx, HandleScript script, HandleFunction calle
         return NULL;
 
     RootedShape shape(cx, EmptyShape::getInitialShape(cx, clasp, TaggedProto(proto),
-                                                      proto->getParent(), FINALIZE_KIND,
+                                                      proto->getParent(), NewObjectMetadata(cx), FINALIZE_KIND,
                                                       BaseShape::INDEXED));
     if (!shape)
         return NULL;
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index dbc695c6e9c..0ccc84fb8e7 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -294,7 +294,7 @@ DeclEnvObject::createTemplateObject(JSContext *cx, HandleFunction fun, gc::Initi
 
     RootedShape emptyDeclEnvShape(cx);
     emptyDeclEnvShape = EmptyShape::getInitialShape(cx, &DeclEnvClass, NULL,
-                                                    cx->global(), FINALIZE_KIND,
+                                                    cx->global(), NULL, FINALIZE_KIND,
                                                     BaseShape::DELEGATE);
     if (!emptyDeclEnvShape)
         return NULL;
@@ -337,7 +337,7 @@ WithObject::create(JSContext *cx, HandleObject proto, HandleObject enclosing, ui
         return NULL;
 
     RootedShape shape(cx, EmptyShape::getInitialShape(cx, &WithClass, TaggedProto(proto),
-                                                      &enclosing->global(), FINALIZE_KIND));
+                                                      &enclosing->global(), NULL, FINALIZE_KIND));
     if (!shape)
         return NULL;
 
@@ -670,7 +670,7 @@ StaticBlockObject::create(JSContext *cx)
         return NULL;
 
     RootedShape emptyBlockShape(cx);
-    emptyBlockShape = EmptyShape::getInitialShape(cx, &BlockClass, NULL, NULL, FINALIZE_KIND,
+    emptyBlockShape = EmptyShape::getInitialShape(cx, &BlockClass, NULL, NULL, NULL, FINALIZE_KIND,
                                                   BaseShape::DELEGATE);
     if (!emptyBlockShape)
         return NULL;
diff --git a/js/src/vm/Shape-inl.h b/js/src/vm/Shape-inl.h
index 11f06122f92..d92fadb524b 100644
--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -49,24 +49,28 @@ GetterSetterWriteBarrierPostRemove(JSRuntime *rt, JSObject **objp)
 }
 
 inline
-BaseShape::BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, uint32_t objectFlags)
+BaseShape::BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, JSObject *metadata,
+                     uint32_t objectFlags)
 {
     JS_ASSERT(!(objectFlags & ~OBJECT_FLAG_MASK));
     mozilla::PodZero(this);
     this->clasp = clasp;
     this->parent = parent;
+    this->metadata = metadata;
     this->flags = objectFlags;
     this->compartment_ = comp;
 }
 
 inline
-BaseShape::BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, uint32_t objectFlags,
-                     uint8_t attrs, js::PropertyOp rawGetter, js::StrictPropertyOp rawSetter)
+BaseShape::BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, JSObject *metadata,
+                     uint32_t objectFlags, uint8_t attrs,
+                     PropertyOp rawGetter, StrictPropertyOp rawSetter)
 {
     JS_ASSERT(!(objectFlags & ~OBJECT_FLAG_MASK));
     mozilla::PodZero(this);
     this->clasp = clasp;
     this->parent = parent;
+    this->metadata = metadata;
     this->flags = objectFlags;
     this->rawGetter = rawGetter;
     this->rawSetter = rawSetter;
@@ -87,6 +91,7 @@ BaseShape::BaseShape(const StackBaseShape &base)
     mozilla::PodZero(this);
     this->clasp = base.clasp;
     this->parent = base.parent;
+    this->metadata = base.metadata;
     this->flags = base.flags;
     this->rawGetter = base.rawGetter;
     this->rawSetter = base.rawSetter;
@@ -102,6 +107,7 @@ BaseShape::operator=(const BaseShape &other)
 {
     clasp = other.clasp;
     parent = other.parent;
+    metadata = other.metadata;
     flags = other.flags;
     slotSpan_ = other.slotSpan_;
     if (flags & HAS_GETTER_OBJECT) {
@@ -135,6 +141,7 @@ StackBaseShape::StackBaseShape(Shape *shape)
   : flags(shape->getObjectFlags()),
     clasp(shape->getObjectClass()),
     parent(shape->getObjectParent()),
+    metadata(shape->getObjectMetadata()),
     compartment(shape->compartment())
 {
     updateGetterSetter(shape->attrs, shape->getter(), shape->setter());
@@ -197,6 +204,7 @@ BaseShape::assertConsistency()
         JS_ASSERT_IF(hasGetterObject(), getterObject() == unowned->getterObject());
         JS_ASSERT_IF(hasSetterObject(), setterObject() == unowned->setterObject());
         JS_ASSERT(getObjectParent() == unowned->getObjectParent());
+        JS_ASSERT(getObjectMetadata() == unowned->getObjectMetadata());
         JS_ASSERT(getObjectFlags() == unowned->getObjectFlags());
     }
 #endif
@@ -495,6 +503,9 @@ BaseShape::markChildren(JSTracer *trc)
 
     if (parent)
         MarkObject(trc, &parent, "parent");
+
+    if (metadata)
+        MarkObject(trc, &metadata, "metadata");
 }
 
 /*
diff --git a/js/src/vm/Shape.cpp b/js/src/vm/Shape.cpp
index 8487e75e9c2..34ae322c2ed 100644
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -298,7 +298,7 @@ Shape::replaceLastProperty(JSContext *cx, const StackBaseShape &base,
         /* Treat as resetting the initial property of the shape hierarchy. */
         AllocKind kind = gc::GetGCObjectKind(shape->numFixedSlots());
         return EmptyShape::getInitialShape(cx, base.clasp, proto,
-                                           base.parent, kind,
+                                           base.parent, base.metadata, kind,
                                            base.flags & BaseShape::OBJECT_FLAG_MASK);
     }
 
@@ -1050,6 +1050,41 @@ Shape::setObjectParent(JSContext *cx, JSObject *parent, TaggedProto proto, Shape
     return replaceLastProperty(cx, base, proto, lastRoot);
 }
 
+/* static */ bool
+JSObject::setMetadata(JSContext *cx, HandleObject obj, HandleObject metadata)
+{
+    if (obj->inDictionaryMode()) {
+        StackBaseShape base(obj->lastProperty());
+        base.metadata = metadata;
+        UnownedBaseShape *nbase = BaseShape::getUnowned(cx, base);
+        if (!nbase)
+            return false;
+
+        obj->lastProperty()->base()->adoptUnowned(nbase);
+        return true;
+    }
+
+    Shape *newShape = Shape::setObjectMetadata(cx, metadata, obj->getTaggedProto(), obj->shape_);
+    if (!newShape)
+        return false;
+
+    obj->shape_ = newShape;
+    return true;
+}
+
+/* static */ Shape *
+Shape::setObjectMetadata(JSContext *cx, JSObject *metadata, TaggedProto proto, Shape *last)
+{
+    if (last->getObjectMetadata() == metadata)
+        return last;
+
+    StackBaseShape base(last);
+    base.metadata = metadata;
+
+    RootedShape lastRoot(cx, last);
+    return replaceLastProperty(cx, base, proto, lastRoot);
+}
+
 /* static */ bool
 js::ObjectImpl::preventExtensions(JSContext *cx, Handle<ObjectImpl*> obj)
 {
@@ -1154,6 +1189,7 @@ StackBaseShape::hash(const StackBaseShape *base)
     HashNumber hash = base->flags;
     hash = JS_ROTATE_LEFT32(hash, 4) ^ (uintptr_t(base->clasp) >> 3);
     hash = JS_ROTATE_LEFT32(hash, 4) ^ (uintptr_t(base->parent) >> 3);
+    hash = JS_ROTATE_LEFT32(hash, 4) ^ (uintptr_t(base->metadata) >> 3);
     hash = JS_ROTATE_LEFT32(hash, 4) ^ uintptr_t(base->rawGetter);
     hash = JS_ROTATE_LEFT32(hash, 4) ^ uintptr_t(base->rawSetter);
     return hash;
@@ -1165,6 +1201,7 @@ StackBaseShape::match(UnownedBaseShape *key, const StackBaseShape *lookup)
     return key->flags == lookup->flags
         && key->clasp == lookup->clasp
         && key->parent == lookup->parent
+        && key->metadata == lookup->metadata
         && key->rawGetter == lookup->rawGetter
         && key->rawSetter == lookup->rawSetter;
 }
@@ -1176,6 +1213,10 @@ StackBaseShape::AutoRooter::trace(JSTracer *trc)
         gc::MarkObjectRoot(trc, (JSObject**)&base->parent,
                            "StackBaseShape::AutoRooter parent");
     }
+    if (base->metadata) {
+        gc::MarkObjectRoot(trc, (JSObject**)&base->metadata,
+                           "StackBaseShape::AutoRooter metadata");
+    }
     if ((base->flags & BaseShape::HAS_GETTER_OBJECT) && base->rawGetter) {
         gc::MarkObjectRoot(trc, (JSObject**)&base->rawGetter,
                            "StackBaseShape::AutoRooter getter");
@@ -1252,7 +1293,7 @@ InitialShapeEntry::InitialShapeEntry(const ReadBarriered<Shape> &shape, TaggedPr
 inline InitialShapeEntry::Lookup
 InitialShapeEntry::getLookup() const
 {
-    return Lookup(shape->getObjectClass(), proto, shape->getObjectParent(),
+    return Lookup(shape->getObjectClass(), proto, shape->getObjectParent(), shape->getObjectMetadata(),
                   shape->numFixedSlots(), shape->getObjectFlags());
 }
 
@@ -1261,7 +1302,7 @@ InitialShapeEntry::hash(const Lookup &lookup)
 {
     HashNumber hash = uintptr_t(lookup.clasp) >> 3;
     hash = JS_ROTATE_LEFT32(hash, 4) ^ (uintptr_t(lookup.proto.toWord()) >> 3);
-    hash = JS_ROTATE_LEFT32(hash, 4) ^ (uintptr_t(lookup.parent) >> 3);
+    hash = JS_ROTATE_LEFT32(hash, 4) ^ (uintptr_t(lookup.parent) >> 3) ^ (uintptr_t(lookup.metadata) >> 3);
     return hash + lookup.nfixed;
 }
 
@@ -1272,12 +1313,14 @@ InitialShapeEntry::match(const InitialShapeEntry &key, const Lookup &lookup)
     return lookup.clasp == shape->getObjectClass()
         && lookup.proto.toWord() == key.proto.toWord()
         && lookup.parent == shape->getObjectParent()
+        && lookup.metadata == shape->getObjectMetadata()
         && lookup.nfixed == shape->numFixedSlots()
         && lookup.baseFlags == shape->getObjectFlags();
 }
 
 /* static */ Shape *
-EmptyShape::getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto, JSObject *parent,
+EmptyShape::getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto,
+                            JSObject *parent, JSObject *metadata,
                             size_t nfixed, uint32_t objectFlags)
 {
     JS_ASSERT_IF(proto.isObject(), cx->compartment == proto.toObject()->compartment());
@@ -1290,15 +1333,16 @@ EmptyShape::getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto, JSOb
 
     typedef InitialShapeEntry::Lookup Lookup;
     InitialShapeSet::AddPtr p =
-        table.lookupForAdd(Lookup(clasp, proto, parent, nfixed, objectFlags));
+        table.lookupForAdd(Lookup(clasp, proto, parent, metadata, nfixed, objectFlags));
 
     if (p)
         return p->shape;
 
     Rooted<TaggedProto> protoRoot(cx, proto);
     RootedObject parentRoot(cx, parent);
+    RootedObject metadataRoot(cx, metadata);
 
-    StackBaseShape base(cx->compartment, clasp, parent, objectFlags);
+    StackBaseShape base(cx->compartment, clasp, parent, metadata, objectFlags);
     Rooted<UnownedBaseShape*> nbase(cx, BaseShape::getUnowned(cx, base));
     if (!nbase)
         return NULL;
@@ -1308,7 +1352,7 @@ EmptyShape::getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto, JSOb
         return NULL;
     new (shape) EmptyShape(nbase, nfixed);
 
-    if (!table.relookupOrAdd(p, Lookup(clasp, protoRoot, parentRoot, nfixed, objectFlags),
+    if (!table.relookupOrAdd(p, Lookup(clasp, protoRoot, parentRoot, metadataRoot, nfixed, objectFlags),
                              InitialShapeEntry(shape, protoRoot)))
     {
         return NULL;
@@ -1318,10 +1362,11 @@ EmptyShape::getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto, JSOb
 }
 
 /* static */ Shape *
-EmptyShape::getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto, JSObject *parent,
+EmptyShape::getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto,
+                            JSObject *parent, JSObject *metadata,
                             AllocKind kind, uint32_t objectFlags)
 {
-    return getInitialShape(cx, clasp, proto, parent, GetGCKindSlots(kind, clasp), objectFlags);
+    return getInitialShape(cx, clasp, proto, parent, metadata, GetGCKindSlots(kind, clasp), objectFlags);
 }
 
 void
@@ -1349,8 +1394,8 @@ NewObjectCache::invalidateEntriesForShape(JSContext *cx, HandleShape shape, Hand
 EmptyShape::insertInitialShape(JSContext *cx, HandleShape shape, HandleObject proto)
 {
     InitialShapeEntry::Lookup lookup(shape->getObjectClass(), TaggedProto(proto),
-                                     shape->getObjectParent(), shape->numFixedSlots(),
-                                     shape->getObjectFlags());
+                                     shape->getObjectParent(), shape->getObjectMetadata(),
+                                     shape->numFixedSlots(), shape->getObjectFlags());
 
     InitialShapeSet::Ptr p = cx->compartment->initialShapes.lookup(lookup);
     JS_ASSERT(p);
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index 8b49c52f97a..346d0e75ee3 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -266,6 +266,8 @@ class BaseShape : public js::gc::Cell
   private:
     Class               *clasp;         /* Class of referring object. */
     HeapPtrObject       parent;         /* Parent of referring object. */
+    HeapPtrObject       metadata;       /* Optional holder of metadata about
+                                         * the referring object. */
     JSCompartment       *compartment_;  /* Compartment shape belongs to. */
     uint32_t            flags;          /* Vector of above flags. */
     uint32_t            slotSpan_;      /* Object slot span for BaseShapes at
@@ -289,18 +291,16 @@ class BaseShape : public js::gc::Cell
     /* For owned BaseShapes, the shape's shape table. */
     ShapeTable       *table_;
 
-#if JS_BITS_PER_WORD == 32
-    void             *padding;
-#endif
-
     BaseShape(const BaseShape &base) MOZ_DELETE;
 
   public:
     void finalize(FreeOp *fop);
 
-    inline BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, uint32_t objectFlags);
-    inline BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, uint32_t objectFlags,
-                     uint8_t attrs, PropertyOp rawGetter, StrictPropertyOp rawSetter);
+    inline BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, JSObject *metadata,
+                     uint32_t objectFlags);
+    inline BaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, JSObject *metadata,
+                     uint32_t objectFlags, uint8_t attrs,
+                     PropertyOp rawGetter, StrictPropertyOp rawSetter);
     inline BaseShape(const StackBaseShape &base);
 
     /* Not defined: BaseShapes must not be stack allocated. */
@@ -317,6 +317,7 @@ class BaseShape : public js::gc::Cell
     inline void setOwned(UnownedBaseShape *unowned);
 
     JSObject *getObjectParent() const { return parent; }
+    JSObject *getObjectMetadata() const { return metadata; }
     uint32_t getObjectFlags() const { return flags & OBJECT_FLAG_MASK; }
 
     bool hasGetterObject() const { return !!(flags & HAS_GETTER_OBJECT); }
@@ -396,6 +397,7 @@ struct StackBaseShape
     uint32_t flags;
     Class *clasp;
     JSObject *parent;
+    JSObject *metadata;
     PropertyOp rawGetter;
     StrictPropertyOp rawSetter;
     JSCompartment *compartment;
@@ -404,15 +406,18 @@ struct StackBaseShape
       : flags(base->flags & BaseShape::OBJECT_FLAG_MASK),
         clasp(base->clasp),
         parent(base->parent),
+        metadata(base->metadata),
         rawGetter(NULL),
         rawSetter(NULL),
         compartment(base->compartment())
     {}
 
-    StackBaseShape(JSCompartment *comp, Class *clasp, JSObject *parent, uint32_t objectFlags)
+    StackBaseShape(JSCompartment *comp, Class *clasp,
+                   JSObject *parent, JSObject *metadata, uint32_t objectFlags)
       : flags(objectFlags),
         clasp(clasp),
         parent(parent),
+        metadata(metadata),
         rawGetter(NULL),
         rawSetter(NULL),
         compartment(comp)
@@ -591,8 +596,10 @@ class Shape : public js::gc::Cell
 
     Class *getObjectClass() const { return base()->clasp; }
     JSObject *getObjectParent() const { return base()->parent; }
+    JSObject *getObjectMetadata() const { return base()->metadata; }
 
     static Shape *setObjectParent(JSContext *cx, JSObject *obj, TaggedProto proto, Shape *last);
+    static Shape *setObjectMetadata(JSContext *cx, JSObject *metadata, TaggedProto proto, Shape *last);
     static Shape *setObjectFlag(JSContext *cx, BaseShape::Flag flag, TaggedProto proto, Shape *last);
 
     uint32_t getObjectFlags() const { return base()->getObjectFlags(); }
@@ -899,9 +906,9 @@ struct EmptyShape : public js::Shape
      * Lookup an initial shape matching the given parameters, creating an empty
      * shape if none was found.
      */
-    static Shape *getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto,
+    static Shape *getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto, JSObject *metadata,
                                   JSObject *parent, size_t nfixed, uint32_t objectFlags = 0);
-    static Shape *getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto,
+    static Shape *getInitialShape(JSContext *cx, Class *clasp, TaggedProto proto, JSObject *metadata,
                                   JSObject *parent, gc::AllocKind kind, uint32_t objectFlags = 0);
 
     /*
@@ -936,12 +943,13 @@ struct InitialShapeEntry
         Class *clasp;
         TaggedProto proto;
         JSObject *parent;
+        JSObject *metadata;
         uint32_t nfixed;
         uint32_t baseFlags;
-        Lookup(Class *clasp, TaggedProto proto, JSObject *parent, uint32_t nfixed,
-               uint32_t baseFlags)
-            : clasp(clasp), proto(proto), parent(parent),
-              nfixed(nfixed), baseFlags(baseFlags)
+        Lookup(Class *clasp, TaggedProto proto, JSObject *parent, JSObject *metadata,
+               uint32_t nfixed, uint32_t baseFlags)
+          : clasp(clasp), proto(proto), parent(parent), metadata(metadata),
+            nfixed(nfixed), baseFlags(baseFlags)
         {}
     };
 

From d4f121fc23db3753c769dfb1d3ee6f5c003a8f6f Mon Sep 17 00:00:00 2001
From: Sean Stangl <sstangl@mozilla.com>
Date: Tue, 28 May 2013 18:57:56 -0700
Subject: [PATCH 31/85] Bug 877021 - Speed up CreateRegExpMatchResult().
 r=h4writer

---
 js/src/builtin/RegExp.cpp | 71 +++++++++++++++------------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index 2f3ea0f25ed..758c39ed606 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -18,42 +18,19 @@ using namespace js::types;
 
 using mozilla::ArrayLength;
 
-class RegExpMatchBuilder
+static inline bool
+DefinePropertyHelper(JSContext *cx, HandleObject obj, Handle<PropertyName*> name, HandleValue v)
 {
-    JSContext   * const cx;
-    RootedObject array;
-
-    bool setProperty(Handle<PropertyName*> name, HandleValue v) {
-        return !!baseops::DefineProperty(cx, array, name, v,
-                                         JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE);
-    }
-
-  public:
-    RegExpMatchBuilder(JSContext *cx, HandleObject array) : cx(cx), array(cx, array) {}
-
-    bool append(uint32_t index, HandleValue v) {
-        JS_ASSERT(!array->getOps()->getElement);
-        return !!baseops::DefineElement(cx, array, index, v, JS_PropertyStub, JS_StrictPropertyStub,
-                                        JSPROP_ENUMERATE);
-    }
-
-    bool setIndex(int index) {
-        RootedValue value(cx, Int32Value(index));
-        return setProperty(cx->names().index, value);
-    }
-
-    bool setInput(HandleString str) {
-        JS_ASSERT(str);
-        RootedValue value(cx, StringValue(str));
-        return setProperty(cx->names().input, value);
-    }
-};
+    return !!baseops::DefineProperty(cx, obj, name, v,
+                                     JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE);
+}
 
 bool
 js::CreateRegExpMatchResult(JSContext *cx, HandleString input_, const jschar *chars, size_t length,
                             MatchPairs &matches, MutableHandleValue rval)
 {
     RootedString input(cx, input_);
+    RootedValue undefinedValue(cx, UndefinedValue());
 
     /*
      * Create the (slow) result array for a match.
@@ -64,39 +41,47 @@ js::CreateRegExpMatchResult(JSContext *cx, HandleString input_, const jschar *ch
      *  input:          input string
      *  index:          start index for the match
      */
-    RootedObject array(cx, NewDenseEmptyArray(cx));
-    if (!array)
-        return false;
-
     if (!input) {
         input = js_NewStringCopyN<CanGC>(cx, chars, length);
         if (!input)
             return false;
     }
 
-    RegExpMatchBuilder builder(cx, array);
-    RootedValue undefinedValue(cx, UndefinedValue());
-
     size_t numPairs = matches.length();
     JS_ASSERT(numPairs > 0);
 
+    AutoValueVector elements(cx);
+    if (!elements.reserve(numPairs))
+        return false;
+
+    /* Accumulate a Value for each pair, in a rooted vector. */
     for (size_t i = 0; i < numPairs; ++i) {
         const MatchPair &pair = matches[i];
 
-        RootedString captured(cx);
         if (pair.isUndefined()) {
             JS_ASSERT(i != 0); /* Since we had a match, first pair must be present. */
-            if (!builder.append(i, undefinedValue))
-                return false;
+            elements.infallibleAppend(undefinedValue);
         } else {
-            captured = js_NewDependentString(cx, input, pair.start, pair.length());
-            RootedValue value(cx, StringValue(captured));
-            if (!captured || !builder.append(i, value))
+            JSLinearString *str = js_NewDependentString(cx, input, pair.start, pair.length());
+            if (!str)
                 return false;
+            elements.infallibleAppend(StringValue(str));
         }
     }
 
-    if (!builder.setIndex(matches[0].start) || !builder.setInput(input))
+    /* Copy the rooted vector into the array object. */
+    RootedObject array(cx, NewDenseCopiedArray(cx, elements.length(), elements.begin()));
+    if (!array)
+        return false;
+
+    /* Set the |index| property. */
+    RootedValue index(cx, Int32Value(matches[0].start));
+    if (!DefinePropertyHelper(cx, array, cx->names().index, index))
+        return false;
+
+    /* Set the |input| property. */
+    RootedValue inputVal(cx, StringValue(input));
+    if (!DefinePropertyHelper(cx, array, cx->names().input, inputVal))
         return false;
 
     rval.setObject(*array);

From 7e15ec4846015ccb60db4704ef04ef698b4fa6d5 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 17:01:31 -0700
Subject: [PATCH 32/85] Bug 862377 - Follow up for review comments. r=sriram

---
 mobile/android/base/DoorHanger.java           | 62 +++++++++++--------
 .../android/base/resources/values/styles.xml  | 12 ++--
 .../android/base/resources/values/themes.xml  |  1 -
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/mobile/android/base/DoorHanger.java b/mobile/android/base/DoorHanger.java
index 4a59a2865f8..092377712d7 100644
--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -25,6 +25,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
@@ -40,9 +41,9 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
     private TextView mTextView;
     private List<PromptInput> mInputs;
 
-    private static int mInputPadding = -1;
-    private static int mSpinnerTextColor = -1;
-    private static int mSpinnerTextSize = -1;
+    private static int sInputPadding = -1;
+    private static int sSpinnerTextColor = -1;
+    private static int sSpinnerTextSize = -1;
 
     // LayoutParams used for adding button layouts
     static private LayoutParams mLayoutParams;
@@ -67,14 +68,14 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
         mTabId = tabId;
         mValue = value;
 
-        if (mInputPadding == -1) {
-            mInputPadding = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding_spinners);
+        if (sInputPadding == -1) {
+            sInputPadding = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding_spinners);
         }
-        if (mSpinnerTextColor == -1) {
-            mSpinnerTextColor = getResources().getColor(R.color.text_color_primary_disable_only);
+        if (sSpinnerTextColor == -1) {
+            sSpinnerTextColor = getResources().getColor(R.color.text_color_primary_disable_only);
         }
-        if (mSpinnerTextSize == -1) {
-            mSpinnerTextSize = getResources().getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
+        if (sSpinnerTextSize == -1) {
+            sSpinnerTextSize = getResources().getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
         }
     }
  
@@ -247,41 +248,50 @@ public class DoorHanger extends LinearLayout implements Button.OnClickListener {
             styleSpinner(input, view);
         } else {
             // add some top and bottom padding to separate inputs
-            view.setPadding(0, mInputPadding,
-                            0, mInputPadding);
+            view.setPadding(0, sInputPadding,
+                            0, sInputPadding);
         }
     }
 
     private void styleSpinner(PromptInput input, View view) {
         PromptInput.MenulistInput spinInput = (PromptInput.MenulistInput) input;
-        // Spinners have some intrinsic padding of their own. This aligns things so that
-        // the spinner text, spinner label text, and main doorhanger text are all aligned
+
+        /* Spinners have some intrinsic padding. To force the spinner's text to line up with
+         * the doorhanger text, we have to take that padding into account.
+         * 
+         * |-----A-------| <-- Normal doorhanger message
+         * |-B-|---C+D---| <-- (optional) Spinner Label
+         * |-B-|-C-|--D--| <-- Spinner
+         *
+         * A - Desired padding (sInputPadding)
+         * B - Final padding applied to input element (sInputPadding - rect.left - textPadding).
+         * C - Spinner background drawable padding (rect.left).
+         * D - Spinner inner TextView padding (textPadding).
+         */
 
         // First get the padding of the selected view inside the spinner. Since the spinner
         // hasn't been shown yet, we get this view directly from the adapter.
-        SpinnerAdapter a = spinInput.spinner.getAdapter();
-        View dropView = a.getView(0, null, spinInput.spinner);
-        int left = 0;
+        Spinner spinner = spinInput.spinner;
+        SpinnerAdapter adapter = spinner.getAdapter();
+        View dropView = adapter.getView(0, null, spinner);
+        int textPadding = 0;
         if (dropView != null) {
-            left = dropView.getPaddingLeft();
+            textPadding = dropView.getPaddingLeft();
         }
 
         // Then get the intrinsic padding built into the background image of the spinner.
-        int p = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding);
         Rect rect = new Rect();
-        spinInput.spinner.getBackground().getPadding(rect);
+        spinner.getBackground().getPadding(rect);
 
-        // Now offset the entire spinner view enough so that when the background drawable
-        // padding and the textview's padding are added, the text is aligned
-        // with the doorhanger text.
-        view.setPadding(p - rect.left - left, 0, rect.right, mInputPadding);
+        // Set the difference in padding to the spinner view to align it with doorhanger text.
+        view.setPadding(sInputPadding - rect.left - textPadding, 0, rect.right, sInputPadding);
 
         if (spinInput.textView != null) {
-            spinInput.textView.setTextColor(mSpinnerTextColor);
-            spinInput.textView.setTextSize(mSpinnerTextSize);
+            spinInput.textView.setTextColor(sSpinnerTextColor);
+            spinInput.textView.setTextSize(sSpinnerTextSize);
 
             // If this spinner has a label, offset it to also be aligned with the doorhanger text.
-            spinInput.textView.setPadding(rect.left + left, 0, 0, 0);
+            spinInput.textView.setPadding(rect.left + textPadding, 0, 0, 0);
         }
     }
 
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 8b0927af5ec..c1550e0800e 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -65,6 +65,12 @@
         <item name="android:ellipsize">marquee</item>
     </style>
 
+    <style name="Widget.Spinner" parent="android:style/Widget.Spinner">
+        <item name="android:minWidth">@dimen/doorhanger_input_width</item>
+    </style>
+
+    <style name="Widget.TextView.SpinnerItem" parent="android:style/Widget.TextView.SpinnerItem"/>
+
     <!--
         TextAppearance
         Note: Gecko uses light theme as default, while Android uses dark.
@@ -434,12 +440,6 @@
         <item name="@android:windowExitAnimation">@anim/popup_hide</item>
     </style>
 
-    <style name="Widget.Spinner" parent="android:style/Widget.Spinner">
-        <item name="android:minWidth">@dimen/doorhanger_input_width</item>
-    </style>
-
-    <style name="Widget.TextView.SpinnerItem" parent="android:style/Widget.TextView.SpinnerItem"/>
-
     <style name="MenuItemDefault">
           <item name="android:textSize">16sp</item>
           <item name="android:textColor">@color/menu_item_title</item>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index 12122c361f3..b27dd25644a 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -81,7 +81,6 @@
         <item name="android:dropDownItemStyle">@style/Widget.DropDownItem</item>
         <item name="android:editTextStyle">@style/Widget.EditText</item>
         <item name="android:textViewStyle">@style/Widget.TextView</item>
-
         <item name="android:spinnerStyle">@style/Widget.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
     </style>

From 74a85d1b6b3a910e3bde46aeacdce10877cf5e5b Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 17:02:30 -0700
Subject: [PATCH 33/85] Bug 872388 - Create a buttonToast class. r=bnicholson

---
 mobile/android/base/Makefile.in             |   1 +
 mobile/android/base/widget/ButtonToast.java | 150 ++++++++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 mobile/android/base/widget/ButtonToast.java

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index d29a84b20b5..87c64ead973 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -227,6 +227,7 @@ FENNEC_JAVA_FILES = \
   widget/AboutHomeView.java \
   widget/AboutHomeSection.java \
   widget/AddonsSection.java \
+  widget/ButtonToast.java \
   widget/DateTimePicker.java \
   widget/Divider.java \
   widget/FaviconView.java \
diff --git a/mobile/android/base/widget/ButtonToast.java b/mobile/android/base/widget/ButtonToast.java
new file mode 100644
index 00000000000..d58bcbd971a
--- /dev/null
+++ b/mobile/android/base/widget/ButtonToast.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2012 Roman Nurik
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.mozilla.gecko.widget;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewPropertyAnimator;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.mozilla.gecko.R;
+
+public class ButtonToast {
+    private final static int TOAST_DURATION = 5000;
+
+    private View mView;
+    private TextView mMessageView;
+    private Button mButton;
+    private ViewPropertyAnimator mBarAnimator;
+    private Handler mHideHandler = new Handler();
+
+    private ToastListener mListener;
+
+    // State objects
+    private CharSequence mToken;
+    private CharSequence mButtonMessage;
+    private int mButtonIcon;
+    private CharSequence mMessage;
+
+    public interface ToastListener {
+        void onButtonClicked(CharSequence token);
+    }
+
+    public ButtonToast(View view, ToastListener listener) {
+        mView = view;
+        mBarAnimator = mView.animate();
+        mListener = listener;
+
+        mMessageView = (TextView) mView.findViewById(R.id.toast_message);
+        mButton = (Button) mView.findViewById(R.id.toast_button);
+        mButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        hide(false);
+                        mListener.onButtonClicked(mToken);
+                    }
+                });
+
+        hide(true);
+    }
+
+    public void show(boolean immediate, CharSequence message,
+                     CharSequence buttonMessage, int buttonIcon,
+                     CharSequence token) {
+        mToken = token;
+        mMessage = message;
+        mButtonMessage = buttonMessage;
+        mMessageView.setText(mMessage);
+
+        mButton.setText(buttonMessage);
+        mButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, buttonIcon, 0);
+
+        mHideHandler.removeCallbacks(mHideRunnable);
+        mHideHandler.postDelayed(mHideRunnable, TOAST_DURATION);
+
+        mView.setVisibility(View.VISIBLE);
+        if (immediate) {
+            mView.setAlpha(1);
+        } else {
+            mBarAnimator.cancel();
+            mBarAnimator
+                    .alpha(1)
+                    .setDuration(
+                            mView.getResources()
+                                    .getInteger(android.R.integer.config_longAnimTime))
+                    .setListener(null);
+        }
+    }
+
+    public void hide(boolean immediate) {
+        mHideHandler.removeCallbacks(mHideRunnable);
+        if (immediate) {
+            mView.setVisibility(View.GONE);
+            mView.setAlpha(0);
+            mMessage = null;
+            mToken = null;
+
+        } else {
+            mBarAnimator.cancel();
+            mBarAnimator
+                    .alpha(0)
+                    .setDuration(mView.getResources()
+                            .getInteger(android.R.integer.config_shortAnimTime))
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            mView.setVisibility(View.GONE);
+                            mMessage = null;
+                            mToken = null;
+                        }
+                    });
+        }
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putCharSequence("toast_message", mMessage);
+        outState.putCharSequence("toast_button_message", mButtonMessage);
+        outState.putInt("toast_button_drawable", mButtonIcon);
+        outState.putCharSequence("toast_token", mToken);
+    }
+
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            mMessage = savedInstanceState.getCharSequence("toast_message");
+            mButtonMessage = savedInstanceState.getCharSequence("toast_buttonmessage");
+            mButtonIcon = savedInstanceState.getInt("toast_button_drawable");
+            mToken = savedInstanceState.getCharSequence("toast_token");
+
+            if (mToken != null || !TextUtils.isEmpty(mMessage)) {
+                show(true, mMessage, mButtonMessage, mButtonIcon, mToken);
+            }
+        }
+    }
+
+    private Runnable mHideRunnable = new Runnable() {
+        @Override
+        public void run() {
+            hide(false);
+        }
+    };
+}

From f7b672f1bedf609c8547115ac67876b2caca9290 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 17:03:17 -0700
Subject: [PATCH 34/85] Bug 872388 - Style button toasts. r=bnicholson

---
 mobile/android/base/BrowserApp.java           |   8 ++-
 mobile/android/base/Makefile.in               |   6 +++
 .../base/resources/drawable-mdpi/toast.9.png  | Bin 0 -> 839 bytes
 .../drawable-mdpi/toast_button_focused.9.png  | Bin 0 -> 311 bytes
 .../drawable-mdpi/toast_button_pressed.9.png  | Bin 0 -> 311 bytes
 .../drawable-mdpi/toast_divider.9.png         | Bin 0 -> 963 bytes
 .../base/resources/drawable/toast_button.xml  |  20 ++++++++
 .../base/resources/layout/gecko_app.xml       |  11 ++++
 .../android/base/resources/values/styles.xml  |  48 ++++++++++++++++++
 9 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 mobile/android/base/resources/drawable-mdpi/toast.9.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/toast_button_pressed.9.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/toast_divider.9.png
 create mode 100644 mobile/android/base/resources/drawable/toast_button.xml

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index b890d0203fd..0317e55d176 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -20,6 +20,7 @@ import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UiAsyncTask;
 import org.mozilla.gecko.widget.AboutHome;
+import org.mozilla.gecko.widget.ButtonToast;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -104,7 +105,7 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     private Vector<MenuItemInfo> mAddonMenuItemsCache;
-
+    private ButtonToast mToast;
     private PropertyAnimator mMainLayoutAnimator;
 
     private static final Interpolator sTabsInterpolator = new Interpolator() {
@@ -359,6 +360,11 @@ abstract public class BrowserApp extends GeckoApp
 
         RelativeLayout actionBar = (RelativeLayout) findViewById(R.id.browser_toolbar);
 
+        mToast = new ButtonToast(findViewById(R.id.toast), new ButtonToast.ToastListener() {
+            public void onButtonClicked(CharSequence token) {
+            }
+        });
+
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
             @Override
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 87c64ead973..d6ae9a30bf3 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -634,6 +634,11 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/tab_thumbnail_shadow.png \
   res/drawable-mdpi/tabs_count.png \
   res/drawable-mdpi/tabs_count_foreground.png \
+  res/drawable-mdpi/toast.9.png \
+  res/drawable-mdpi/toast_button_focused.9.png \
+  res/drawable-mdpi/toast_button_focused.9.png \
+  res/drawable-mdpi/toast_button_pressed.9.png \
+  res/drawable-mdpi/toast_divider.9.png \
   res/drawable-mdpi/address_bar_url_default.9.png \
   res/drawable-mdpi/address_bar_url_default_pb.9.png \
   res/drawable-mdpi/address_bar_url_pressed.9.png \
@@ -1060,6 +1065,7 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/tab_thumbnail.xml                      \
   mobile/android/base/resources/drawable/tabs_panel_indicator.xml               \
   mobile/android/base/resources/drawable/textbox_bg.xml                         \
+  mobile/android/base/resources/drawable/toast_button.xml                       \
   mobile/android/base/resources/drawable/webapp_titlebar_bg.xml                 \
   $(NULL)
 
diff --git a/mobile/android/base/resources/drawable-mdpi/toast.9.png b/mobile/android/base/resources/drawable-mdpi/toast.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9105deeefb805737627a38fc0818ac00be90e11
GIT binary patch
literal 839
zcmV-N1GxN&P)<h;3K|Lk000e1NJLTq003eD001fo1^@s6NUn|#00004b3#c}2nYxW
zd<bNS00009a7bBm000Y#000Y#0XNCZtpET5=}AOERCt{2n_qI;Fc8K+V*^QhEe_My
z%=83(>j~O(aS~>jI*GARALPZW)ym*FPHDWq8I1(U46`4*`nM`D4nMO0(kX7~<h_~I
zFk)_Uoe}*EovX1YXW&9<%X;YfrQ(&gtYsU3Zb)u$URJCv`x(07J%BT7d!-+M)QH@;
zt4yKKsGkWD;6^6npED&9qf)+*i%@0?_YM;x!2j`Q0IsXsuI*S~E(U;D2p)n+gsLlR
z)~=9>VWc8B1QAYMk#;(>=Ms+~!;%PV0Gr)z_q{C3C+FM>Baw?0{`#|j2Eey%`+L9N
z|3EB+?_LjvCh`apVq4es)8TL!ErNlfs;X}Qej@gm6_n6K>hRD+9<c%Na6BGOgg4@x
zD*!y8AE+H`U%WyZSPM;C=Nyc;(S@ol`f;{|GOlVu@WFbG;1$L+HVC$)Ne)ePE^r}o
z;Yk}ujB#*pP^bP{?AN@)m<AUi@diK-O;mF+jA>{hWJ42J2f4U2rolzf7QueV$hL*?
zeq6Ps{oDTy*)c+Hc^mT++1otgPB0<v1QX&;Fd^;)5<;G*8uP<#UT7X+V$4rs<Dt-G
zUh;liwPj8Sc@S<)L#EUuNFikY4V@$z)8J_|svx;Bf@dSN^Zv#~Kq)m`j0nChtL5cT
zI>_q>{MgURD}oI*F)o7SLQ|BNQ`hyc?#qmEaNF@jv&1X-2A|B{*aCP2@CCrvu6{(w
zNRVf+OW!EuQRD=m0q_Fg89)u-Pgg%9cu0fTL!$F&Ei5(YjZL1?AU%UM(r`{<yg)a8
z<P|b8fQP0Q{WdMVcS4_LV`-N?@=r{ms6h}x3Xy~+O$bVS;<F`6rfqP;LHI)9(|wuu
zN~J}b5e^{l5pwOom6jry5COUN;u9WTt5aAxMifYe;Ik<05Zr_a<QBs`#WH(8B6njb
zcUvfTYsd)XZVPFv>cJaB@_p?Zmwe8|2zaHPyRMb2tUt<#|N9Q^takF=<1YkybI$aT
RjbH!(002ovPDHLkV1hAGdGG)L

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png b/mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2a7942f5f45653f3b82f67549bf4ba1ee848e02
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^`arD3!3HFiUopu8DYhhUcNd2LAh=-f^2tCE&H|6f
zVg?58P7r1^KY4mBP>{XE)7O>#E-OE)fUuRrYGI(z5l<J#kch)?XBu)b849@mSE**q
zPf5>BejUrQ@uNc11I906-{vJryH4I1k;)yr`BVqzzw4}<9ttw`C$gGpyb%y^;!ymq
z(36&(E0&v`)T7@eGH=e42S@Aw)t;7nemco~{<@$~q6{xK)@e_U<?J!zv|aIovth{|
zW53<3$rlY?Y`&QKYfiiB>E=&Umj6lCtN3g`)&I#XbN|Xy&sFq4xSmt0F`Kfy#xZ1j
zrNwefGlm;qrk?LjwYVA$wDxE9nz|dW#LvHb!j*entGxf-swY7IFnGH9xvX<aXaWFB
CaCqAQ

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/toast_button_pressed.9.png b/mobile/android/base/resources/drawable-mdpi/toast_button_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..28c57cdd76d2dfbf35258d21cfe6c9f094921b33
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^`arD3!3HFiUopu8DYhhUcNd2LAh=-f^2tCE&H|6f
zVg?58P7r1^KY4mBP>{XE)7O>#E-ODPKQFK7jCVkxBc3jfArXh)&fLq(WXRJR?<1C=
z6w%mbt1+{ot*=RRMIJ+z+Jf{>Z3iZy_=E9<bBcuAR36oqCe?1zv9&DR;F#FXtk@#(
ziKFFWPARu!ZEA1U8$T7^eDBU5{O{~<zJ9vr#@gqzr|e;GC|KibC72^s)o?<@At<hA
z@!clQB$;oP8Z-Mo??|Z(nD=Q){&808|G__9Vm5!Cvb@Ic(>dO*JFXUHK(^zL-`q}q
z)j13SU#Fh$efl*d-;qP{$@`7JHeA)e_HGGdV5n|RpI})V&_4{Gu6{1-oD!M<r`dIe

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/toast_divider.9.png b/mobile/android/base/resources/drawable-mdpi/toast_divider.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b067d4e7d2104b04b3181c241d1063cdaf528f0
GIT binary patch
literal 963
zcmaJ=O^?z*7%q!3n`JjK@gl~<q`L<-(lUh>+EB?tsY|jY1TafHS=s>_ww>AzQaBmo
zL2v#9vx!Ij0ebMfXK(%q6HjY2!6^%@2eD~8GjE>fc|Ye(v+-ze=k^Z6FnjeQtwq;s
z^xNIOPXD#DJ2&Z)CbceU<35>~0b&kq+(V%5ngi5AragUjj!F!ZJa9T)(lw413%i^d
zW4OrmDVt$R<;XX!5h9?629Bq)-#>q0fn%%eiD+aEzlw&=(JVmiS)*gkMwV=|<%ggY
zDOA8k!~~Ih>V-<AvI|{>?qf60f(3+(RQ58cuF(Wl93UWaxr~*C5J(aS^P(id2SCU|
zfzQ%c%D}uLN{Ubb%ZH`j0=uuYG=1rdo>X>7h_CScWHR9<ISvN{9?G&DYY0MyA~NCB
zBW9HG!u^$khC(ZFeBxja#ENDQkBQ3CNH0@x{k5zYF3Us<#z&^lLoOSqv;rE&|DmqC
zMu((@uHyZtaM+pph;N|~j{}P~uD>6<@|9|UOoD?B#;2<)HiwwtaEN_SZA;*;VOowC
z8}2O_hN0BGkeHr@>YB<@4bE|FMJ(hCIa#mOpj3pg24%gNE9#YE0cLffs#jKA4O?Ru
zd1S@4ueka~ZafUGPd#fWaGoPu53masNh{9gSgITKmRx&tEZRmcPlMs(*8bJ%m5I(z
zyj>42J*-C`d34?bI@s@@T>PMyLab|to#<QdVm>b?Z@hRt2U05e>hacDI-Q>9;Jd_e
p;;r!e{&tG_U>_K%<fpHRtzG8)*R9z}@241Ft9q@WeXKlv`3FLdC(-}_

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable/toast_button.xml b/mobile/android/base/resources/drawable/toast_button.xml
new file mode 100644
index 00000000000..43b58ee28f8
--- /dev/null
+++ b/mobile/android/base/resources/drawable/toast_button.xml
@@ -0,0 +1,20 @@
+<!--
+  Copyright 2012 Roman Nurik
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/toast_button_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/toast_button_focused" android:state_focused="true"/>
+    <item android:drawable="@android:color/transparent"/>
+</selector>
\ No newline at end of file
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index a181be6375e..7bffa430d21 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -40,4 +40,15 @@
                  android:layout_height="@dimen/browser_toolbar_height"/>
     </view>
 
+    <LinearLayout android:id="@+id/toast"
+                  style="@style/Toast">
+
+        <TextView android:id="@+id/toast_message"
+                  style="@style/ToastMessage" />
+
+        <Button android:id="@+id/toast_button"
+                style="@style/ToastButton" />
+
+    </LinearLayout>
+
 </RelativeLayout>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index c1550e0800e..3dd8503283d 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -447,4 +447,52 @@
           <item name="android:ellipsize">middle</item>
     </style>
 
+    <style name="Toast">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginBottom">64dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:background">@drawable/toast</item>
+        <item name="android:clickable">true</item>
+        <item name="android:showDividers">middle</item>
+        <item name="android:divider">@drawable/toast_divider</item>
+        <item name="android:dividerPadding">16dp</item>
+
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:paddingLeft">0dp</item>
+        <item name="android:paddingRight">0dp</item>
+    </style>
+
+    <style name="ToastMessage">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingRight">0dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:layout_marginBottom">0dp</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">0dp</item>
+    </style>
+
+    <style name="ToastButton">
+        <item name="android:background">@drawable/toast_button</item>
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+
 </resources>

From 882208679e7886f11b73fb53d046c93523f1ea8d Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 17:03:18 -0700
Subject: [PATCH 35/85] Bug 872388 - Move EditBookmark dialog into its own
 class. r=bnicholson

---
 mobile/android/base/AwesomeBar.java         | 113 +---------
 mobile/android/base/EditBookmarkDialog.java | 237 ++++++++++++++++++++
 mobile/android/base/Makefile.in             |   1 +
 mobile/android/base/db/BrowserDB.java       |   6 +
 mobile/android/base/db/LocalBrowserDB.java  |  19 ++
 5 files changed, 264 insertions(+), 112 deletions(-)
 create mode 100644 mobile/android/base/EditBookmarkDialog.java

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index 6bfefa882d0..1e4533efb12 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -14,9 +14,7 @@ import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UiAsyncTask;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
@@ -526,62 +524,6 @@ public class AwesomeBar extends GeckoActivity
         mContextMenuSubject = tab.getSubject(menu, view, menuInfo);
     }
 
-    private abstract class EditBookmarkTextWatcher implements TextWatcher {
-        protected AlertDialog mDialog;
-        protected EditBookmarkTextWatcher mPairedTextWatcher;
-        protected boolean mEnabled = true;
-
-        public EditBookmarkTextWatcher(AlertDialog aDialog) {
-            mDialog = aDialog;
-        }
-
-        public void setPairedTextWatcher(EditBookmarkTextWatcher aTextWatcher) {
-            mPairedTextWatcher = aTextWatcher;
-        }
-
-        public boolean isEnabled() {
-            return mEnabled;
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            // Disable if the we're disabled or paired partner is disabled
-            boolean enabled = mEnabled && (mPairedTextWatcher == null || mPairedTextWatcher.isEnabled());
-            mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled);
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {}
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-    }
-
-    private class LocationTextWatcher extends EditBookmarkTextWatcher implements TextWatcher {
-        public LocationTextWatcher(AlertDialog aDialog) {
-            super(aDialog);
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            // Disable if the location is empty
-            mEnabled = (s.toString().trim().length() > 0);
-            super.onTextChanged(s, start, before, count);
-        }
-    }
-
-    private class KeywordTextWatcher extends EditBookmarkTextWatcher implements TextWatcher {
-        public KeywordTextWatcher(AlertDialog aDialog) {
-            super(aDialog);
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            // Disable if the keyword contains spaces
-            mEnabled = (s.toString().trim().indexOf(' ') == -1);
-            super.onTextChanged(s, start, before, count);
-       }
-    }
-
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         if (mContextMenuSubject == null)
@@ -624,60 +566,7 @@ public class AwesomeBar extends GeckoActivity
                 break;
             }
             case R.id.edit_bookmark: {
-                AlertDialog.Builder editPrompt = new AlertDialog.Builder(this);
-                final View editView = getLayoutInflater().inflate(R.layout.bookmark_edit, null);
-                editPrompt.setTitle(R.string.bookmark_edit_title);
-                editPrompt.setView(editView);
-
-                final EditText nameText = ((EditText) editView.findViewById(R.id.edit_bookmark_name));
-                final EditText locationText = ((EditText) editView.findViewById(R.id.edit_bookmark_location));
-                final EditText keywordText = ((EditText) editView.findViewById(R.id.edit_bookmark_keyword));
-                nameText.setText(title);
-                locationText.setText(url);
-                keywordText.setText(keyword);
-
-                editPrompt.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                        (new UiAsyncTask<Void, Void, Void>(ThreadUtils.getBackgroundHandler()) {
-                            @Override
-                            public Void doInBackground(Void... params) {
-                                String newUrl = locationText.getText().toString().trim();
-                                String newKeyword = keywordText.getText().toString().trim();
-                                BrowserDB.updateBookmark(getContentResolver(), id, newUrl, nameText.getText().toString(), newKeyword);
-                                return null;
-                            }
-
-                            @Override
-                            public void onPostExecute(Void result) {
-                                Toast.makeText(AwesomeBar.this, R.string.bookmark_updated, Toast.LENGTH_SHORT).show();
-                            }
-                        }).execute();
-                    }
-                });
-
-                editPrompt.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                          // do nothing
-                      }
-                });
-
-                final AlertDialog dialog = editPrompt.create();
-
-                // Create our TextWatchers
-                LocationTextWatcher locationTextWatcher = new LocationTextWatcher(dialog);
-                KeywordTextWatcher keywordTextWatcher = new KeywordTextWatcher(dialog);
-
-                // Cross reference the TextWatchers
-                locationTextWatcher.setPairedTextWatcher(keywordTextWatcher);
-                keywordTextWatcher.setPairedTextWatcher(locationTextWatcher);
-
-                // Add the TextWatcher Listeners
-                locationText.addTextChangedListener(locationTextWatcher);
-                keywordText.addTextChangedListener(keywordTextWatcher);
-
-                dialog.show();
+                new EditBookmarkDialog(this).show(id, title, url, keyword);
                 break;
             }
             case R.id.remove_bookmark: {
diff --git a/mobile/android/base/EditBookmarkDialog.java b/mobile/android/base/EditBookmarkDialog.java
new file mode 100644
index 00000000000..e727e580831
--- /dev/null
+++ b/mobile/android/base/EditBookmarkDialog.java
@@ -0,0 +1,237 @@
+/* -*- 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;
+
+import org.mozilla.gecko.db.BrowserContract.Bookmarks;
+import org.mozilla.gecko.db.BrowserDB;
+import org.mozilla.gecko.util.ThreadUtils;
+import org.mozilla.gecko.util.UiAsyncTask;
+
+import android.content.Context;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.database.Cursor;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+/**
+ * A dialog that allows editing a bookmarks url, title, or keywords
+ * <p>
+ * Invoked by calling one of the {@link org.mozilla.gecko.EditBookmarkDialog.show}
+ * methods.
+ */
+public class EditBookmarkDialog {
+    private static final String LOGTAG = "GeckoEditBookmarkDialog";
+    private Context mContext;
+
+    public EditBookmarkDialog(Context activity) {
+        mContext = activity;
+    }
+
+    /**
+     * A private struct to make it easier to pass bookmark data across threads
+     */
+    private class Bookmark {
+        int id;
+        String title;
+        String url;
+        String keyword;
+
+        public Bookmark(int aId, String aTitle, String aUrl, String aKeyword) {
+            id = aId;
+            title = aTitle;
+            url = aUrl;
+            keyword = aKeyword;
+        }
+    }
+
+    /**
+     * This text watcher to enable or disable the OK button if the dialog contains
+     * valid information. This class is overridden to do data checking diffferent fields.
+     * By itself, it always enables the button.
+     *
+     * Callers can also assing a paired partner to the TextWatcher, and callers will check
+     * that both are enabled before enabling the ok button.
+     */
+    private class EditBookmarkTextWatcher implements TextWatcher {
+        // A stored reference to the dialog containing the text field being watched
+        protected AlertDialog mDialog;
+
+        // A stored text watcher to do the real verification of a field
+        protected EditBookmarkTextWatcher mPairedTextWatcher;
+
+        // Whether or not the ok button should be enabled.
+        protected boolean mEnabled = true;
+
+        public EditBookmarkTextWatcher(AlertDialog aDialog) {
+            mDialog = aDialog;
+        }
+
+        public void setPairedTextWatcher(EditBookmarkTextWatcher aTextWatcher) {
+            mPairedTextWatcher = aTextWatcher;
+        }
+
+        public boolean isEnabled() {
+            return mEnabled;
+        }
+
+        // Textwatcher interface
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            // Disable if the we're disabled or the paired partner is disabled
+            boolean enabled = mEnabled && (mPairedTextWatcher == null || mPairedTextWatcher.isEnabled());
+            mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled);
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {}
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+    }
+
+    /**
+     * A version of the EditBookmarkTextWatcher for the url field of the dialog.
+     * Only checks if the field is empty or not.
+     */
+    private class LocationTextWatcher extends EditBookmarkTextWatcher {
+        public LocationTextWatcher(AlertDialog aDialog) {
+            super(aDialog);
+        }
+
+        // Disables the ok button if the location field is empty.
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            mEnabled = (s.toString().trim().length() > 0);
+            super.onTextChanged(s, start, before, count);
+        }
+    }
+
+    /**
+     * A version of the EditBookmarkTextWatcher for the keyword field of the dialog.
+     * Checks if the field has any (non leading or trailing) spaces.
+     */
+    private class KeywordTextWatcher extends EditBookmarkTextWatcher {
+        public KeywordTextWatcher(AlertDialog aDialog) {
+            super(aDialog);
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            // Disable if the keyword contains spaces
+            mEnabled = (s.toString().trim().indexOf(' ') == -1);
+            super.onTextChanged(s, start, before, count);
+       }
+    }
+
+    /**
+     * Show the Edit bookmark dialog for a particular url. If the url is bookmarked multiple times
+     * this will just edit the first instance it finds.
+     *
+     * @param url The url of the bookmark to edit. The dialog will look up other information like the id,
+     *            current title, or keywords associated with this url. If the url isn't bookmarked, the
+     *            dialog will fail silently. If the url is bookmarked multiple times, this will only show
+     *            information about the first it finds.
+     */
+    public void show(final String url) {
+        (new UiAsyncTask<Void, Void, Bookmark>(ThreadUtils.getBackgroundHandler()) {
+            @Override
+            public Bookmark doInBackground(Void... params) {
+                Cursor cursor = BrowserDB.getBookmarkForUrl(mContext.getContentResolver(), url);
+                if (cursor == null) {
+                    return null;
+                }
+
+                cursor.moveToFirst();
+                Bookmark bookmark = new Bookmark(cursor.getInt(cursor.getColumnIndexOrThrow(Bookmarks._ID)),
+                                                 cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.TITLE)),
+                                                 cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.URL)),
+                                                 cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.KEYWORD)));
+                cursor.close();
+                return bookmark;
+            }
+
+            @Override
+            public void onPostExecute(Bookmark bookmark) {
+                if (bookmark == null)
+                    return;
+
+                show(bookmark.id, bookmark.title, bookmark.url, bookmark.keyword);
+            }
+        }).execute();
+    }
+
+    /**
+     * Show the Edit bookmark dialog for a set of data. This will show the dialog whether
+     * a bookmark with this url exists or not, but the results will NOT be saved if the id
+     * is not a valid bookmark id.
+     *
+     * @param id The id of the bookmark to change. If there is no bookmark with this ID, the dialog
+     *           will fail silently.
+     * @param title The initial title to show in the dialog
+     * @param url The initial url to show in the dialog
+     * @param keyword The initial keyword to show in the dialog
+     */
+    public void show(final int id, final String title, final String url, final String keyword) {
+        AlertDialog.Builder editPrompt = new AlertDialog.Builder(mContext);
+        final View editView = LayoutInflater.from(mContext).inflate(R.layout.bookmark_edit, null);
+        editPrompt.setTitle(R.string.bookmark_edit_title);
+        editPrompt.setView(editView);
+
+        final EditText nameText = ((EditText) editView.findViewById(R.id.edit_bookmark_name));
+        final EditText locationText = ((EditText) editView.findViewById(R.id.edit_bookmark_location));
+        final EditText keywordText = ((EditText) editView.findViewById(R.id.edit_bookmark_keyword));
+        nameText.setText(title);
+        locationText.setText(url);
+        keywordText.setText(keyword);
+
+        editPrompt.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int whichButton) {
+                (new UiAsyncTask<Void, Void, Void>(ThreadUtils.getBackgroundHandler()) {
+                    @Override
+                    public Void doInBackground(Void... params) {
+                        String newUrl = locationText.getText().toString().trim();
+                        String newKeyword = keywordText.getText().toString().trim();
+                        BrowserDB.updateBookmark(mContext.getContentResolver(), id, newUrl, nameText.getText().toString(), newKeyword);
+                        return null;
+                    }
+
+                    @Override
+                    public void onPostExecute(Void result) {
+                        Toast.makeText(mContext, R.string.bookmark_updated, Toast.LENGTH_SHORT).show();
+                    }
+                }).execute();
+            }
+        });
+
+        editPrompt.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int whichButton) {
+                  // do nothing
+              }
+        });
+
+        final AlertDialog dialog = editPrompt.create();
+
+        // Create our TextWatchers
+        LocationTextWatcher locationTextWatcher = new LocationTextWatcher(dialog);
+        KeywordTextWatcher keywordTextWatcher = new KeywordTextWatcher(dialog);
+
+        // Cross reference the TextWatchers
+        locationTextWatcher.setPairedTextWatcher(keywordTextWatcher);
+        keywordTextWatcher.setPairedTextWatcher(locationTextWatcher);
+
+        // Add the TextWatcher Listeners
+        locationText.addTextChangedListener(locationTextWatcher);
+        keywordText.addTextChangedListener(keywordTextWatcher);
+
+        dialog.show();
+    }
+}
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index d6ae9a30bf3..56a82bd0a19 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -82,6 +82,7 @@ FENNEC_JAVA_FILES = \
   Distribution.java \
   DoorHanger.java \
   DoorHangerPopup.java \
+  EditBookmarkDialog.java \
   Favicons.java \
   FilePickerResultHandler.java \
   FilePickerResultHandlerSync.java \
diff --git a/mobile/android/base/db/BrowserDB.java b/mobile/android/base/db/BrowserDB.java
index b51014a317b..fdf6d5a4fa2 100644
--- a/mobile/android/base/db/BrowserDB.java
+++ b/mobile/android/base/db/BrowserDB.java
@@ -112,6 +112,8 @@ public class BrowserDB {
         public void unpinAllSites(ContentResolver cr);
 
         public Cursor getPinnedSites(ContentResolver cr, int limit);
+
+        public Cursor getBookmarkForUrl(ContentResolver cr, String url);
     }
 
     static {
@@ -289,6 +291,10 @@ public class BrowserDB {
         return sDb.getPinnedSites(cr, limit);
     }
 
+    public static Cursor getBookmarkForUrl(ContentResolver cr, String url) {
+        return sDb.getBookmarkForUrl(cr, url);
+    }
+
     public static class PinnedSite {
         public String title = "";
         public String url = "";
diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java
index 484decc438b..0ea07abd9b7 100644
--- a/mobile/android/base/db/LocalBrowserDB.java
+++ b/mobile/android/base/db/LocalBrowserDB.java
@@ -1222,4 +1222,23 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
 
         return (count > 0);
     }
+
+    public Cursor getBookmarkForUrl(ContentResolver cr, String url) {
+        Cursor c = cr.query(bookmarksUriWithLimit(1),
+                            new String[] { Bookmarks._ID,
+                                           Bookmarks.URL,
+                                           Bookmarks.TITLE,
+                                           Bookmarks.KEYWORD },
+                            Bookmarks.URL + " = ?",
+                            new String[] { url },
+                            null);
+        if (c == null) {
+            return c;
+        } else if (c.getCount() == 0) {
+          c.close();
+          c = null;
+        }
+
+        return c;
+    }
 }

From e0fb2485762c47c6f4cb41080f4204baf468ed61 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 17:03:20 -0700
Subject: [PATCH 36/85] Bug 872388 - Show a button toast when bookmarks are
 created. r=bnicholson

---
 mobile/android/base/BrowserApp.java           | 46 ++++++++++++++++++-
 .../base/locales/en-US/android_strings.dtd    |  1 +
 mobile/android/base/strings.xml.in            |  1 +
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 0317e55d176..39153e12a43 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -32,6 +32,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.PointF;
@@ -60,6 +61,7 @@ import android.view.ViewGroup;
 import android.view.animation.Interpolator;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.PopupMenu;
 import android.widget.Toast;
 
 import java.io.InputStream;
@@ -85,6 +87,7 @@ abstract public class BrowserApp extends GeckoApp
     private static final int READER_ADD_SUCCESS = 0;
     private static final int READER_ADD_FAILED = 1;
     private static final int READER_ADD_DUPLICATE = 2;
+    private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast";
 
     private static final String STATE_DYNAMIC_TOOLBAR_ENABLED = "dynamic_toolbar";
 
@@ -362,6 +365,10 @@ abstract public class BrowserApp extends GeckoApp
 
         mToast = new ButtonToast(findViewById(R.id.toast), new ButtonToast.ToastListener() {
             public void onButtonClicked(CharSequence token) {
+                Log.i(LOGTAG, "Clicked " + token);
+                if (ADD_SHORTCUT_TOAST.equals(token)) {
+                    showBookmarkDialog();
+                }
             }
         });
 
@@ -470,6 +477,39 @@ abstract public class BrowserApp extends GeckoApp
         });
     }
 
+    private void showBookmarkDialog() {
+        final Prompt ps = new Prompt(BrowserApp.this, new Prompt.PromptCallback() {
+            public void onPromptFinished(String result) {
+                int itemId = -1;
+                try {
+                  itemId = new JSONObject(result).getInt("button");
+                } catch(Exception ex) { }
+
+                Tab tab = Tabs.getInstance().getSelectedTab();
+                if (tab == null)
+                    return;
+
+                if (itemId == 0) {
+                    new EditBookmarkDialog(BrowserApp.this).show(tab.getURL());
+                } else if (itemId == 1) {
+                    String url = tab.getURL();
+                    String title = tab.getDisplayTitle();
+                    Bitmap favicon = tab.getFavicon();
+                    if (url != null && title != null) {
+                        GeckoAppShell.createShortcut(title, url, url, favicon == null ? null : favicon, "");
+                    }
+                }
+            }
+        });
+
+        final Prompt.PromptListItem[] items = new Prompt.PromptListItem[2];
+        Resources res = getResources();
+        items[0] = new Prompt.PromptListItem(res.getString(R.string.contextmenu_edit_bookmark));
+        items[1] = new Prompt.PromptListItem(res.getString(R.string.contextmenu_add_to_launcher));
+
+        ps.show("", "", items, false);
+    }
+
     private void setDynamicToolbarEnabled(boolean enabled) {
         if (enabled) {
             if (mLayerView != null) {
@@ -1548,7 +1588,11 @@ abstract public class BrowserApp extends GeckoApp
                         item.setIcon(R.drawable.ic_menu_bookmark_add);
                     } else {
                         tab.addBookmark();
-                        Toast.makeText(this, R.string.bookmark_added, Toast.LENGTH_SHORT).show();
+                        mToast.show(false,
+                                    getResources().getString(R.string.bookmark_added),
+                                    getResources().getString(R.string.bookmark_options),
+                                    0,
+                                    ADD_SHORTCUT_TOAST);
                         item.setIcon(R.drawable.ic_menu_bookmark_remove);
                     }
                 }
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 1d326027fdb..55535906e7c 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -42,6 +42,7 @@
 <!ENTITY bookmark_added "Bookmark added">
 <!ENTITY bookmark_removed "Bookmark removed">
 <!ENTITY bookmark_updated "Bookmark updated">
+<!ENTITY bookmark_options "Options">
 
 <!ENTITY history_today_section "Today">
 <!ENTITY history_yesterday_section "Yesterday">
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 83a1bc068e2..d4f5aa64f57 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -57,6 +57,7 @@
   <string name="bookmark_added">&bookmark_added;</string>
   <string name="bookmark_removed">&bookmark_removed;</string>
   <string name="bookmark_updated">&bookmark_updated;</string>
+  <string name="bookmark_options">&bookmark_options;</string>
 
   <string name="history_today_section">&history_today_section;</string>
   <string name="history_yesterday_section">&history_yesterday_section;</string>

From 6b17e5fd221bd9c777dca0e18bfabc930941bd34 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 30 May 2013 17:14:37 -0700
Subject: [PATCH 37/85] Bug 872388 - Cleanup review nits. r=bnicholson

---
 mobile/android/base/BrowserApp.java         | 13 ++++++++-----
 mobile/android/base/EditBookmarkDialog.java |  4 ++--
 mobile/android/base/db/LocalBrowserDB.java  |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 39153e12a43..6602f2c693b 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -61,7 +61,6 @@ import android.view.ViewGroup;
 import android.view.animation.Interpolator;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.PopupMenu;
 import android.widget.Toast;
 
 import java.io.InputStream;
@@ -87,6 +86,7 @@ abstract public class BrowserApp extends GeckoApp
     private static final int READER_ADD_SUCCESS = 0;
     private static final int READER_ADD_FAILED = 1;
     private static final int READER_ADD_DUPLICATE = 2;
+
     private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast";
 
     private static final String STATE_DYNAMIC_TOOLBAR_ENABLED = "dynamic_toolbar";
@@ -364,8 +364,8 @@ abstract public class BrowserApp extends GeckoApp
         RelativeLayout actionBar = (RelativeLayout) findViewById(R.id.browser_toolbar);
 
         mToast = new ButtonToast(findViewById(R.id.toast), new ButtonToast.ToastListener() {
+            @Override
             public void onButtonClicked(CharSequence token) {
-                Log.i(LOGTAG, "Clicked " + token);
                 if (ADD_SHORTCUT_TOAST.equals(token)) {
                     showBookmarkDialog();
                 }
@@ -478,14 +478,17 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     private void showBookmarkDialog() {
-        final Prompt ps = new Prompt(BrowserApp.this, new Prompt.PromptCallback() {
+        final Tab tab = Tabs.getInstance().getSelectedTab();
+        final Prompt ps = new Prompt(this, new Prompt.PromptCallback() {
+            @Override
             public void onPromptFinished(String result) {
                 int itemId = -1;
                 try {
                   itemId = new JSONObject(result).getInt("button");
-                } catch(Exception ex) { }
+                } catch(Exception ex) {
+                    Log.e(LOGTAG, "Exception reading bookmark prompt result", ex);
+                }
 
-                Tab tab = Tabs.getInstance().getSelectedTab();
                 if (tab == null)
                     return;
 
diff --git a/mobile/android/base/EditBookmarkDialog.java b/mobile/android/base/EditBookmarkDialog.java
index e727e580831..867717ecf55 100644
--- a/mobile/android/base/EditBookmarkDialog.java
+++ b/mobile/android/base/EditBookmarkDialog.java
@@ -31,8 +31,8 @@ public class EditBookmarkDialog {
     private static final String LOGTAG = "GeckoEditBookmarkDialog";
     private Context mContext;
 
-    public EditBookmarkDialog(Context activity) {
-        mContext = activity;
+    public EditBookmarkDialog(Context context) {
+        mContext = context;
     }
 
     /**
diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java
index 0ea07abd9b7..d093662c4a7 100644
--- a/mobile/android/base/db/LocalBrowserDB.java
+++ b/mobile/android/base/db/LocalBrowserDB.java
@@ -1235,8 +1235,8 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
         if (c == null) {
             return c;
         } else if (c.getCount() == 0) {
-          c.close();
-          c = null;
+            c.close();
+            c = null;
         }
 
         return c;

From a97740f4737e048724be312b5727e52b9b1fc2c5 Mon Sep 17 00:00:00 2001
From: Anthony Jones <ajones@mozilla.com>
Date: Tue, 28 May 2013 16:17:09 +1200
Subject: [PATCH 38/85] Bug 831237 - Reduce APZC buffer churn; r=BenWa Prevents
 the display port from getting smaller as the visible region approaches the
 edges of the scrollable rect.

---
 gfx/2d/BaseRect.h                         | 16 ++++++++++++++++
 gfx/layers/ipc/AsyncPanZoomController.cpp |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gfx/2d/BaseRect.h b/gfx/2d/BaseRect.h
index c8735043c7e..d94a74c42fa 100644
--- a/gfx/2d/BaseRect.h
+++ b/gfx/2d/BaseRect.h
@@ -418,6 +418,22 @@ struct BaseRect {
                  std::max(y, std::min(YMost(), aPoint.y)));
   }
 
+  /**
+   * Clamp aRect to this rectangle. This returns aRect after it is forced
+   * inside the bounds of this rectangle. It will attempt to retain the size
+   * but will shrink the dimensions that don't fit.
+   */
+  Sub ClampRect(const Sub& aRect) const
+  {
+    Sub rect(std::max(aRect.x, x),
+             std::max(aRect.y, y),
+             std::min(aRect.width, width),
+             std::min(aRect.height, height));
+    rect.x = std::min(rect.XMost(), XMost()) - rect.width;
+    rect.y = std::min(rect.YMost(), YMost()) - rect.height;
+    return rect;
+  }
+
 private:
   // Do not use the default operator== or operator!= !
   // Use IsEqualEdges or IsEqualInterior explicitly.
diff --git a/gfx/layers/ipc/AsyncPanZoomController.cpp b/gfx/layers/ipc/AsyncPanZoomController.cpp
index ac7da3aea49..5b1c437f5be 100644
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -987,7 +987,7 @@ const gfx::Rect AsyncPanZoomController::CalculatePendingDisplayPort(
 
   gfx::Rect shiftedDisplayPort = displayPort;
   shiftedDisplayPort.MoveBy(scrollOffset.x, scrollOffset.y);
-  displayPort = shiftedDisplayPort.Intersect(scrollableRect);
+  displayPort = scrollableRect.ClampRect(shiftedDisplayPort);
   displayPort.MoveBy(-scrollOffset.x, -scrollOffset.y);
 
   return displayPort;

From e734341fc0739fd06306be833e5b110aa381fc15 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Wed, 29 May 2013 11:11:38 -0700
Subject: [PATCH 39/85] Bug 877057 - Add a download limit to Sync Engine
 fetches. r=mconnor

---
 services/sync/modules/engines.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js
index db644fa74cb..74be244e835 100644
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -776,7 +776,7 @@ SyncEngine.prototype = {
     this._log.trace("Downloading & applying server changes");
 
     // Figure out how many total items to fetch this sync; do less on mobile.
-    let batchSize = Infinity;
+    let batchSize = this.downloadLimit || Infinity;
     let isMobile = (Svc.Prefs.get("client.type") == "mobile");
 
     if (!newitems) {

From 4bcc42879a5030f9292e684bd537e947a8dcb2ed Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Thu, 30 May 2013 16:48:19 -0400
Subject: [PATCH 40/85] Bug 873003: ignore duplicate frames from
 NotifyQueuedTrackChanges() r=ekr

---
 .../signaling/src/mediapipeline/MediaPipeline.cpp      |  7 +++++++
 .../webrtc/signaling/src/mediapipeline/MediaPipeline.h | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
index 26ba34a11aa..1c9b5c6c6d3 100644
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -827,6 +827,13 @@ void MediaPipelineTransmit::PipelineListener::ProcessVideoChunk(
     return;
   }
 
+  // We get passed duplicate frames every ~10ms even if there's no frame change!
+  int32_t serial = img->GetSerial();
+  if (serial == last_img_) {
+    return;
+  }
+  last_img_ = serial;
+
   ImageFormat format = img->GetFormat();
 #ifdef MOZ_WIDGET_GONK
   if (format == GONK_IO_SURFACE) {
diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
index 46376227fbc..52c3a312a90 100644
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
@@ -321,8 +321,12 @@ class MediaPipelineTransmit : public MediaPipeline {
   class PipelineListener : public MediaStreamListener {
    public:
     PipelineListener(const RefPtr<MediaSessionConduit>& conduit)
-      : conduit_(conduit), active_(false), samples_10ms_buffer_(nullptr),
-        buffer_current_(0), samplenum_10ms_(0){}
+      : conduit_(conduit),
+        active_(false),
+        last_img_(-1),
+        samples_10ms_buffer_(nullptr),
+        buffer_current_(0),
+        samplenum_10ms_(0) {}
 
     ~PipelineListener()
     {
@@ -359,6 +363,8 @@ class MediaPipelineTransmit : public MediaPipeline {
     RefPtr<MediaSessionConduit> conduit_;
     volatile bool active_;
 
+    int32_t last_img_; // serial number of last Image
+
     // These vars handle breaking audio samples into exact 10ms chunks:
     // The buffer of 10ms audio samples that we will send once full
     // (can be carried over from one call to another).

From b01d4043f571f9cc9f61c226a650d06ac29884b9 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Thu, 30 May 2013 16:48:31 -0400
Subject: [PATCH 41/85] Bug 876856: check if PeerConnection is closed before
 accessing MediaStreamList r=ekr

---
 .../signaling/src/peerconnection/MediaStreamList.cpp       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
index df988602995..7a2d2f708bd 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
@@ -62,6 +62,10 @@ GetStreamFromInfo(T* info, bool& found)
 DOMMediaStream*
 MediaStreamList::IndexedGetter(uint32_t index, bool& found)
 {
+  if (!mPeerConnection->media()) { // PeerConnection closed
+    found = false;
+    return nullptr;
+  }
   if (mType == Local) {
     return GetStreamFromInfo(mPeerConnection->media()->
       GetLocalStream(index), found);
@@ -74,6 +78,9 @@ MediaStreamList::IndexedGetter(uint32_t index, bool& found)
 uint32_t
 MediaStreamList::Length()
 {
+  if (!mPeerConnection->media()) { // PeerConnection closed
+    return 0;
+  }
   return mType == Local ? mPeerConnection->media()->LocalStreamsLength() :
       mPeerConnection->media()->RemoteStreamsLength();
 }

From d89aaca9499383dd3c5c06c682ba40c5d85a5178 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Thu, 30 May 2013 16:48:40 -0400
Subject: [PATCH 42/85] Bug 876878: null out pointer for GetFrameRateList r=bas

---
 .../webrtc/modules/video_capture/windows/device_info_ds.cc      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc b/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc
index a0da89d79b8..fcf2eeba9f3 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc
@@ -586,7 +586,7 @@ WebRtc_Word32 DeviceInfoDS::CreateCapabilityMap(
 
             if (hrVC == S_OK)
             {
-                LONGLONG *frameDurationList;
+                LONGLONG *frameDurationList = NULL;
                 LONGLONG maxFPS;
                 long listSize;
                 SIZE size;

From 1a7ffff5c2e74b10c110fd506850a0091266e2fa Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 30 May 2013 16:56:02 -0400
Subject: [PATCH 43/85] Backed out changeset eb7402ddbe54 (bug 873622) for
 Windows bustage. CLOSED TREE

---
 caps/src/nsScriptSecurityManager.cpp         |  6 +-
 content/base/src/nsContentUtils.cpp          |  5 +-
 js/xpconnect/loader/mozJSComponentLoader.cpp | 14 ++++-
 js/xpconnect/src/XPCCallContext.cpp          |  4 +-
 js/xpconnect/src/XPCComponents.cpp           | 28 ++++++---
 js/xpconnect/src/XPCException.cpp            | 10 ++-
 js/xpconnect/src/XPCJSContextStack.cpp       |  5 +-
 js/xpconnect/src/XPCJSID.cpp                 | 11 ++--
 js/xpconnect/src/XPCJSRuntime.cpp            | 13 ++--
 js/xpconnect/src/XPCJSWeakReference.cpp      |  2 +-
 js/xpconnect/src/XPCQuickStubs.cpp           |  2 +-
 js/xpconnect/src/XPCThrower.cpp              |  2 +-
 js/xpconnect/src/XPCVariant.cpp              |  5 +-
 js/xpconnect/src/XPCWrappedJSClass.cpp       |  8 +--
 js/xpconnect/src/nsCxPusher.cpp              | 15 +++--
 js/xpconnect/src/nsXPConnect.cpp             | 64 ++++++++++++++------
 js/xpconnect/src/xpcprivate.h                | 18 ++----
 js/xpconnect/wrappers/XrayWrapper.cpp        |  2 +-
 18 files changed, 138 insertions(+), 76 deletions(-)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index c6706697457..b2d4a73807f 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -2422,7 +2422,11 @@ nsScriptSecurityManager::nsScriptSecurityManager(void)
 
 nsresult nsScriptSecurityManager::Init()
 {
-    NS_ADDREF(sXPConnect = nsXPConnect::XPConnect());
+    nsXPConnect* xpconnect = nsXPConnect::GetXPConnect();
+     if (!xpconnect)
+        return NS_ERROR_FAILURE;
+
+    NS_ADDREF(sXPConnect = xpconnect);
 
     JSContext* cx = GetSafeJSContext();
     if (!cx) return NS_ERROR_FAILURE;   // this can happen of xpt loading fails
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index f8dabdd427c..858fb3e020f 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -361,7 +361,10 @@ nsContentUtils::Init()
   nsresult rv = NS_GetNameSpaceManager(&sNameSpaceManager);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  sXPConnect = nsXPConnect::XPConnect();
+  nsXPConnect* xpconnect = nsXPConnect::GetXPConnect();
+  NS_ENSURE_TRUE(xpconnect, NS_ERROR_FAILURE);
+
+  sXPConnect = xpconnect;
 
   sSecurityManager = nsScriptSecurityManager::GetScriptSecurityManager();
   if(!sSecurityManager)
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index b82aa6d42d3..2e789d747bf 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -262,7 +262,12 @@ File(JSContext *cx, unsigned argc, Value *vp)
         return false;
     }
 
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+    if (!xpc) {
+        XPCThrower::Throw(NS_ERROR_UNEXPECTED, cx);
+        return false;
+    }
+
     JSObject* glob = JS_GetGlobalForScopeChain(cx);
 
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
@@ -297,7 +302,12 @@ Blob(JSContext *cx, unsigned argc, Value *vp)
         return false;
     }
 
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+    if (!xpc) {
+        XPCThrower::Throw(NS_ERROR_UNEXPECTED, cx);
+        return false;
+    }
+
     JSObject* glob = JS_GetGlobalForScopeChain(cx);
 
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
diff --git a/js/xpconnect/src/XPCCallContext.cpp b/js/xpconnect/src/XPCCallContext.cpp
index d40c6510fac..3dacd51d4a6 100644
--- a/js/xpconnect/src/XPCCallContext.cpp
+++ b/js/xpconnect/src/XPCCallContext.cpp
@@ -24,7 +24,7 @@ XPCCallContext::XPCCallContext(XPCContext::LangType callerLanguage,
                                jsval *argv         /* = nullptr               */,
                                jsval *rval         /* = nullptr               */)
     :   mState(INIT_FAILED),
-        mXPC(nsXPConnect::XPConnect()),
+        mXPC(nsXPConnect::GetXPConnect()),
         mXPCContext(nullptr),
         mJSContext(cx),
         mContextPopRequired(false),
@@ -48,7 +48,7 @@ XPCCallContext::XPCCallContext(XPCContext::LangType callerLanguage,
                                XPCWrappedNative* wrapper,
                                XPCWrappedNativeTearOff* tearOff)
     :   mState(INIT_FAILED),
-        mXPC(nsXPConnect::XPConnect()),
+        mXPC(nsXPConnect::GetXPConnect()),
         mXPCContext(nullptr),
         mJSContext(cx),
         mContextPopRequired(false),
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index a1f4b66210a..ead0c542ff1 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -65,7 +65,10 @@ JSValIsInterfaceOfType(JSContext *cx, HandleValue v, REFNSIID iid)
     if (v.isPrimitive())
         return false;
 
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsCOMPtr<nsIXPConnect> xpc = nsXPConnect::GetXPConnect();
+    if (!xpc)
+        return false;
+
     RootedObject obj(cx, &v.toObject());
     if (NS_SUCCEEDED(xpc->GetWrappedNativeOfJSObject(cx, obj, getter_AddRefs(wn))) && wn &&
         NS_SUCCEEDED(wn->Native()->QueryInterface(iid, (void**)&iface)) && iface)
@@ -2805,8 +2808,9 @@ nsXPCComponents_Utils::ReportError(const JS::Value &errorArg, JSContext *cx)
         return NS_OK;
 
     nsCOMPtr<nsIStackFrame> frame;
-    nsXPConnect *xpc = nsXPConnect::XPConnect();
-    xpc->GetCurrentJSStack(getter_AddRefs(frame));
+    nsXPConnect *xpc = nsXPConnect::GetXPConnect();
+    if (xpc)
+        xpc->GetCurrentJSStack(getter_AddRefs(frame));
 
     nsXPIDLCString fileName;
     int32_t lineNo = 0;
@@ -3478,7 +3482,9 @@ GetPrincipalOrSOP(JSContext *cx, HandleObject from, nsISupports **out)
     MOZ_ASSERT(out);
     *out = NULL;
 
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsCOMPtr<nsIXPConnect> xpc = nsXPConnect::GetXPConnect();
+    if (!xpc)
+        return NS_ERROR_XPC_UNEXPECTED;
     nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
     xpc->GetWrappedNativeOfJSObject(cx, from,
                                     getter_AddRefs(wrapper));
@@ -3679,7 +3685,9 @@ AssembleSandboxMemoryReporterName(JSContext *cx, nsCString &sandboxName)
     if (sandboxName.IsEmpty())
         sandboxName = NS_LITERAL_CSTRING("[anonymous sandbox]");
 
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+    NS_ENSURE_TRUE(xpc, NS_ERROR_XPC_UNEXPECTED);
+
     // Get the xpconnect native call context.
     nsAXPCNativeCallContext *cc = nullptr;
     xpc->GetCurrentNativeCallContext(&cc);
@@ -4416,9 +4424,9 @@ nsXPCComponents_Utils::Dispatch(const jsval &runnableArg, const jsval &scope,
         return NS_ERROR_INVALID_ARG;
 
     nsCOMPtr<nsIRunnable> run;
-    nsresult rv = nsXPConnect::XPConnect()->WrapJS(cx, &runnable.toObject(),
-                                                   NS_GET_IID(nsIRunnable),
-                                                   getter_AddRefs(run));
+    nsresult rv = nsXPConnect::GetXPConnect()->WrapJS(cx, &runnable.toObject(),
+                                                      NS_GET_IID(nsIRunnable),
+                                                      getter_AddRefs(run));
     NS_ENSURE_SUCCESS(rv, rv);
     MOZ_ASSERT(run);
 
@@ -4761,7 +4769,9 @@ NS_IMETHODIMP
 nsXPCComponents::GetStack(nsIStackFrame * *aStack)
 {
     nsresult rv;
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+    if (!xpc)
+        return NS_ERROR_FAILURE;
     rv = xpc->GetCurrentJSStack(aStack);
     return rv;
 }
diff --git a/js/xpconnect/src/XPCException.cpp b/js/xpconnect/src/XPCException.cpp
index e01d9de53f9..ff90eea0da8 100644
--- a/js/xpconnect/src/XPCException.cpp
+++ b/js/xpconnect/src/XPCException.cpp
@@ -297,7 +297,9 @@ nsXPCException::Initialize(const char *aMessage, nsresult aResult, const char *a
             return rc;
     } else {
         nsresult rv;
-        nsXPConnect* xpc = nsXPConnect::XPConnect();
+        nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+        if (!xpc)
+            return NS_ERROR_FAILURE;
         rv = xpc->GetCurrentJSStack(&mLocation);
         if (NS_FAILED(rv))
             return rv;
@@ -398,7 +400,11 @@ nsXPCException::NewException(const char *aMessage,
             location = aLocation;
             NS_ADDREF(location);
         } else {
-            nsXPConnect* xpc = nsXPConnect::XPConnect();
+            nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+            if (!xpc) {
+                NS_RELEASE(e);
+                return NS_ERROR_FAILURE;
+            }
             rv = xpc->GetCurrentJSStack(&location);
             if (NS_FAILED(rv)) {
                 NS_RELEASE(e);
diff --git a/js/xpconnect/src/XPCJSContextStack.cpp b/js/xpconnect/src/XPCJSContextStack.cpp
index 142cf4ff539..6abb9dcb687 100644
--- a/js/xpconnect/src/XPCJSContextStack.cpp
+++ b/js/xpconnect/src/XPCJSContextStack.cpp
@@ -147,7 +147,10 @@ XPCJSContextStack::GetSafeJSContext()
     if (NS_FAILED(rv))
         return NULL;
 
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsRefPtr<nsXPConnect> xpc = nsXPConnect::GetXPConnect();
+    if (!xpc)
+        return NULL;
+
     XPCJSRuntime* xpcrt = xpc->GetRuntime();
     if (!xpcrt)
         return NULL;
diff --git a/js/xpconnect/src/XPCJSID.cpp b/js/xpconnect/src/XPCJSID.cpp
index bb8979fd47c..104a33b8a27 100644
--- a/js/xpconnect/src/XPCJSID.cpp
+++ b/js/xpconnect/src/XPCJSID.cpp
@@ -714,7 +714,10 @@ static void
 GetWrapperObject(MutableHandleObject obj)
 {
     obj.set(NULL);
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+    if (!xpc)
+        return;
+
     nsAXPCNativeCallContext *ccxp = NULL;
     xpc->GetCurrentNativeCallContext(&ccxp);
     if (!ccxp)
@@ -766,7 +769,7 @@ nsJSCID::CreateInstance(const JS::Value& iidval, JSContext* cx,
     if (NS_FAILED(rv) || !inst)
         return NS_ERROR_XPC_CI_RETURNED_FAILURE;
 
-    rv = nsXPConnect::XPConnect()->WrapNativeToJSVal(cx, obj, inst, nullptr, iid, true, retval, nullptr);
+    rv = nsXPConnect::GetXPConnect()->WrapNativeToJSVal(cx, obj, inst, nullptr, iid, true, retval, nullptr);
     if (NS_FAILED(rv) || JSVAL_IS_PRIMITIVE(*retval))
         return NS_ERROR_XPC_CANT_CREATE_WN;
     return NS_OK;
@@ -815,7 +818,7 @@ nsJSCID::GetService(const JS::Value& iidval, JSContext* cx,
 
     RootedObject instJSObj(cx);
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
-    rv = nsXPConnect::XPConnect()->WrapNative(cx, obj, srvc, *iid, getter_AddRefs(holder));
+    rv = nsXPConnect::GetXPConnect()->WrapNative(cx, obj, srvc, *iid, getter_AddRefs(holder));
     if (NS_FAILED(rv) || !holder ||
         // Assign, not compare
         !(instJSObj = holder->GetJSObject()))
@@ -892,7 +895,7 @@ xpc_NewIDObject(JSContext *cx, HandleObject jsobj, const nsID& aID)
     nsCOMPtr<nsIJSID> iid =
             dont_AddRef(static_cast<nsIJSID*>(nsJSID::NewID(aID)));
     if (iid) {
-        nsXPConnect* xpc = nsXPConnect::XPConnect();
+        nsXPConnect* xpc = nsXPConnect::GetXPConnect();
         if (xpc) {
             nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
             nsresult rv = xpc->WrapNative(cx, jsobj,
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 930f46173c6..494834ef0e0 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -608,8 +608,9 @@ XPCJSRuntime::UnmarkSkippableJSHolders()
 void
 xpc_UnmarkSkippableJSHolders()
 {
-    if (nsXPConnect::XPConnect()->GetRuntime()) {
-        nsXPConnect::XPConnect()->GetRuntime()->UnmarkSkippableJSHolders();
+    if (nsXPConnect::GetXPConnect() &&
+        nsXPConnect::GetXPConnect()->GetRuntime()) {
+        nsXPConnect::GetXPConnect()->GetRuntime()->UnmarkSkippableJSHolders();
     }
 }
 
@@ -2258,7 +2259,7 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
 
     virtual void initExtraZoneStats(JS::Zone *zone, JS::ZoneStats *zStats) MOZ_OVERRIDE {
         // Get the compartment's global.
-        nsXPConnect *xpc = nsXPConnect::XPConnect();
+        nsXPConnect *xpc = nsXPConnect::GetXPConnect();
         AutoSafeJSContext cx;
         JSCompartment *comp = js::GetAnyCompartmentInZone(zone);
         xpc::ZoneStatsExtras *extras = new xpc::ZoneStatsExtras;
@@ -2291,7 +2292,7 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
         GetCompartmentName(c, cName, true);
 
         // Get the compartment's global.
-        nsXPConnect *xpc = nsXPConnect::XPConnect();
+        nsXPConnect *xpc = nsXPConnect::GetXPConnect();
         AutoSafeJSContext cx;
         bool needZone = true;
         RootedObject global(cx, JS_GetGlobalForCompartmentOrNull(cx, c));
@@ -3003,8 +3004,8 @@ XPCRootSetElem::AddToRootSet(XPCLock *lock, XPCRootSetElem **listHead)
 void
 XPCRootSetElem::RemoveFromRootSet(XPCLock *lock)
 {
-    nsXPConnect *xpc = nsXPConnect::XPConnect();
-    JS::PokeGC(xpc->GetRuntime()->GetJSRuntime());
+    if (nsXPConnect *xpc = nsXPConnect::GetXPConnect())
+        JS::PokeGC(xpc->GetRuntime()->GetJSRuntime());
 
     NS_ASSERTION(mSelfp, "Must be linked");
 
diff --git a/js/xpconnect/src/XPCJSWeakReference.cpp b/js/xpconnect/src/XPCJSWeakReference.cpp
index 2e4c22674e1..168fb40fd0a 100644
--- a/js/xpconnect/src/XPCJSWeakReference.cpp
+++ b/js/xpconnect/src/XPCJSWeakReference.cpp
@@ -25,7 +25,7 @@ nsresult xpcJSWeakReference::Init(JSContext* cx, const JS::Value& object)
 
     // See if the object is a wrapped native that supports weak references.
     nsISupports* supports =
-        nsXPConnect::XPConnect()->GetNativeOfWrapper(cx, obj);
+        nsXPConnect::GetXPConnect()->GetNativeOfWrapper(cx, obj);
     nsCOMPtr<nsISupportsWeakReference> supportsWeakRef =
         do_QueryInterface(supports);
     if (supportsWeakRef) {
diff --git a/js/xpconnect/src/XPCQuickStubs.cpp b/js/xpconnect/src/XPCQuickStubs.cpp
index d9efa5e051f..f3104d47ee6 100644
--- a/js/xpconnect/src/XPCQuickStubs.cpp
+++ b/js/xpconnect/src/XPCQuickStubs.cpp
@@ -65,7 +65,7 @@ LookupInterfaceOrAncestor(uint32_t tableSize, const xpc_qsHashEntry *table,
          * supports, including ancestors.
          */
         nsCOMPtr<nsIInterfaceInfo> info;
-        if (NS_FAILED(nsXPConnect::XPConnect()->GetInfoForIID(&iid, getter_AddRefs(info))))
+        if (NS_FAILED(nsXPConnect::GetXPConnect()->GetInfoForIID(&iid, getter_AddRefs(info))))
             return nullptr;
 
         const nsIID *piid;
diff --git a/js/xpconnect/src/XPCThrower.cpp b/js/xpconnect/src/XPCThrower.cpp
index 2f49f006942..5248cd4ccbc 100644
--- a/js/xpconnect/src/XPCThrower.cpp
+++ b/js/xpconnect/src/XPCThrower.cpp
@@ -241,7 +241,7 @@ XPCThrower::ThrowExceptionObject(JSContext* cx, nsIException* e)
                 return false;
             JS_SetPendingException(cx, thrown);
             success = true;
-        } else if ((xpc = nsXPConnect::XPConnect())) {
+        } else if ((xpc = nsXPConnect::GetXPConnect())) {
             JS::RootedObject glob(cx, JS_GetGlobalForScopeChain(cx));
             if (!glob)
                 return false;
diff --git a/js/xpconnect/src/XPCVariant.cpp b/js/xpconnect/src/XPCVariant.cpp
index bb59a377888..d42e17c2be2 100644
--- a/js/xpconnect/src/XPCVariant.cpp
+++ b/js/xpconnect/src/XPCVariant.cpp
@@ -350,11 +350,12 @@ JSBool XPCVariant::InitializeData(JSContext* cx)
 
     // XXX This could be smarter and pick some more interesting iface.
 
-    nsXPConnect*  xpc = nsXPConnect::XPConnect();
+    nsXPConnect*  xpc;
     nsCOMPtr<nsISupports> wrapper;
     const nsIID& iid = NS_GET_IID(nsISupports);
 
-    return NS_SUCCEEDED(xpc->WrapJS(cx, jsobj,
+    return nullptr != (xpc = nsXPConnect::GetXPConnect()) &&
+           NS_SUCCEEDED(xpc->WrapJS(cx, jsobj,
                                     iid, getter_AddRefs(wrapper))) &&
            NS_SUCCEEDED(nsVariant::SetFromInterface(&mData, iid, wrapper));
 }
diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index f22d62a4d24..c447002cea7 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -125,7 +125,7 @@ nsXPCWrappedJSClass::GetNewOrUsed(JSContext* cx, REFNSIID aIID,
 
     if (!clazz) {
         nsCOMPtr<nsIInterfaceInfo> info;
-        nsXPConnect::XPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
+        nsXPConnect::GetXPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
         if (info) {
             bool canScript, isBuiltin;
             if (NS_SUCCEEDED(info->IsScriptable(&canScript)) && canScript &&
@@ -240,7 +240,7 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
     // We so often ask for nsISupports that we can short-circuit the test...
     if (!aIID.Equals(NS_GET_IID(nsISupports))) {
         nsCOMPtr<nsIInterfaceInfo> info;
-        nsXPConnect::XPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
+        nsXPConnect::GetXPConnect()->GetInfoForIID(&aIID, getter_AddRefs(info));
         if (!info)
             return nullptr;
         bool canScript, isBuiltin;
@@ -276,7 +276,7 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
                     // C++ QI failure. See if that is the case.
                     nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
 
-                    nsXPConnect::XPConnect()->
+                    nsXPConnect::GetXPConnect()->
                         GetWrappedNativeOfJSObject(cx,
                                                    &jsexception.toObject(),
                                                    getter_AddRefs(wrapper));
@@ -684,7 +684,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
 
         *aInstancePtr = nullptr;
 
-        nsXPConnect *xpc = nsXPConnect::XPConnect();
+        nsXPConnect *xpc = nsXPConnect::GetXPConnect();
         nsCOMPtr<nsIScriptSecurityManager> secMan =
             do_QueryInterface(xpc->GetDefaultSecurityManager());
         if (!secMan)
diff --git a/js/xpconnect/src/nsCxPusher.cpp b/js/xpconnect/src/nsCxPusher.cpp
index 398b5999254..48637662fdb 100644
--- a/js/xpconnect/src/nsCxPusher.cpp
+++ b/js/xpconnect/src/nsCxPusher.cpp
@@ -117,7 +117,13 @@ nsCxPusher::Push(JSContext *cx)
 void
 nsCxPusher::DoPush(JSContext* cx)
 {
-  nsXPConnect *xpc = nsXPConnect::XPConnect();
+  nsIXPConnect *xpc = nsXPConnect::GetXPConnect();
+  if (!xpc) {
+    // If someone tries to push a cx when we don't have the relevant state,
+    // it's probably safest to just crash.
+    MOZ_CRASH();
+  }
+
   // NB: The GetDynamicScriptContext is historical and might not be sane.
   if (cx && nsJSUtils::GetDynamicScriptContext(cx) &&
       xpc::IsJSContextOnStack(cx))
@@ -165,6 +171,7 @@ nsCxPusher::Pop()
 
     return;
   }
+  MOZ_ASSERT(nsXPConnect::GetXPConnect());
 
   // Leave the request before popping.
   mAutoRequest.destroyIfConstructed();
@@ -177,7 +184,7 @@ nsCxPusher::Pop()
   MOZ_ASSERT_IF(mPushedContext, mCompartmentDepthOnEntry ==
                                 js::GetEnterCompartmentDepth(mPushedContext));
   DebugOnly<JSContext*> stackTop;
-  MOZ_ASSERT(mPushedContext == nsXPConnect::XPConnect()->GetCurrentJSContext());
+  MOZ_ASSERT(mPushedContext == nsXPConnect::GetXPConnect()->GetCurrentJSContext());
   xpc::PopJSContext();
 
   if (!mScriptIsRunning && mScx) {
@@ -213,7 +220,7 @@ AutoJSContext::Init(bool aSafe MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
 
   MOZ_GUARD_OBJECT_NOTIFIER_INIT;
 
-  nsXPConnect *xpc = nsXPConnect::XPConnect();
+  nsIXPConnect *xpc = nsXPConnect::GetXPConnect();
   if (!aSafe) {
     mCx = xpc->GetCurrentJSContext();
   }
@@ -236,7 +243,7 @@ AutoSafeJSContext::AutoSafeJSContext(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMP
 
 AutoPushJSContext::AutoPushJSContext(JSContext *aCx) : mCx(aCx)
 {
-  if (mCx && mCx != nsXPConnect::XPConnect()->GetCurrentJSContext()) {
+  if (mCx && mCx != nsXPConnect::GetXPConnect()->GetCurrentJSContext()) {
     mPusher.Push(mCx);
   }
 }
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 9b3481b15a2..cc8d6c02cd2 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -137,29 +137,48 @@ nsXPConnect::~nsXPConnect()
 }
 
 // static
-void
-    nsXPConnect::InitStatics()
-    {
-    gSelf = new nsXPConnect();
-    gOnceAliveNowDead = false;
-    if (!gSelf->mRuntime) {
-        NS_RUNTIMEABORT("Couldn't create XPCJSRuntime.");
-    }
-
-    // Initial extra ref to keep the singleton alive
-    // balanced by explicit call to ReleaseXPConnectSingleton()
-    NS_ADDREF(gSelf);
-
-    // Set XPConnect as the main thread observer.
-    if (NS_FAILED(nsThread::SetMainThreadObserver(gSelf))) {
+nsXPConnect*
+nsXPConnect::GetXPConnect()
+{
+    // Do a release-mode assert that we're not doing anything significant in
+    // XPConnect off the main thread. If you're an extension developer hitting
+    // this, you need to change your code. See bug 716167.
+    if (!MOZ_LIKELY(NS_IsMainThread() || NS_IsCycleCollectorThread()))
         MOZ_CRASH();
+
+    if (!gSelf) {
+        if (gOnceAliveNowDead)
+            return nullptr;
+        gSelf = new nsXPConnect();
+        if (!gSelf)
+            return nullptr;
+
+        if (!gSelf->mRuntime) {
+            NS_RUNTIMEABORT("Couldn't create XPCJSRuntime.");
+        }
+
+        // Initial extra ref to keep the singleton alive
+        // balanced by explicit call to ReleaseXPConnectSingleton()
+        NS_ADDREF(gSelf);
+
+        // Set XPConnect as the main thread observer.
+        //
+        // The cycle collector sometimes calls GetXPConnect, but it should never
+        // be the one that initializes gSelf.
+        MOZ_ASSERT(NS_IsMainThread());
+        if (NS_FAILED(nsThread::SetMainThreadObserver(gSelf))) {
+            NS_RELEASE(gSelf);
+            // Fall through to returning null
+        }
     }
+    return gSelf;
 }
 
+// static
 nsXPConnect*
 nsXPConnect::GetSingleton()
 {
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
     NS_IF_ADDREF(xpc);
     return xpc;
 }
@@ -211,7 +230,8 @@ nsXPConnect::ReleaseXPConnectSingleton()
 XPCJSRuntime*
 nsXPConnect::GetRuntimeInstance()
 {
-    nsXPConnect* xpc = XPConnect();
+    nsXPConnect* xpc = GetXPConnect();
+    NS_ASSERTION(xpc, "Must not be called if XPC failed to initialize");
     return xpc->GetRuntime();
 }
 
@@ -2032,7 +2052,7 @@ NS_EXPORT_(void)
 xpc_ActivateDebugMode()
 {
     XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
-    nsXPConnect::XPConnect()->SetDebugModeWhenPossible(true, true);
+    nsXPConnect::GetXPConnect()->SetDebugModeWhenPossible(true, true);
     nsXPConnect::CheckForDebugMode(rt->GetJSRuntime());
 }
 
@@ -2057,7 +2077,7 @@ bool
 PushJSContext(JSContext *aCx)
 {
     // JSD mumbo jumbo.
-    nsXPConnect *xpc = nsXPConnect::XPConnect();
+    nsXPConnect *xpc = nsXPConnect::GetXPConnect();
     JSRuntime *rt = XPCJSRuntime::Get()->GetJSRuntime();
     if (xpc::gDebugMode != xpc::gDesiredDebugMode) {
         if (!xpc::gDesiredDebugMode) {
@@ -2232,7 +2252,11 @@ void
 DumpJSHeap(FILE* file)
 {
     NS_ABORT_IF_FALSE(NS_IsMainThread(), "Must dump GC heap on main thread.");
-    nsXPConnect* xpc = nsXPConnect::XPConnect();
+    nsXPConnect* xpc = nsXPConnect::GetXPConnect();
+    if (!xpc) {
+        NS_ERROR("Failed to get nsXPConnect instance!");
+        return;
+    }
     js::DumpHeapComplete(xpc->GetRuntime()->GetJSRuntime(), file);
 }
 
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 489159bd2d6..24a03b94b01 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -476,18 +476,8 @@ public:
     // non-interface implementation
 public:
     // These get non-addref'd pointers
-    static nsXPConnect*  XPConnect()
-    {
-        // Do a release-mode assert that we're not doing anything significant in
-        // XPConnect off the main thread. If you're an extension developer hitting
-        // this, you need to change your code. See bug 716167.
-        if (!MOZ_LIKELY(NS_IsMainThread() || NS_IsCycleCollectorThread()))
-            MOZ_CRASH();
-
-        return gSelf;
-    }
-
-    static nsXPConnect*  FastGetXPConnect() { return gSelf ? gSelf : XPConnect(); }
+    static nsXPConnect*  GetXPConnect();
+    static nsXPConnect*  FastGetXPConnect() { return gSelf ? gSelf : GetXPConnect(); }
     static XPCJSRuntime* GetRuntimeInstance();
     XPCJSRuntime* GetRuntime() {return mRuntime;}
 
@@ -516,7 +506,7 @@ public:
     static nsXPConnect* GetSingleton();
 
     // Called by module code in dll startup
-    static void InitStatics();
+    static void InitStatics() { gSelf = nullptr; gOnceAliveNowDead = false; }
     // Called by module code on dll shutdown.
     static void ReleaseXPConnectSingleton();
 
@@ -654,7 +644,7 @@ class XPCJSRuntime
 {
 public:
     static XPCJSRuntime* newXPCJSRuntime(nsXPConnect* aXPConnect);
-    static XPCJSRuntime* Get() { return nsXPConnect::XPConnect()->GetRuntime(); }
+    static XPCJSRuntime* Get() { return nsXPConnect::GetXPConnect()->GetRuntime(); }
 
     JSRuntime*     GetJSRuntime() const {return mJSRuntime;}
     nsXPConnect*   GetXPConnect() const {return mXPConnect;}
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 00d6251c1d9..d7a4a07236a 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1935,7 +1935,7 @@ do_QueryInterfaceNative(JSContext* cx, HandleObject wrapper)
             nativeSupports = wn->Native();
         }
     } else {
-        nsIXPConnect *xpc = nsXPConnect::XPConnect();
+        nsIXPConnect *xpc = nsXPConnect::GetXPConnect();
         nativeSupports = xpc->GetNativeOfWrapper(cx, wrapper);
     }
 

From c020069e50e6d75c91806f4f64814e1e18d366b8 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 30 May 2013 17:42:56 -0700
Subject: [PATCH 44/85] Bug 875400 - Part 1: add-on support and hashing changes
 for Environment. r=nalexander

---
 .../background/healthreport/Environment.java  | 216 +++++++++++++++---
 .../healthreport/EnvironmentBuilder.java      |  40 +++-
 .../HealthReportDatabaseStorage.java          | 203 ++++++++++++++--
 .../healthreport/HealthReportGenerator.java   | 165 +++++++++++--
 .../healthreport/HealthReportUtils.java       |  25 --
 .../healthreport/ProfileInformationCache.java |  54 ++++-
 6 files changed, 600 insertions(+), 103 deletions(-)

diff --git a/mobile/android/base/background/healthreport/Environment.java b/mobile/android/base/background/healthreport/Environment.java
index 8d1f2858cb0..211b28ca2f7 100644
--- a/mobile/android/base/background/healthreport/Environment.java
+++ b/mobile/android/base/background/healthreport/Environment.java
@@ -4,7 +4,16 @@
 
 package org.mozilla.gecko.background.healthreport;
 
-import java.util.ArrayList;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Iterator;
+import java.util.SortedSet;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.mozilla.apache.commons.codec.binary.Base64;
+import org.mozilla.gecko.background.common.log.Logger;
 
 /**
  * This captures all of the details that define an 'environment' for FHR's purposes.
@@ -21,8 +30,12 @@ import java.util.ArrayList;
  *
  */
 public abstract class Environment {
+  private static final String LOG_TAG = "GeckoEnvironment";
+
   public static int VERSION = 1;
 
+  protected final Class<? extends EnvironmentAppender> appenderClass;
+
   protected volatile String hash = null;
   protected volatile int id = -1;
 
@@ -54,47 +67,194 @@ public abstract class Environment {
   // public int isDefaultBrowser;        // This is meaningless on Android.
 
   // org.mozilla.addons.active.
-  public final ArrayList<String> addons = new ArrayList<String>();
+  public JSONObject addons = null;
 
   // org.mozilla.addons.counts.
   public int extensionCount;
   public int pluginCount;
   public int themeCount;
 
+  public Environment() {
+    this(Environment.HashAppender.class);
+  }
+
+  public Environment(Class<? extends EnvironmentAppender> appenderClass) {
+    this.appenderClass = appenderClass;
+  }
+
+  public JSONObject getNonIgnoredAddons() {
+    if (addons == null) {
+      return null;
+    }
+    JSONObject out = new JSONObject();
+    @SuppressWarnings("unchecked")
+    Iterator<String> keys = addons.keys();
+    while (keys.hasNext()) {
+      try {
+        final String key = keys.next();
+        final Object obj = addons.get(key);
+        if (obj != null && obj instanceof JSONObject && ((JSONObject) obj).optBoolean("ignore", false)) {
+          continue;
+        }
+        out.put(key, obj);
+      } catch (JSONException ex) {
+        // Do nothing.
+      }
+    }
+    return out;
+  }
+
+  /**
+   * We break out this interface in order to allow for testing -- pass in your
+   * own appender that just records strings, for example.
+   */
+  public static abstract class EnvironmentAppender {
+    public abstract void append(String s);
+    public abstract void append(int v);
+  }
+
+  public static class HashAppender extends EnvironmentAppender {
+    final MessageDigest hasher;
+
+    public HashAppender() throws NoSuchAlgorithmException {
+      // Note to the security minded reader: we deliberately use SHA-1 here, not
+      // a stronger hash. These identifiers don't strictly need a cryptographic
+      // hash function, because there is negligible value in attacking the hash.
+      // We use SHA-1 because it's *shorter* -- the exact same reason that Git
+      // chose SHA-1.
+      hasher = MessageDigest.getInstance("SHA-1");
+    }
+
+    @Override
+    public void append(String s) {
+      try {
+        hasher.update(((s == null) ? "null" : s).getBytes("UTF-8"));
+      } catch (UnsupportedEncodingException e) {
+        // This can never occur. Thanks, Java.
+      }
+    }
+
+    @Override
+    public void append(int profileCreation) {
+      append(Integer.toString(profileCreation, 10));
+    }
+
+    @Override
+    public String toString() {
+      // We *could* use ASCII85… but the savings would be negated by the
+      // inclusion of JSON-unsafe characters like double-quote.
+      return new Base64(-1, null, false).encodeAsString(hasher.digest());
+    }
+  }
+
+  /**
+   * Compute the stable hash of the configured environment.
+   *
+   * @return the hash in base34, or null if there was a problem.
+   */
   public String getHash() {
     // It's never unset, so we only care about partial reads. volatile is enough.
     if (hash != null) {
       return hash;
     }
 
-    StringBuilder b = new StringBuilder();
-    b.append(profileCreation);
-    b.append(cpuCount);
-    b.append(memoryMB);
-    b.append(architecture);
-    b.append(sysName);
-    b.append(sysVersion);
-    b.append(vendor);
-    b.append(appName);
-    b.append(appID);
-    b.append(appVersion);
-    b.append(appBuildID);
-    b.append(platformVersion);
-    b.append(platformBuildID);
-    b.append(os);
-    b.append(xpcomabi);
-    b.append(updateChannel);
-    b.append(isBlocklistEnabled);
-    b.append(isTelemetryEnabled);
-    b.append(extensionCount);
-    b.append(pluginCount);
-    b.append(themeCount);
-
-    for (String addon : addons) {
-      b.append(addon);
+    EnvironmentAppender appender;
+    try {
+      appender = appenderClass.newInstance();
+    } catch (InstantiationException ex) {
+      // Should never happen, but...
+      Logger.warn(LOG_TAG,  "Could not compute hash.", ex);
+      return null;
+    } catch (IllegalAccessException ex) {
+      // Should never happen, but...
+      Logger.warn(LOG_TAG,  "Could not compute hash.", ex);
+      return null;
     }
 
-    return hash = HealthReportUtils.getEnvironmentHash(b.toString());
+    appender.append(profileCreation);
+    appender.append(cpuCount);
+    appender.append(memoryMB);
+    appender.append(architecture);
+    appender.append(sysName);
+    appender.append(sysVersion);
+    appender.append(vendor);
+    appender.append(appName);
+    appender.append(appID);
+    appender.append(appVersion);
+    appender.append(appBuildID);
+    appender.append(platformVersion);
+    appender.append(platformBuildID);
+    appender.append(os);
+    appender.append(xpcomabi);
+    appender.append(updateChannel);
+    appender.append(isBlocklistEnabled);
+    appender.append(isTelemetryEnabled);
+    appender.append(extensionCount);
+    appender.append(pluginCount);
+    appender.append(themeCount);
+
+    // We need sorted values.
+    if (addons != null) {
+      appendSortedAddons(getNonIgnoredAddons(), appender);
+    }
+
+    return hash = appender.toString();
+  }
+
+  /**
+   * Take a collection of add-on descriptors, appending a consistent string
+   * to the provided builder.
+   */
+  public static void appendSortedAddons(JSONObject addons,
+                                        final EnvironmentAppender builder) {
+    final SortedSet<String> keys = HealthReportUtils.sortedKeySet(addons);
+
+    // For each add-on, produce a consistent, sorted mapping of its descriptor.
+    for (String key : keys) {
+      try {
+        JSONObject addon = addons.getJSONObject(key);
+
+        // Now produce the output for this add-on.
+        builder.append(key);
+        builder.append("={");
+
+        for (String addonKey : HealthReportUtils.sortedKeySet(addon)) {
+          builder.append(addonKey);
+          builder.append("==");
+          try {
+            builder.append(addon.get(addonKey).toString());
+          } catch (JSONException e) {
+            builder.append("_e_");
+          }
+        }
+
+        builder.append("}");
+      } catch (Exception e) {
+        // Muffle.
+        Logger.warn(LOG_TAG, "Invalid add-on for ID " + key);
+      }
+    }
+  }
+
+  public void setJSONForAddons(byte[] json) throws Exception {
+    setJSONForAddons(new String(json, "UTF-8"));
+  }
+
+  public void setJSONForAddons(String json) throws Exception {
+    addons = new JSONObject(json);
+  }
+
+  public void setJSONForAddons(JSONObject json) {
+    addons = json;
+  }
+
+  /**
+   * Includes ignored add-ons.
+   */
+  public String getNormalizedAddonsJSON() {
+    // We trust that our input will already be normalized. If that assumption
+    // is invalidated, then we'll be sorry.
+    return (addons == null) ? "null" : addons.toString();
   }
 
   /**
diff --git a/mobile/android/base/background/healthreport/EnvironmentBuilder.java b/mobile/android/base/background/healthreport/EnvironmentBuilder.java
index 7ca3e0bb5c9..080d8b34383 100644
--- a/mobile/android/base/background/healthreport/EnvironmentBuilder.java
+++ b/mobile/android/base/background/healthreport/EnvironmentBuilder.java
@@ -4,6 +4,9 @@
 
 package org.mozilla.gecko.background.healthreport;
 
+import java.util.Iterator;
+
+import org.json.JSONObject;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.SysInfo;
 import org.mozilla.gecko.background.common.log.Logger;
@@ -39,6 +42,7 @@ public class EnvironmentBuilder {
     public boolean isBlocklistEnabled();
     public boolean isTelemetryEnabled();
     public long getProfileCreationTime();
+    public JSONObject getAddonsJSON();
   }
 
   protected static void populateEnvironment(Environment e,
@@ -69,12 +73,40 @@ public class EnvironmentBuilder {
     // GeckoPreferences as "datareporting.telemetry.enabled".
     e.isTelemetryEnabled = (info.isTelemetryEnabled() ? 1 : 0);
 
-    // TODO
     e.extensionCount = 0;
     e.pluginCount = 0;
     e.themeCount = 0;
-    // e.addons;
 
+    JSONObject addons = info.getAddonsJSON();
+    if (addons == null) {
+      return;
+    }
+
+    @SuppressWarnings("unchecked")
+    Iterator<String> it = addons.keys();
+    while (it.hasNext()) {
+      String key = it.next();
+      try {
+        JSONObject addon = addons.getJSONObject(key);
+        String type = addon.optString("type");
+        Logger.pii(LOG_TAG, "Add-on " + key + " is a " + type);
+        if ("extension".equals(type)) {
+          ++e.extensionCount;
+        } else if ("plugin".equals(type)) {
+          ++e.pluginCount;
+        } else if ("theme".equals(type)) {
+          ++e.themeCount;
+        } else if ("service".equals(type)) {
+          // Later.
+        } else {
+          Logger.debug(LOG_TAG, "Unknown add-on type: " + type);
+        }
+      } catch (Exception ex) {
+        Logger.warn(LOG_TAG, "Failed to process add-on " + key, ex);
+      }
+    }
+
+    e.addons = addons;
   }
 
   /**
@@ -102,6 +134,8 @@ public class EnvironmentBuilder {
                                                ProfileInformationProvider info) {
     Environment e = storage.getEnvironment();
     populateEnvironment(e, info);
-    return e.register();
+    e.register();
+    Logger.debug(LOG_TAG, "Registering current environment: " + e.getHash() + " = " + e.id);
+    return e.id;
   }
 }
diff --git a/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java b/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java
index 0d29bf16957..b98c3c38ba3 100644
--- a/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java
+++ b/mobile/android/base/background/healthreport/HealthReportDatabaseStorage.java
@@ -133,7 +133,10 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
 
       "architecture", "sysName", "sysVersion", "vendor", "appName", "appID",
       "appVersion", "appBuildID", "platformVersion", "platformBuildID", "os",
-      "xpcomabi", "updateChannel"
+      "xpcomabi", "updateChannel",
+
+      // Joined to the add-ons table.
+      "addonsBody"
   };
 
   public static final String[] COLUMNS_MEASUREMENT_DETAILS = new String[] {"id", "name", "version"};
@@ -141,8 +144,6 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
       new String[] {"measurement_name", "measurement_id", "measurement_version",
                     "field_name", "field_id", "field_flags"};
 
-  private static final String[] ENVIRONMENT_RECORD_COLUMNS = null;
-
   private static final String[] COLUMNS_VALUE = new String[] {"value"};
   private static final String[] COLUMNS_ID = new String[] {"id"};
 
@@ -184,7 +185,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
   protected final HealthReportSQLiteOpenHelper helper;
 
   public static class HealthReportSQLiteOpenHelper extends SQLiteOpenHelper {
-    public static final int CURRENT_VERSION = 2;
+    public static final int CURRENT_VERSION = 3;
     public static final String LOG_TAG = "HealthReportSQL";
 
     /**
@@ -240,6 +241,11 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
     public void onCreate(SQLiteDatabase db) {
       db.beginTransaction();
       try {
+        db.execSQL("CREATE TABLE addons (id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                   "                     body TEXT, " +
+                   "                     UNIQUE (body) " +
+                   ")");
+
         db.execSQL("CREATE TABLE environments (id INTEGER PRIMARY KEY AUTOINCREMENT, " +
                    "                           hash TEXT, " +
                    "                           profileCreation INTEGER, " +
@@ -263,6 +269,8 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
                    "                           os              TEXT, " +
                    "                           xpcomabi        TEXT, " +
                    "                           updateChannel   TEXT, " +
+                   "                           addonsID        INTEGER, " +
+                   "                           FOREIGN KEY (addonsID) REFERENCES addons(id) ON DELETE RESTRICT, " +
                    "                           UNIQUE (hash) " +
                    ")");
 
@@ -330,16 +338,76 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
         db.execSQL("CREATE VIEW current_measurements AS " +
                    "SELECT name, MAX(version) AS version FROM measurements GROUP BY name");
 
+        createAddonsEnvironmentsView(db);
+
         db.setTransactionSuccessful();
       } finally {
         db.endTransaction();
       }
     }
 
+    private void createAddonsEnvironmentsView(SQLiteDatabase db) {
+      db.execSQL("CREATE VIEW environments_with_addons AS " +
+          "SELECT e.id AS id, " +
+          "       e.hash AS hash, " +
+          "       e.profileCreation AS profileCreation, " +
+          "       e.cpuCount AS cpuCount, " +
+          "       e.memoryMB AS memoryMB, " +
+          "       e.isBlocklistEnabled AS isBlocklistEnabled, " +
+          "       e.isTelemetryEnabled AS isTelemetryEnabled, " +
+          "       e.extensionCount AS extensionCount, " +
+          "       e.pluginCount AS pluginCount, " +
+          "       e.themeCount AS themeCount, " +
+          "       e.architecture AS architecture, " +
+          "       e.sysName AS sysName, " +
+          "       e.sysVersion AS sysVersion, " +
+          "       e.vendor AS vendor, " +
+          "       e.appName AS appName, " +
+          "       e.appID AS appID, " +
+          "       e.appVersion AS appVersion, " +
+          "       e.appBuildID AS appBuildID, " +
+          "       e.platformVersion AS platformVersion, " +
+          "       e.platformBuildID AS platformBuildID, " +
+          "       e.os AS os, " +
+          "       e.xpcomabi AS xpcomabi, " +
+          "       e.updateChannel AS updateChannel, " +
+          "       addons.body AS addonsBody " +
+          "FROM environments AS e, addons " +
+          "WHERE e.addonsID = addons.id");
+    }
+
+    private void upgradeDatabaseFrom2To3(SQLiteDatabase db) {
+      db.execSQL("CREATE TABLE addons (id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                 "                     body TEXT, " +
+                 "                     UNIQUE (body) " +
+                 ")");
+
+      db.execSQL("ALTER TABLE environments ADD COLUMN addonsID INTEGER REFERENCES addons(id) ON DELETE RESTRICT");
+
+      createAddonsEnvironmentsView(db);
+    }
+
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+      if (oldVersion >= newVersion) {
+        return;
+      }
+
       Logger.info(LOG_TAG, "onUpgrade: from " + oldVersion + " to " + newVersion + ".");
-    }
+      try {
+        db.beginTransaction();
+        switch (oldVersion) {
+        case 2:
+          upgradeDatabaseFrom2To3(db);
+        }
+        db.setTransactionSuccessful();
+      } catch (Exception e) {
+        Logger.error(LOG_TAG, "Failure in onUpgrade.", e);
+        throw new RuntimeException(e);
+      } finally {
+        db.endTransaction();
+      }
+   }
 
     public void deleteEverything() {
       final SQLiteDatabase db = this.getWritableDatabase();
@@ -350,6 +418,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
         // Cascade will clear the rest.
         db.delete("measurements", null, null);
         db.delete("environments", null, null);
+        db.delete("addons", null, null);
         db.setTransactionSuccessful();
         Logger.info(LOG_TAG, "Deletion successful.");
       } finally {
@@ -431,7 +500,8 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
     public int register() {
       final String h = getHash();
       if (storage.envs.containsKey(h)) {
-        return storage.envs.get(h);
+        this.id = storage.envs.get(h);
+        return this.id;
       }
 
       // Otherwise, add data and hash to the DB.
@@ -461,30 +531,84 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
 
       final SQLiteDatabase db = storage.helper.getWritableDatabase();
 
+      // If we're not already, we want all of our inserts to be in a transaction.
+      boolean newTransaction = !db.inTransaction();
+
       // Insert, with a little error handling to populate the cache in case of
       // omission and consequent collision.
       //
+      // We would like to hang a trigger off a view here, and just use that for
+      // inserts. But triggers don't seem to correctly update the last inserted
+      // ID, so Android's insertOrThrow method returns -1.
+      //
+      // Instead, we go without the trigger, simply running the inserts ourselves.
+      //
       // insertWithOnConflict doesn't work as documented: <http://stackoverflow.com/questions/11328877/android-sqllite-on-conflict-ignore-is-ignored-in-ics/11424150>.
       // So we do this the hard way.
       // We presume that almost every get will hit the cache (except for the first, obviously), so we
-      // bias here towards inserts.
+      // bias here towards inserts for the environments.
+      // For add-ons we assume that different environments will share add-ons, so we query first.
+
+      final String addonsJSON = getNormalizedAddonsJSON();
+      if (newTransaction) {
+        db.beginTransaction();
+      }
+
       try {
-        this.id = (int) db.insertOrThrow("environments", null, v);
-        storage.envs.put(h, this.id);
-        return this.id;
-      } catch (SQLException e) {
-        // The inserter should take care of updating `envs`. But if it doesn't...
-        Cursor c = db.query("environments", COLUMNS_ID, "hash = ?", new String[] {hash}, null, null, null);
+        int addonsID = ensureAddons(db, addonsJSON);
+        v.put("addonsID", addonsID);
+
         try {
-          if (!c.moveToFirst()) {
-            throw e;
+          int inserted = (int) db.insertOrThrow("environments", null, v);
+          Logger.debug(LOG_TAG, "Inserted ID: " + inserted + " for hash " + h);
+          if (inserted == -1) {
+            throw new SQLException("Insert returned -1!");
+          }
+          this.id = inserted;
+          storage.envs.put(h, this.id);
+          if (newTransaction) {
+            db.setTransactionSuccessful();
+          }
+          return inserted;
+        } catch (SQLException e) {
+          // The inserter should take care of updating `envs`. But if it
+          // doesn't...
+          Cursor c = db.query("environments", COLUMNS_ID, "hash = ?",
+                              new String[] { h }, null, null, null);
+          try {
+            if (!c.moveToFirst()) {
+              throw e;
+            }
+            this.id = (int) c.getLong(0);
+            Logger.debug(LOG_TAG, "Found " + this.id + " for hash " + h);
+            storage.envs.put(h, this.id);
+            if (newTransaction) {
+              db.setTransactionSuccessful();
+            }
+            return this.id;
+          } finally {
+            c.close();
           }
-          this.id = (int) c.getLong(0);
-          storage.envs.put(hash, this.id);
-          return this.id;
-        } finally {
-          c.close();
         }
+      } finally {
+        if (newTransaction) {
+          db.endTransaction();
+        }
+      }
+    }
+
+    protected static int ensureAddons(SQLiteDatabase db, String json) {
+      Cursor c = db.query("addons", COLUMNS_ID, "body = ?",
+                          new String[] { (json == null) ? "null" : json }, null, null, null);
+      try {
+        if (c.moveToFirst()) {
+          return c.getInt(0);
+        }
+        ContentValues values = new ContentValues();
+        values.put("body", json);
+        return (int) db.insert("addons", null, values);
+      } finally {
+        c.close();
       }
     }
 
@@ -513,6 +637,12 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
       xpcomabi        = v.getAsString("xpcomabi");
       updateChannel   = v.getAsString("updateChannel");
 
+      try {
+        setJSONForAddons(v.getAsString("addonsBody"));
+      } catch (Exception e) {
+        // Nothing we can do.
+      }
+
       this.hash = null;
       this.id = -1;
     }
@@ -552,9 +682,20 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
       xpcomabi        = cursor.getString(i++);
       updateChannel   = cursor.getString(i++);
 
+      try {
+        setJSONForAddons(cursor.getBlob(i++));
+      } catch (Exception e) {
+        // Nothing we can do.
+      }
+
       return cursor.moveToNext();
     }
 
+    public DatabaseEnvironment(HealthReportDatabaseStorage storage, Class<? extends EnvironmentAppender> appender) {
+      super(appender);
+      this.storage = storage;
+    }
+
     public DatabaseEnvironment(HealthReportDatabaseStorage storage) {
       this.storage = storage;
     }
@@ -572,7 +713,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
   @Override
   public SparseArray<Environment> getEnvironmentRecordsByID() {
     final SQLiteDatabase db = this.helper.getReadableDatabase();
-    Cursor c = db.query("environments", COLUMNS_ENVIRONMENT_DETAILS, null, null, null, null, null);
+    Cursor c = db.query("environments_with_addons", COLUMNS_ENVIRONMENT_DETAILS, null, null, null, null, null);
     try {
       SparseArray<Environment> results = new SparseArray<Environment>();
       if (!c.moveToFirst()) {
@@ -603,7 +744,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
   @Override
   public Cursor getEnvironmentRecordForID(int id) {
     final SQLiteDatabase db = this.helper.getReadableDatabase();
-    return db.query("environments", ENVIRONMENT_RECORD_COLUMNS, "id = " + id, null, null, null, null);
+    return db.query("environments_with_addons", COLUMNS_ENVIRONMENT_DETAILS, "id = " + id, null, null, null, null);
   }
 
   @Override
@@ -618,6 +759,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
 
       while (!c.isAfterLast()) {
         results.put(c.getInt(0), c.getString(1));
+        c.moveToNext();
       }
       return results;
     } finally {
@@ -784,7 +926,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
     for (FieldSpec field : fields.getFields()) {
       v.put("name", field.name);
       v.put("flags", field.type);
-      Logger.info(LOG_TAG, "M: " + measurementID + " F: " + field.name + " (" + field.type + ")");
+      Logger.debug(LOG_TAG, "M: " + measurementID + " F: " + field.name + " (" + field.type + ")");
       db.insert("fields", null, v);
     }
 
@@ -856,6 +998,11 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
   }
 
   private void recordDailyLast(int env, int day, int field, Object value, String table) {
+    if (env == -1) {
+      Logger.warn(LOG_TAG, "Refusing to record with environment = -1.");
+      return;
+    }
+
     final SQLiteDatabase db = this.helper.getWritableDatabase();
 
     final String envString = Integer.toString(env);
@@ -890,6 +1037,11 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
   }
 
   private void recordDailyDiscrete(int env, int day, int field, Object value, String table) {
+    if (env == -1) {
+      Logger.warn(LOG_TAG, "Refusing to record with environment = -1.");
+      return;
+    }
+
     final ContentValues v = new ContentValues();
     v.put("env", env);
     v.put("field", field);
@@ -925,6 +1077,11 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
    */
   @Override
   public void incrementDailyCount(int env, int day, int field, int by) {
+    if (env == -1) {
+      Logger.warn(LOG_TAG, "Refusing to record with environment = -1.");
+      return;
+    }
+
     final SQLiteDatabase db = this.helper.getWritableDatabase();
     final String envString = Integer.toString(env);
     final String fieldIDString = Integer.toString(field, 10);
diff --git a/mobile/android/base/background/healthreport/HealthReportGenerator.java b/mobile/android/base/background/healthreport/HealthReportGenerator.java
index 0c05e1f8bac..d17b8859186 100644
--- a/mobile/android/base/background/healthreport/HealthReportGenerator.java
+++ b/mobile/android/base/background/healthreport/HealthReportGenerator.java
@@ -4,6 +4,10 @@
 
 package org.mozilla.gecko.background.healthreport;
 
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.gecko.background.common.log.Logger;
@@ -33,7 +37,8 @@ public class HealthReportGenerator {
    * @throws JSONException if there was an error adding environment data to the resulting document.
    */
   public JSONObject generateDocument(long since, long lastPingTime, String profilePath) throws JSONException {
-    Logger.info(LOG_TAG, "Generating FHR document from " + since + "; last ping " + lastPingTime + ", for profile " + profilePath);
+    Logger.info(LOG_TAG, "Generating FHR document from " + since + "; last ping " + lastPingTime);
+    Logger.pii(LOG_TAG, "Generating for profile " + profilePath);
     ProfileInformationCache cache = new ProfileInformationCache(profilePath);
     if (!cache.restoreUnlessInitialized()) {
       Logger.warn(LOG_TAG, "Not enough profile information to compute current environment.");
@@ -57,7 +62,13 @@ public class HealthReportGenerator {
    * @throws JSONException if there was an error adding environment data to the resulting document.
    */
   public JSONObject generateDocument(long since, long lastPingTime, Environment currentEnvironment) throws JSONException {
-    Logger.debug(LOG_TAG, "Current environment hash: " + currentEnvironment.getHash());
+    final String currentHash = currentEnvironment.getHash();
+
+    Logger.debug(LOG_TAG, "Current environment hash: " + currentHash);
+    if (currentHash == null) {
+      Logger.warn(LOG_TAG, "Current hash is null; aborting.");
+      return null;
+    }
 
     // We want to map field IDs to some strings as we go.
     SparseArray<Environment> envs = storage.getEnvironmentRecordsByID();
@@ -92,6 +103,12 @@ public class HealthReportGenerator {
   }
 
   protected JSONObject getDaysJSON(Environment currentEnvironment, SparseArray<Environment> envs, SparseArray<Field> fields, long since) throws JSONException {
+    if (Logger.shouldLogVerbose(LOG_TAG)) {
+      for (int i = 0; i < envs.size(); ++i) {
+        Logger.trace(LOG_TAG, "Days environment " + envs.keyAt(i) + ": " + envs.get(envs.keyAt(i)).getHash());
+      }
+    }
+
     JSONObject days = new JSONObject();
     Cursor cursor = storage.getRawEventsSince(since);
     try {
@@ -112,10 +129,19 @@ public class HealthReportGenerator {
       JSONObject envObject = null;
 
       while (!cursor.isAfterLast()) {
+        int cEnv = cursor.getInt(1);
+        if (cEnv == -1 ||
+            (cEnv != lastEnv &&
+             envs.indexOfKey(cEnv) < 0)) {
+          Logger.warn(LOG_TAG, "Invalid environment " + cEnv + " in cursor. Skipping.");
+          cursor.moveToNext();
+          continue;
+        }
+
         int cDate  = cursor.getInt(0);
-        int cEnv   = cursor.getInt(1);
         int cField = cursor.getInt(2);
 
+        Logger.trace(LOG_TAG, "Event row: " + cDate + ", " + cEnv + ", " + cField);
         boolean dateChanged = cDate != lastDate;
         boolean envChanged = cEnv != lastEnv;
 
@@ -129,7 +155,8 @@ public class HealthReportGenerator {
 
         if (dateChanged || envChanged) {
           envObject = new JSONObject();
-          dateObject.put(envs.get(cEnv).hash, envObject);
+          // This is safe because we checked above that cEnv is valid.
+          dateObject.put(envs.get(cEnv).getHash(), envObject);
           lastEnv = cEnv;
         }
 
@@ -171,8 +198,8 @@ public class HealthReportGenerator {
     return days;
   }
 
-  protected JSONObject getEnvironmentsJSON(Environment currentEnvironment,
-                                           SparseArray<Environment> envs) throws JSONException {
+  public static JSONObject getEnvironmentsJSON(Environment currentEnvironment,
+                                               SparseArray<Environment> envs) throws JSONException {
     JSONObject environments = new JSONObject();
 
     // Always do this, even if it hasn't recorded anything in the DB.
@@ -189,7 +216,7 @@ public class HealthReportGenerator {
     return environments;
   }
 
-  private JSONObject jsonify(Environment e, Environment current) throws JSONException {
+  public static JSONObject jsonify(Environment e, Environment current) throws JSONException {
     JSONObject age = getProfileAge(e, current);
     JSONObject sysinfo = getSysInfo(e, current);
     JSONObject gecko = getGeckoInfo(e, current);
@@ -218,7 +245,7 @@ public class HealthReportGenerator {
     return out;
   }
 
-  private JSONObject getProfileAge(Environment e, Environment current) throws JSONException {
+  private static JSONObject getProfileAge(Environment e, Environment current) throws JSONException {
     JSONObject age = new JSONObject();
     int changes = 0;
     if (current == null || current.profileCreation != e.profileCreation) {
@@ -232,7 +259,7 @@ public class HealthReportGenerator {
     return age;
   }
 
-  private JSONObject getSysInfo(Environment e, Environment current) throws JSONException {
+  private static JSONObject getSysInfo(Environment e, Environment current) throws JSONException {
     JSONObject sysinfo = new JSONObject();
     int changes = 0;
     if (current == null || current.cpuCount != e.cpuCount) {
@@ -262,7 +289,7 @@ public class HealthReportGenerator {
     return sysinfo;
   }
 
-  private JSONObject getGeckoInfo(Environment e, Environment current) throws JSONException {
+  private static JSONObject getGeckoInfo(Environment e, Environment current) throws JSONException {
     JSONObject gecko = new JSONObject();
     int changes = 0;
     if (current == null || !current.vendor.equals(e.vendor)) {
@@ -312,7 +339,7 @@ public class HealthReportGenerator {
     return gecko;
   }
 
-  private JSONObject getAppInfo(Environment e, Environment current) throws JSONException {
+  private static JSONObject getAppInfo(Environment e, Environment current) throws JSONException {
     JSONObject appinfo = new JSONObject();
     int changes = 0;
     if (current == null || current.isBlocklistEnabled != e.isBlocklistEnabled) {
@@ -330,7 +357,7 @@ public class HealthReportGenerator {
     return appinfo;
   }
 
-  private JSONObject getAddonCounts(Environment e, Environment current) throws JSONException {
+  private static JSONObject getAddonCounts(Environment e, Environment current) throws JSONException {
     JSONObject counts = new JSONObject();
     int changes = 0;
     if (current == null || current.extensionCount != e.extensionCount) {
@@ -352,13 +379,115 @@ public class HealthReportGenerator {
     return counts;
   }
 
-  private JSONObject getActiveAddons(Environment e, Environment current) throws JSONException {
-    JSONObject active = new JSONObject();
-    int changes = 0;
-    if (current != null && changes == 0) {
+  /**
+   * Compute the *tree* difference set between the two objects. If the two
+   * objects are identical, returns null.
+   *
+   * @param from
+   *          a JSONObject.
+   * @param to
+   *          a JSONObject.
+   * @param includeNull
+   *          if true, keys present in <code>from</code> but not in
+   *          <code>to</code> are included as {@link JSONObject#NULL} in the
+   *          output.
+   *
+   * @return a JSONObject, or null if the two objects are identical.
+   * @throws JSONException
+   *           should not occur, but...
+   */
+  public static JSONObject diff(JSONObject from,
+                                JSONObject to,
+                                boolean includeNull) throws JSONException {
+    if (from == null || from == JSONObject.NULL) {
+      return to;
+    }
+
+    JSONObject out = new JSONObject();
+
+    HashSet<String> toKeys = includeNull ? new HashSet<String>(to.length())
+                                         : null;
+
+    @SuppressWarnings("unchecked")
+    Iterator<String> it = to.keys();
+    while (it.hasNext()) {
+      String key = it.next();
+
+      // Track these as we go if we'll need them later.
+      if (includeNull) {
+        toKeys.add(key);
+      }
+
+      Object value = to.get(key);
+      if (!from.has(key)) {
+        // It must be new.
+        out.put(key, value);
+        continue;
+      }
+
+      // Not new? Then see if it changed.
+      Object old = from.get(key);
+
+      // Two JSONObjects should be diffed.
+      if (old instanceof JSONObject && value instanceof JSONObject) {
+        JSONObject innerDiff = diff(((JSONObject) old), ((JSONObject) value),
+                                    includeNull);
+        // No change? No output.
+        if (innerDiff == null) {
+          continue;
+        }
+
+        // Otherwise include the diff.
+        out.put(key, innerDiff);
+        continue;
+      }
+
+      // A regular value, or a type change. Only skip if they're the same.
+      if (value.equals(old)) {
+        continue;
+      }
+      out.put(key, value);
+    }
+
+    // Now -- if requested -- include any removed keys.
+    if (includeNull) {
+      Set<String> fromKeys = HealthReportUtils.keySet(from);
+      fromKeys.removeAll(toKeys);
+      for (String notPresent : fromKeys) {
+        out.put(notPresent, JSONObject.NULL);
+      }
+    }
+
+    if (out.length() == 0) {
       return null;
     }
-    active.put("_v", 1);
-    return active;
+    return out;
+  }
+
+  private static JSONObject getActiveAddons(Environment e, Environment current) throws JSONException {
+    // Just return the current add-on set, with a version annotation.
+    // To do so requires copying.
+    if (current == null) {
+      JSONObject out = e.getNonIgnoredAddons();
+      if (out == null) {
+        Logger.warn(LOG_TAG, "Null add-ons to return in FHR document. Returning {}.");
+        out = new JSONObject();        // So that we always return something.
+      }
+      out.put("_v", 1);
+      return out;
+    }
+
+    // Otherwise, return the diff.
+    JSONObject diff = diff(current.getNonIgnoredAddons(), e.getNonIgnoredAddons(), true);
+    if (diff == null) {
+      return null;
+    }
+    if (diff == e.addons) {
+      // Again, needs to copy.
+      return getActiveAddons(e, null);
+    }
+
+    diff.put("_v", 1);
+    return diff;
   }
 }
diff --git a/mobile/android/base/background/healthreport/HealthReportUtils.java b/mobile/android/base/background/healthreport/HealthReportUtils.java
index 1510af77b5b..928186945e7 100644
--- a/mobile/android/base/background/healthreport/HealthReportUtils.java
+++ b/mobile/android/base/background/healthreport/HealthReportUtils.java
@@ -90,31 +90,6 @@ public class HealthReportUtils {
     return intoKeySet(new HashSet<String>(), o);
   }
 
-  /**
-   * {@link JSONObject} doesn't provide a <code>clone</code> method, nor any
-   * useful constructors, so we do this the hard way.
-   *
-   * @return a new object containing the same keys and values as the old.
-   * @throws JSONException
-   *           if JSONObject is even more stupid than expected and cannot store
-   *           a value from the provided object in the new object. This should
-   *           never happen.
-   */
-  public static JSONObject shallowCopyObject(JSONObject o) throws JSONException {
-    if (o == null) {
-      return null;
-    }
-
-    JSONObject out = new JSONObject();
-    @SuppressWarnings("unchecked")
-    Iterator<String> keys = out.keys();
-    while (keys.hasNext()) {
-      final String key = keys.next();
-      out.put(key, o.get(key));
-    }
-    return out;
-  }
-
   /**
    * Just like {@link JSONObject#accumulate(String, Object)}, but doesn't do the wrong thing for single values.
    * @throws JSONException 
diff --git a/mobile/android/base/background/healthreport/ProfileInformationCache.java b/mobile/android/base/background/healthreport/ProfileInformationCache.java
index 430dcf50f05..1ac5cb039cb 100644
--- a/mobile/android/base/background/healthreport/ProfileInformationCache.java
+++ b/mobile/android/base/background/healthreport/ProfileInformationCache.java
@@ -22,8 +22,6 @@ import org.mozilla.gecko.background.healthreport.EnvironmentBuilder.ProfileInfor
  * without a running Gecko -- add-ons, for example. In order to make this
  * information available without launching Gecko, we persist it on Fennec
  * startup. This class is the notepad in which we write.
- *
- * TODO: add-ons.
  */
 public class ProfileInformationCache implements ProfileInformationProvider {
   private static final String LOG_TAG = "GeckoProfileInfo";
@@ -38,15 +36,16 @@ public class ProfileInformationCache implements ProfileInformationProvider {
   private volatile boolean telemetryEnabled = false;
   private volatile long profileCreationTime = 0;
 
+  private volatile JSONObject addons = null;
+
   public ProfileInformationCache(String profilePath) {
     file = new File(profilePath + File.separator + CACHE_FILE);
-    Logger.info(LOG_TAG, "Using " + file.getAbsolutePath() + " for profile information cache.");
+    Logger.pii(LOG_TAG, "Using " + file.getAbsolutePath() + " for profile information cache.");
   }
 
   public synchronized void beginInitialization() {
     initialized = false;
     needsWrite = true;
-    profileCreationTime = 0;
   }
 
   public JSONObject toJSON() {
@@ -55,6 +54,7 @@ public class ProfileInformationCache implements ProfileInformationProvider {
       object.put("blocklist", blocklistEnabled);
       object.put("telemetry", telemetryEnabled);
       object.put("profileCreated", profileCreationTime);
+      object.put("addons", addons);
     } catch (JSONException e) {
       // There isn't much we can do about this.
       // Let's just quietly muffle.
@@ -67,6 +67,7 @@ public class ProfileInformationCache implements ProfileInformationProvider {
     blocklistEnabled = object.getBoolean("blocklist");
     telemetryEnabled = object.getBoolean("telemetry");
     profileCreationTime = object.getLong("profileCreated");
+    addons = object.optJSONObject("addons");
   }
 
   /**
@@ -85,7 +86,8 @@ public class ProfileInformationCache implements ProfileInformationProvider {
       throw new IOException("Couldn't serialize JSON.");
     }
 
-    Logger.info(LOG_TAG, "Writing profile information to " + file.getAbsolutePath());
+    Logger.debug(LOG_TAG, "Writing profile information.");
+    Logger.pii(LOG_TAG, "Writing to file: " + file.getAbsolutePath());
     FileOutputStream stream = new FileOutputStream(file);
     OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
     try {
@@ -113,13 +115,16 @@ public class ProfileInformationCache implements ProfileInformationProvider {
     }
 
     // One-liner for file reading in Java. So sorry.
-    Logger.info(LOG_TAG, "Restoring ProfileInformationCache from " + file.getAbsolutePath());
+    Logger.info(LOG_TAG, "Restoring ProfileInformationCache from file.");
+    Logger.pii(LOG_TAG, "Restoring from file: " + file.getAbsolutePath());
+
     Scanner scanner = null;
     try {
       scanner = new Scanner(file, "UTF-8");
       final String contents = scanner.useDelimiter("\\A").next();
       fromJSON(new JSONObject(contents));
       initialized = true;
+      needsWrite = false;
       return true;
     } catch (FileNotFoundException e) {
       return false;
@@ -173,4 +178,41 @@ public class ProfileInformationCache implements ProfileInformationProvider {
     profileCreationTime = value;
     needsWrite = true;
   }
+
+  @Override
+  public JSONObject getAddonsJSON() {
+    return addons;
+  }
+
+  public void updateJSONForAddon(String id, String json) throws Exception {
+    addons.put(id, new JSONObject(json));
+  }
+
+  /**
+   * Will throw if you haven't done a full update at least once.
+   */
+  public void updateJSONForAddon(String id, JSONObject json) {
+    if (addons == null) {
+      throw new IllegalStateException("Cannot incrementally update add-ons without first initializing.");
+    }
+    try {
+      addons.put(id, json);
+    } catch (Exception e) {
+      // Why would this happen?
+      Logger.warn(LOG_TAG, "Unexpected failure updating JSON for add-on.", e);
+    }
+  }
+
+  /**
+   * Update the cached set of add-ons. Throws on invalid input.
+   *
+   * @param json a valid add-ons JSON string.
+   */
+  public void setJSONForAddons(String json) throws Exception {
+    addons = new JSONObject(json);
+  }
+
+  public void setJSONForAddons(JSONObject json) {
+    addons = json;
+  }
 }

From 652c32c9972a404e5fae6b8824ba46e686095bff Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 30 May 2013 17:42:56 -0700
Subject: [PATCH 45/85] Bug 875400 - Part 2: provide add-ons and pref changes
 to FHR. r=mfinkle * * * Bug 875400 - Part 2a: review comments. * * * Bug
 875400 - Part 2b: add flag to ignore add-ons.

---
 mobile/android/base/GeckoApp.java             |   2 +-
 .../base/health/BrowserHealthRecorder.java    | 208 ++++++++++++------
 mobile/android/chrome/content/browser.js      | 153 +++++++++++++
 3 files changed, 294 insertions(+), 69 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 37994e25f43..e4523ed781e 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1860,7 +1860,7 @@ abstract public class GeckoApp
 
         Tabs.unregisterOnTabsChangedListener(this);
         if (mHealthRecorder != null) {
-            mHealthRecorder.close(GeckoAppShell.getEventDispatcher());
+            mHealthRecorder.close();
             mHealthRecorder = null;
         }
     }
diff --git a/mobile/android/base/health/BrowserHealthRecorder.java b/mobile/android/base/health/BrowserHealthRecorder.java
index 7ca701efc79..2a7f9e33f69 100644
--- a/mobile/android/base/health/BrowserHealthRecorder.java
+++ b/mobile/android/base/health/BrowserHealthRecorder.java
@@ -12,6 +12,8 @@ import android.content.ContentProviderClient;
 import android.util.Log;
 
 import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.PrefsHelper;
 import org.mozilla.gecko.PrefsHelper.PrefHandler;
 
@@ -54,6 +56,9 @@ import java.util.Scanner;
 public class BrowserHealthRecorder implements GeckoEventListener {
     private static final String LOG_TAG = "GeckoHealthRec";
     private static final String PREF_BLOCKLIST_ENABLED = "extensions.blocklist.enabled";
+    private static final String EVENT_ADDONS_ALL = "Addons:All";
+    private static final String EVENT_ADDONS_CHANGE = "Addons:Change";
+    private static final String EVENT_PREF_CHANGE = "Pref:Change";
 
     public enum State {
         NOT_INITIALIZED,
@@ -69,6 +74,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
     private volatile HealthReportDatabaseStorage storage;
     private final ProfileInformationCache profileCache;
     private ContentProviderClient client;
+    private final EventDispatcher dispatcher;
 
     /**
      * Persist the opaque identifier for the current Firefox Health Report environment.
@@ -83,6 +89,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
      */
     public BrowserHealthRecorder(final Context context, final String profilePath, final EventDispatcher dispatcher) {
         Log.d(LOG_TAG, "Initializing. Dispatcher is " + dispatcher);
+        this.dispatcher = dispatcher;
         this.client = EnvironmentBuilder.getContentProviderClient(context);
         if (this.client == null) {
             throw new IllegalStateException("Could not fetch Health Report content provider.");
@@ -95,7 +102,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
 
         this.profileCache = new ProfileInformationCache(profilePath);
         try {
-            this.initialize(context, profilePath, dispatcher);
+            this.initialize(context, profilePath);
         } catch (Exception e) {
             Log.e(LOG_TAG, "Exception initializing.", e);
         }
@@ -107,7 +114,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
      * Shut down database connections, unregister event listeners, and perform
      * provider-specific uninitialization.
      */
-    public synchronized void close(final EventDispatcher dispatcher) {
+    public synchronized void close() {
         switch (this.state) {
             case CLOSED:
                 Log.w(LOG_TAG, "Ignoring attempt to double-close closed BrowserHealthRecorder.");
@@ -120,7 +127,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         }
 
         this.state = State.CLOSED;
-        this.unregisterEventListeners(dispatcher);
+        this.unregisterEventListeners();
 
         // Add any necessary provider uninitialization here.
         this.storage = null;
@@ -130,7 +137,10 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         }
     }
 
-    private void unregisterEventListeners(EventDispatcher dispatcher) {
+    private void unregisterEventListeners() {
+        this.dispatcher.unregisterEventListener(EVENT_ADDONS_ALL, this);
+        this.dispatcher.unregisterEventListener(EVENT_ADDONS_CHANGE, this);
+        this.dispatcher.unregisterEventListener(EVENT_PREF_CHANGE, this);
     }
 
     public void onBlocklistPrefChanged(boolean to) {
@@ -143,6 +153,15 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         this.profileCache.setTelemetryEnabled(to);
     }
 
+    public void onAddonChanged(String id, JSONObject json) {
+        this.profileCache.beginInitialization();
+        try {
+            this.profileCache.updateJSONForAddon(id, json);
+        } catch (IllegalStateException e) {
+            Log.w(LOG_TAG, "Attempted to update add-on cache prior to full init.", e);
+        }
+    }
+
     /**
      * Call this when a material change has occurred in the running environment,
      * such that a new environment should be computed and prepared for use in
@@ -162,6 +181,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
             this.state = State.INITIALIZATION_FAILED;
             return;
         }
+        ensureEnvironment();
     }
 
     protected synchronized int ensureEnvironment() {
@@ -247,7 +267,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         // Let's look in the profile.
         long time = getProfileInitTimeFromFile(profilePath);
         if (time > 0) {
-            Log.i(LOG_TAG, "Incorporating environment: times.json profile creation = " + time);
+            Log.d(LOG_TAG, "Incorporating environment: times.json profile creation = " + time);
             return time;
         }
 
@@ -270,23 +290,95 @@ public class BrowserHealthRecorder implements GeckoEventListener {
             }
         }
 
-        Log.i(LOG_TAG, "Incorporating environment: profile creation = " + time);
+        Log.d(LOG_TAG, "Incorporating environment: profile creation = " + time);
         return time;
     }
 
+    private void handlePrefValue(final String pref, final boolean value) {
+        Log.d(LOG_TAG, "Incorporating environment: " + pref + " = " + value);
+        if (AppConstants.TELEMETRY_PREF_NAME.equals(pref)) {
+            profileCache.setTelemetryEnabled(value);
+            return;
+        }
+        if (PREF_BLOCKLIST_ENABLED.equals(pref)) {
+            profileCache.setBlocklistEnabled(value);
+            return;
+        }
+        Log.w(LOG_TAG, "Unexpected pref: " + pref);
+    }
+
+    /**
+     * Background init helper.
+     */
+    private void initializeStorage() {
+        Log.d(LOG_TAG, "Done initializing profile cache. Beginning storage init.");
+
+        final BrowserHealthRecorder self = this;
+        ThreadUtils.postToBackgroundThread(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (self) {
+                    if (state != State.INITIALIZING) {
+                        Log.w(LOG_TAG, "Unexpected state during init: " + state);
+                        return;
+                    }
+
+                    // Belt and braces.
+                    if (storage == null) {
+                        Log.w(LOG_TAG, "Storage is null during init; shutting down?");
+                        return;
+                    }
+
+                    try {
+                        storage.beginInitialization();
+                    } catch (Exception e) {
+                        Log.e(LOG_TAG, "Failed to init storage.", e);
+                        state = State.INITIALIZATION_FAILED;
+                        return;
+                    }
+
+                    try {
+                        // Listen for add-ons and prefs changes.
+                        dispatcher.registerEventListener(EVENT_ADDONS_CHANGE, self);
+                        dispatcher.registerEventListener(EVENT_PREF_CHANGE, self);
+
+                        // Initialize each provider here.
+
+                        Log.d(LOG_TAG, "Ensuring environment.");
+                        ensureEnvironment();
+
+                        Log.d(LOG_TAG, "Finishing init.");
+                        storage.finishInitialization();
+                        state = State.INITIALIZED;
+                    } catch (Exception e) {
+                        state = State.INITIALIZATION_FAILED;
+                        storage.abortInitialization();
+                        Log.e(LOG_TAG, "Initialization failed.", e);
+                    }
+                }
+            }
+        });
+    }
 
     /**
      * Add provider-specific initialization in this method.
      */
     private synchronized void initialize(final Context context,
-                                         final String profilePath,
-                                         final EventDispatcher dispatcher)
+                                         final String profilePath)
         throws java.io.IOException {
 
         Log.d(LOG_TAG, "Initializing profile cache.");
         this.state = State.INITIALIZING;
-        this.profileCache.beginInitialization();
 
+        // If we can restore state from last time, great.
+        if (this.profileCache.restoreUnlessInitialized()) {
+            Log.i(LOG_TAG, "Successfully restored state. Initializing storage.");
+            initializeStorage();
+            return;
+        }
+
+        // Otherwise, let's initialize it from scratch.
+        this.profileCache.beginInitialization();
         this.profileCache.setProfileCreationTime(getAndPersistProfileInitTime(context, profilePath));
 
         final BrowserHealthRecorder self = this;
@@ -294,69 +386,15 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         PrefHandler handler = new PrefsHelper.PrefHandlerBase() {
             @Override
             public void prefValue(String pref, boolean value) {
-                Log.i(LOG_TAG, "Incorporating environment: " + pref + " = " + value);
-                if (AppConstants.TELEMETRY_PREF_NAME.equals(pref)) {
-                    profileCache.setTelemetryEnabled(value);
-                    return;
-                }
-                if (PREF_BLOCKLIST_ENABLED.equals(pref)) {
-                    profileCache.setBlocklistEnabled(value);
-                    return;
-                }
-                Log.w(LOG_TAG, "Unexpected pref: " + pref);
+                handlePrefValue(pref, value);
             }
 
             @Override
             public void finish() {
-                try {
-                    profileCache.completeInitialization();
-                } catch (java.io.IOException e) {
-                    Log.e(LOG_TAG, "Error completing profile cache initialization.", e);
-                    return;
-                }
-
-                Log.d(LOG_TAG, "Done initializing profile cache. Beginning storage init.");
-
-                ThreadUtils.postToBackgroundThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        synchronized (self) {
-                            if (state != State.INITIALIZING) {
-                                Log.w(LOG_TAG, "Unexpected state during init: " + state);
-                                return;
-                            }
-
-                            // Belt and braces.
-                            if (storage == null) {
-                                Log.w(LOG_TAG, "Storage is null during init; shutting down?");
-                                return;
-                            }
-
-                            try {
-                                storage.beginInitialization();
-                            } catch (Exception e) {
-                                Log.e(LOG_TAG, "Failed to init storage.", e);
-                                state = State.INITIALIZATION_FAILED;
-                                return;
-                            }
-
-                            try {
-                                // Initialize each provider here.
-
-                                Log.d(LOG_TAG, "Ensuring environment.");
-                                ensureEnvironment();
-
-                                Log.d(LOG_TAG, "Finishing init.");
-                                storage.finishInitialization();
-                                state = State.INITIALIZED;
-                            } catch (Exception e) {
-                                state = State.INITIALIZATION_FAILED;
-                                storage.abortInitialization();
-                                Log.e(LOG_TAG, "Initialization failed.", e);
-                            }
-                        }
-                    }
-                });
+                Log.d(LOG_TAG, "Requesting all add-ons from Gecko.");
+                dispatcher.registerEventListener(EVENT_ADDONS_ALL, self);
+                GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Addons:FetchAll", null));
+                // Wait for the broadcast event which completes our initialization.
             }
         };
 
@@ -372,6 +410,40 @@ public class BrowserHealthRecorder implements GeckoEventListener {
     @Override
     public void handleMessage(String event, JSONObject message) {
         try {
+            if (EVENT_ADDONS_ALL.equals(event)) {
+                Log.d(LOG_TAG, "Got all add-ons.");
+                try {
+                    JSONObject addons = message.getJSONObject("json");
+                    Log.d(LOG_TAG, "Persisting " + addons.length() + " add-ons.");
+                    profileCache.setJSONForAddons(addons);
+                    profileCache.completeInitialization();
+                } catch (java.io.IOException e) {
+                    Log.e(LOG_TAG, "Error completing profile cache initialization.", e);
+                    state = State.INITIALIZATION_FAILED;
+                    return;
+                }
+
+                if (state == State.INITIALIZING) {
+                    initializeStorage();
+                } else {
+                    this.onEnvironmentChanged();
+                }
+
+                return;
+            }
+            if (EVENT_ADDONS_CHANGE.equals(event)) {
+                Log.d(LOG_TAG, "Add-on changed: " + message.getString("id"));
+                this.onAddonChanged(message.getString("id"), message.getJSONObject("json"));
+                this.onEnvironmentChanged();
+                return;
+            }
+            if (EVENT_PREF_CHANGE.equals(event)) {
+                final String pref = message.getString("pref");
+                Log.d(LOG_TAG, "Pref changed: " + pref);
+                handlePrefValue(pref, message.getBoolean("value"));
+                this.onEnvironmentChanged();
+                return;
+            }
         } catch (Exception e) {
             Log.e(LOG_TAG, "Exception handling message \"" + event + "\":", e);
         }
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 87aacc51b5c..54452db59d4 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -330,6 +330,7 @@ var BrowserApp = {
     Downloads.init();
     FormAssistant.init();
     IndexedDB.init();
+    HealthReportStatusListener.init();
     XPInstallObserver.init();
     ClipboardHelper.init();
     CharacterEncoding.init();
@@ -616,6 +617,7 @@ var BrowserApp = {
     IndexedDB.uninit();
     ViewportHandler.uninit();
     XPInstallObserver.uninit();
+    HealthReportStatusListener.uninit();
     CharacterEncoding.uninit();
     SearchEngines.uninit();
     WebappsUI.uninit();
@@ -5095,6 +5097,157 @@ var FormAssistant = {
   }
 };
 
+/**
+ * An object to watch for Gecko status changes -- add-on installs, pref changes
+ * -- and reflect them back to Java.
+ */
+let HealthReportStatusListener = {
+  TELEMETRY_PREF: 
+#ifdef MOZ_TELEMETRY_REPORTING
+    // Telemetry pref differs based on build.
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+    "toolkit.telemetry.enabledPreRelease",
+#else
+    "toolkit.telemetry.enabled",
+#endif
+#else
+    null,
+#endif
+
+  init: function () {
+    try {
+      AddonManager.addAddonListener(this);
+    } catch (ex) {
+      console.log("Failed to initialize add-on status listener. FHR cannot report add-on state. " + ex);
+    }
+
+    Services.obs.addObserver(this, "Addons:FetchAll", false);
+    Services.prefs.addObserver("extensions.blocklist.enabled", this, false);
+    if (this.TELEMETRY_PREF) {
+      Services.prefs.addObserver(this.TELEMETRY_PREF, this, false);
+    }
+  },
+
+  uninit: function () {
+    Services.obs.removeObserver(this, "Addons:FetchAll");
+    Services.prefs.removeObserver("extensions.blocklist.enabled", this);
+    if (this.TELEMETRY_PREF) {
+      Services.prefs.removeObserver(this.TELEMETRY_PREF, this);
+    }
+
+    AddonManager.removeAddonListener(this);
+  },
+
+  observe: function (aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case "Addons:FetchAll":
+        HealthReportStatusListener.sendAllAddonsToJava();
+        break;
+      case "nsPref:changed":
+        sendMessageToJava({ type: "Pref:Change", pref: aData, value: Services.prefs.getBoolPref(aData) });
+        break
+    }
+  },
+
+  MILLISECONDS_PER_DAY: 24 * 60 * 60 * 1000,
+
+  COPY_FIELDS: [
+    "userDisabled",
+    "appDisabled",
+    "version",
+    "type",
+    "scope",
+    "foreignInstall",
+    "hasBinaryComponents",
+  ],
+
+  // Add-on types for which full details are recorded in FHR.
+  // All other types are ignored.
+  FULL_DETAIL_TYPES: [
+    "plugin",
+    "extension",
+    "service",
+  ],
+
+  /**
+   * Return true if either the add-on has opted out of AMO updates, and thus
+   * we shouldn't provide details to FHR, or it's an add-on type that we
+   * don't want to report details for.
+   * These add-ons will still make it over to Java, but will be filtered out.
+   */
+  _shouldIgnore: function (aAddon) {
+    // TODO: check this pref. If it's false, the add-on has opted out of
+    // AMO updates, and should not be reported.
+    let optOutPref = "extensions." + aAddon.id + ".getAddons.cache.enabled";
+    if (this.FULL_DETAIL_TYPES.indexOf(aAddon.type) == -1) {
+      return true;
+    }
+    return false;
+  },
+
+  _dateToDays: function (aDate) {
+    return Math.floor(aDate.getTime() / this.MILLISECONDS_PER_DAY);
+  },
+
+  jsonForAddon: function (aAddon) {
+    let o = {};
+    if (aAddon.installDate) {
+      o.installDay = this._dateToDays(aAddon.installDate);
+    }
+    if (aAddon.updateDate) {
+      o.updateDay = this._dateToDays(aAddon.updateDate);
+    }
+
+    for (let field of this.COPY_FIELDS) {
+      o[field] = aAddon[field];
+    }
+
+    return o;
+  },
+
+  notifyJava: function (aAddon, aNeedsRestart) {
+    let json = this.jsonForAddon(aAddon);
+    if (this._shouldIgnore(aAddon)) {
+      json.ignore = true;
+    }
+    sendMessageToJava({ type: "Addons:Change", id: aAddon.id, json: json });
+  },
+
+  // Add-on listeners.
+  onEnabling: function (aAddon, aNeedsRestart) {
+    this.notifyJava(aAddon, aNeedsRestart);
+  },
+  onDisabling: function (aAddon, aNeedsRestart) {
+    this.notifyJava(aAddon, aNeedsRestart);
+  },
+  onInstalling: function (aAddon, aNeedsRestart) {
+    this.notifyJava(aAddon, aNeedsRestart);
+  },
+  onUninstalling: function (aAddon, aNeedsRestart) {
+    this.notifyJava(aAddon, aNeedsRestart);
+  },
+  onPropertyChanged: function (aAddon, aProperties) {
+    this.notifyJava(aAddon);
+  },
+
+  sendAllAddonsToJava: function () {
+    AddonManager.getAllAddons(function (aAddons) {
+        let json = {};
+        if (aAddons) {
+          for (let i = 0; i < aAddons.length; ++i) {
+            let addon = aAddons[i];
+            let addonJSON = HealthReportStatusListener.jsonForAddon(addon);
+            if (HealthReportStatusListener._shouldIgnore(addon)) {
+              addonJSON.ignore = true;
+            }
+            json[addon.id] = addonJSON;
+          }
+        }
+        sendMessageToJava({ type: "Addons:All", json: json });
+      });
+  },
+};
+
 var XPInstallObserver = {
   init: function xpi_init() {
     Services.obs.addObserver(XPInstallObserver, "addon-install-blocked", false);

From 468c2de346bafe5527667bc45cad07a99d679da7 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 30 May 2013 17:42:56 -0700
Subject: [PATCH 46/85] Bug 873496 - Part 1: searches provider for FHR on
 Android. r=cpeterson * * * part of searches-1

---
 mobile/android/base/AwesomeBar.java           | 29 ++++++
 mobile/android/base/GeckoApp.java             |  7 +-
 .../base/health/BrowserHealthRecorder.java    | 97 +++++++++++++++++++
 mobile/android/base/util/EventDispatcher.java | 12 ++-
 4 files changed, 141 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index 1e4533efb12..2e1c1f3ce81 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -8,6 +8,7 @@ package org.mozilla.gecko;
 import org.mozilla.gecko.db.BrowserContract.Combined;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.gfx.BitmapUtils;
+import org.mozilla.gecko.health.BrowserHealthRecorder;
 import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.util.ThreadUtils;
@@ -43,6 +44,8 @@ import android.widget.ImageButton;
 import android.widget.TabWidget;
 import android.widget.Toast;
 
+import org.json.JSONObject;
+
 import java.net.URLEncoder;
 
 interface AutocompleteHandler {
@@ -104,6 +107,7 @@ public class AwesomeBar extends GeckoActivity
                 resultIntent.putExtra(URL_KEY, text);
                 resultIntent.putExtra(TARGET_KEY, mTarget);
                 resultIntent.putExtra(SEARCH_KEY, engine.name);
+                recordSearch(engine.identifier, "barsuggest");
                 finishWithResult(resultIntent);
             }
 
@@ -386,6 +390,28 @@ public class AwesomeBar extends GeckoActivity
         finishWithResult(resultIntent);
     }
 
+    /**
+     * Record in Health Report that a search has occurred.
+     *
+     * @param identifier
+     *        a search identifier, such as "partnername". Can be null.
+     * @param where
+     *        where the search was initialized; one of the values in
+     *        {@link BrowserHealthRecorder#SEARCH_LOCATIONS}.
+     */
+    private static void recordSearch(String identifier, String where) {
+        Log.i(LOGTAG, "Recording search: " + identifier + ", " + where);
+        try {
+            JSONObject message = new JSONObject();
+            message.put("type", BrowserHealthRecorder.EVENT_SEARCH);
+            message.put("location", where);
+            message.put("identifier", identifier);
+            GeckoAppShell.getEventDispatcher().dispatchEvent(message);
+        } catch (Exception e) {
+            Log.w(LOGTAG, "Error recording search.", e);
+        }
+    }
+
     private void openUserEnteredAndFinish(final String url) {
         final int index = url.indexOf(' ');
 
@@ -412,6 +438,9 @@ public class AwesomeBar extends GeckoActivity
                 final String searchUrl = (keywordUrl != null)
                                        ? keywordUrl.replace("%s", URLEncoder.encode(keywordSearch))
                                        : url;
+                if (keywordUrl != null) {
+                    recordSearch(null, "barkeyword");
+                }
                 openUrlAndFinish(searchUrl, "", true);
             }
         });
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index e4523ed781e..b5ffa3bc373 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1856,13 +1856,14 @@ abstract public class GeckoApp
                 SmsManager.getInstance().shutdown();
         }
 
-        super.onDestroy();
-
-        Tabs.unregisterOnTabsChangedListener(this);
         if (mHealthRecorder != null) {
             mHealthRecorder.close();
             mHealthRecorder = null;
         }
+
+        super.onDestroy();
+
+        Tabs.unregisterOnTabsChangedListener(this);
     }
 
     protected void registerEventListener(String event) {
diff --git a/mobile/android/base/health/BrowserHealthRecorder.java b/mobile/android/base/health/BrowserHealthRecorder.java
index 2a7f9e33f69..f3f11df5522 100644
--- a/mobile/android/base/health/BrowserHealthRecorder.java
+++ b/mobile/android/base/health/BrowserHealthRecorder.java
@@ -34,6 +34,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.Scanner;
 
 /**
@@ -59,6 +60,13 @@ public class BrowserHealthRecorder implements GeckoEventListener {
     private static final String EVENT_ADDONS_ALL = "Addons:All";
     private static final String EVENT_ADDONS_CHANGE = "Addons:Change";
     private static final String EVENT_PREF_CHANGE = "Pref:Change";
+ 
+    // This is raised from Gecko. It avoids browser.js having to know about the
+    // location that invoked it (the URL bar).
+    public static final String EVENT_KEYWORD_SEARCH = "Search:Keyword";
+
+    // This is raised from Java. We include the location in the message.
+    public static final String EVENT_SEARCH = "Search:Event";
 
     public enum State {
         NOT_INITIALIZED,
@@ -141,6 +149,8 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         this.dispatcher.unregisterEventListener(EVENT_ADDONS_ALL, this);
         this.dispatcher.unregisterEventListener(EVENT_ADDONS_CHANGE, this);
         this.dispatcher.unregisterEventListener(EVENT_PREF_CHANGE, this);
+        this.dispatcher.unregisterEventListener(EVENT_KEYWORD_SEARCH, this);
+        this.dispatcher.unregisterEventListener(EVENT_SEARCH, this);
     }
 
     public void onBlocklistPrefChanged(boolean to) {
@@ -343,6 +353,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
                         dispatcher.registerEventListener(EVENT_PREF_CHANGE, self);
 
                         // Initialize each provider here.
+                        initializeSearchProvider();
 
                         Log.d(LOG_TAG, "Ensuring environment.");
                         ensureEnvironment();
@@ -444,9 +455,95 @@ public class BrowserHealthRecorder implements GeckoEventListener {
                 this.onEnvironmentChanged();
                 return;
             }
+
+            // Searches.
+            if (EVENT_KEYWORD_SEARCH.equals(event)) {
+                recordSearch(message.getString("identifier"), "bartext");
+                return;
+            }
+            if (EVENT_SEARCH.equals(event)) {
+                if (!message.has("location")) {
+                    Log.d(LOG_TAG, "Ignoring search without location.");
+                    return;
+                }
+                recordSearch(message.getString("identifier"), message.getString("location"));
+                return;
+            }
         } catch (Exception e) {
             Log.e(LOG_TAG, "Exception handling message \"" + event + "\":", e);
         }
     }
+
+    /*
+     * Searches.
+     */
+
+    public static final String MEASUREMENT_NAME_SEARCH_COUNTS = "org.mozilla.searches.counts";
+    public static final int MEASUREMENT_VERSION_SEARCH_COUNTS = 3;
+
+    public static final String[] SEARCH_LOCATIONS = {
+        "barkeyword",
+        "barsuggest",
+        "bartext",
+    };
+
+    private void initializeSearchProvider() {
+        this.storage.ensureMeasurementInitialized(
+            MEASUREMENT_NAME_SEARCH_COUNTS,
+            MEASUREMENT_VERSION_SEARCH_COUNTS,
+            new MeasurementFields() {
+                @Override
+                public Iterable<FieldSpec> getFields() {
+                    ArrayList<FieldSpec> out = new ArrayList<FieldSpec>(SEARCH_LOCATIONS.length);
+                    for (String location : SEARCH_LOCATIONS) {
+                        // We're not using a counter, because the set of engine
+                        // identifiers is potentially unbounded, and thus our
+                        // measurement version would have to keep growing as
+                        // fields changed.
+                        out.add(new FieldSpec(location, Field.TYPE_STRING_DISCRETE));
+                    }
+                    return out;
+                }
+        });
+
+        // Do this here, rather than in a centralized registration spot, in
+        // case the above throws and we wind up handling events that we can't
+        // store.
+        this.dispatcher.registerEventListener(EVENT_KEYWORD_SEARCH, this);
+        this.dispatcher.registerEventListener(EVENT_SEARCH, this);
+    }
+
+    /**
+     * Record a search.
+     *
+     * @param engine the string identifier for the engine, or null if it's not a partner.
+     * @param location one of a fixed set of locations: see {@link #SEARCH_LOCATIONS}.
+     */
+    public void recordSearch(final String engine, final String location) {
+        if (this.state != State.INITIALIZED) {
+            Log.d(LOG_TAG, "Not initialized: not recording search. (" + this.state + ")");
+            return;
+        }
+
+        if (location == null) {
+            throw new IllegalArgumentException("location must be provided for search.");
+        }
+
+        final int day = storage.getDay();
+        final int env = this.env;
+        final String key = ((engine == null) ? "other" : engine);
+        ThreadUtils.postToBackgroundThread(new Runnable() {
+            @Override
+            public void run() {
+                Log.d(LOG_TAG, "Recording search: " + key + ", " + location +
+                               " (" + day + ", " + env + ").");
+                final int searchField = storage.getField(MEASUREMENT_NAME_SEARCH_COUNTS,
+                                                         MEASUREMENT_VERSION_SEARCH_COUNTS,
+                                                         location)
+                                               .getID();
+                storage.recordDailyDiscrete(env, day, searchField, key);
+            }
+        });
+    }
 }
 
diff --git a/mobile/android/base/util/EventDispatcher.java b/mobile/android/base/util/EventDispatcher.java
index 2f76f21301f..5b6d50883b4 100644
--- a/mobile/android/base/util/EventDispatcher.java
+++ b/mobile/android/base/util/EventDispatcher.java
@@ -53,12 +53,22 @@ public final class EventDispatcher {
     }
 
     public String dispatchEvent(String message) {
+        try {
+            JSONObject json = new JSONObject(message);
+            return dispatchEvent(json);
+        } catch (Exception e) {
+            Log.e(LOGTAG, "dispatchEvent: malformed JSON.", e);
+        }
+
+        return "";
+    }
+
+    public String dispatchEvent(JSONObject json) {
         // {
         //   "type": "value",
         //   "event_specific": "value",
         //   ...
         try {
-            JSONObject json = new JSONObject(message);
             JSONObject gecko = json.has("gecko") ? json.getJSONObject("gecko") : null;
             if (gecko != null) {
                 json = gecko;

From 2f24d74a6ba62c6c67d625df1f342f996a2d1e81 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 30 May 2013 17:42:57 -0700
Subject: [PATCH 47/85] Bug 873496 - Part 2: add provider filtering to search
 provider. r=nalexander

---
 .../base/health/BrowserHealthRecorder.java    | 97 ++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/health/BrowserHealthRecorder.java b/mobile/android/base/health/BrowserHealthRecorder.java
index f3f11df5522..791ca5f4239 100644
--- a/mobile/android/base/health/BrowserHealthRecorder.java
+++ b/mobile/android/base/health/BrowserHealthRecorder.java
@@ -487,6 +487,84 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         "bartext",
     };
 
+    // See services/healthreport/providers.jsm. Sorry for the duplication.
+    // THIS LIST MUST BE SORTED per java.lang.Comparable<String>.
+    private static final String[] SEARCH_PROVIDERS = {
+        "amazon-co-uk",
+        "amazon-de",
+        "amazon-en-GB",
+        "amazon-france",
+        "amazon-it",
+        "amazon-jp",
+        "amazondotcn",
+        "amazondotcom",
+        "amazondotcom-de",
+
+        "aol-en-GB",
+        "aol-web-search",
+
+        "bing",
+
+        "eBay",
+        "eBay-de",
+        "eBay-en-GB",
+        "eBay-es",
+        "eBay-fi",
+        "eBay-france",
+        "eBay-hu",
+        "eBay-in",
+        "eBay-it",
+
+        "google",
+        "google-jp",
+        "google-ku",
+        "google-maps-zh-TW",
+
+        "mailru",
+
+        "mercadolibre-ar",
+        "mercadolibre-cl",
+        "mercadolibre-mx",
+
+        "seznam-cz",
+
+        "twitter",
+        "twitter-de",
+        "twitter-ja",
+
+        "wikipedia",            // Manually added.
+
+        "yahoo",
+        "yahoo-NO",
+        "yahoo-answer-zh-TW",
+        "yahoo-ar",
+        "yahoo-bid-zh-TW",
+        "yahoo-br",
+        "yahoo-ch",
+        "yahoo-cl",
+        "yahoo-de",
+        "yahoo-en-GB",
+        "yahoo-es",
+        "yahoo-fi",
+        "yahoo-france",
+        "yahoo-fy-NL",
+        "yahoo-id",
+        "yahoo-in",
+        "yahoo-it",
+        "yahoo-jp",
+        "yahoo-jp-auctions",
+        "yahoo-mx",
+        "yahoo-sv-SE",
+        "yahoo-zh-TW",
+
+        "yandex",
+        "yandex-ru",
+        "yandex-slovari",
+        "yandex-tr",
+        "yandex.by",
+        "yandex.ru-be",
+    };
+
     private void initializeSearchProvider() {
         this.storage.ensureMeasurementInitialized(
             MEASUREMENT_NAME_SEARCH_COUNTS,
@@ -513,6 +591,23 @@ public class BrowserHealthRecorder implements GeckoEventListener {
         this.dispatcher.registerEventListener(EVENT_SEARCH, this);
     }
 
+    /**
+     * Return the field key for the search provider. This turns null and
+     * non-partner providers into "other".
+     *
+     * @param engine an engine identifier, such as "yandex"
+     * @return the key to use, such as "other" or "yandex".
+     */
+    protected String getEngineKey(final String engine) {
+        if (engine == null) {
+            return "other";
+        }
+
+        // This is inefficient. Optimize if necessary.
+        boolean found = (0 <= java.util.Arrays.binarySearch(SEARCH_PROVIDERS, engine));
+        return found ? engine : "other";
+    }
+
     /**
      * Record a search.
      *
@@ -531,7 +626,7 @@ public class BrowserHealthRecorder implements GeckoEventListener {
 
         final int day = storage.getDay();
         final int env = this.env;
-        final String key = ((engine == null) ? "other" : engine);
+        final String key = getEngineKey(engine);
         ThreadUtils.postToBackgroundThread(new Runnable() {
             @Override
             public void run() {

From ea78e648efde62097f3a80f2c4964f29fd2921fc Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 30 May 2013 17:42:57 -0700
Subject: [PATCH 48/85] Bug 876473 - Provide Java-generated Firefox Health
 Report to about:healthreport. r=rnewman

---
 mobile/android/base/BrowserApp.java           |   9 ++
 mobile/android/base/Makefile.in               |   1 +
 .../base/health/BrowserHealthReporter.java    | 136 ++++++++++++++++++
 .../chrome/content/aboutHealthReport.js       |  95 ++++--------
 4 files changed, 175 insertions(+), 66 deletions(-)
 create mode 100644 mobile/android/base/health/BrowserHealthReporter.java

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 6602f2c693b..b233c79ce98 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -13,6 +13,7 @@ import org.mozilla.gecko.gfx.GeckoLayerClient;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.gfx.PanZoomController;
+import org.mozilla.gecko.health.BrowserHealthReporter;
 import org.mozilla.gecko.menu.GeckoMenu;
 import org.mozilla.gecko.util.FloatUtils;
 import org.mozilla.gecko.util.GamepadUtils;
@@ -146,6 +147,8 @@ abstract public class BrowserApp extends GeckoApp
 
     private OrderedBroadcastHelper mOrderedBroadcastHelper;
 
+    private BrowserHealthReporter mBrowserHealthReporter;
+
     @Override
     public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
         switch(msg) {
@@ -426,6 +429,7 @@ abstract public class BrowserApp extends GeckoApp
         JavaAddonManager.getInstance().init(getApplicationContext());
         mSharedPreferencesHelper = new SharedPreferencesHelper(getApplicationContext());
         mOrderedBroadcastHelper = new OrderedBroadcastHelper(getApplicationContext());
+        mBrowserHealthReporter = new BrowserHealthReporter();
 
         if (AppConstants.MOZ_ANDROID_BEAM && Build.VERSION.SDK_INT >= 14) {
             NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this);
@@ -680,6 +684,11 @@ abstract public class BrowserApp extends GeckoApp
             mOrderedBroadcastHelper = null;
         }
 
+        if (mBrowserHealthReporter != null) {
+            mBrowserHealthReporter.uninit();
+            mBrowserHealthReporter = null;
+        }
+
         unregisterEventListener("CharEncoding:Data");
         unregisterEventListener("CharEncoding:State");
         unregisterEventListener("Feedback:LastUrl");
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 56a82bd0a19..af6e7e04082 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -113,6 +113,7 @@ FENNEC_JAVA_FILES = \
   GeckoViewsFactory.java \
   GeckoView.java \
   health/BrowserHealthRecorder.java \
+  health/BrowserHealthReporter.java \
   InputMethods.java \
   JavaAddonManager.java \
   LightweightTheme.java \
diff --git a/mobile/android/base/health/BrowserHealthReporter.java b/mobile/android/base/health/BrowserHealthReporter.java
new file mode 100644
index 00000000000..fbf64d43621
--- /dev/null
+++ b/mobile/android/base/health/BrowserHealthReporter.java
@@ -0,0 +1,136 @@
+/* -*- 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.health;
+
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.util.Log;
+
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
+import org.mozilla.gecko.GeckoProfile;
+
+import org.mozilla.gecko.background.healthreport.EnvironmentBuilder;
+import org.mozilla.gecko.background.healthreport.HealthReportDatabaseStorage;
+import org.mozilla.gecko.background.healthreport.HealthReportGenerator;
+
+import org.mozilla.gecko.util.GeckoEventListener;
+import org.mozilla.gecko.util.ThreadUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * BrowserHealthReporter is the browser's interface to the Firefox Health
+ * Report report generator.
+ *
+ * Each instance registers Gecko event listeners, so keep a single instance
+ * around for the life of the browser. Java callers should use this globally
+ * available singleton.
+ */
+public class BrowserHealthReporter implements GeckoEventListener {
+    private static final String LOGTAG = "GeckoHealthRep";
+
+    public static final long MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
+    public static final long MILLISECONDS_PER_SIX_MONTHS = 180 * MILLISECONDS_PER_DAY;
+
+    public static final String EVENT_REQUEST  = "HealthReport:Request";
+    public static final String EVENT_RESPONSE = "HealthReport:Response";
+
+    public BrowserHealthReporter() {
+        GeckoAppShell.registerEventListener(EVENT_REQUEST, this);
+
+        final Context context = GeckoAppShell.getContext();
+        if (context == null) {
+            throw new IllegalStateException("Null Gecko context");
+        }
+    }
+
+    public void uninit() {
+        GeckoAppShell.unregisterEventListener(EVENT_REQUEST, this);
+    }
+
+    /**
+     * Generate a new Health Report.
+     *
+     * This method performs IO, so call it from a background thread.
+     *
+     * @param since timestamp of first day to report (milliseconds since epoch).
+     * @param lastPingTime timestamp when last health report was uploaded
+     *                     (milliseconds since epoch).
+     * @param profilePath path of the profile to generate report for.
+     */
+    public JSONObject generateReport(long since, long lastPingTime, String profilePath) throws JSONException {
+        final Context context = GeckoAppShell.getContext();
+        if (context == null) {
+            Log.e(LOGTAG, "Null Gecko context; returning null report.", new RuntimeException());
+            return null;
+        }
+
+        // We abuse the life-cycle of an Android ContentProvider slightly by holding
+        // onto a ContentProviderClient while we generate a payload. This keeps
+        // our database storage alive, while also allowing us to share a database
+        // connection with BrowserHealthRecorder and the uploader.
+        // The ContentProvider owns all underlying Storage instances, so we don't
+        // need to explicitly close them.
+        ContentProviderClient client = EnvironmentBuilder.getContentProviderClient(context);
+        if (client == null) {
+            throw new IllegalStateException("Could not fetch Health Report content provider.");
+        }
+
+        try {
+            // Storage instance is owned by HealthReportProvider, so we don't need
+            // to close it.
+            HealthReportDatabaseStorage storage = EnvironmentBuilder.getStorage(client, profilePath);
+            if (storage == null) {
+                Log.e(LOGTAG, "No storage in health reporter; returning null report.", new RuntimeException());
+                return null;
+            }
+
+            HealthReportGenerator generator = new HealthReportGenerator(storage);
+            return generator.generateDocument(since, lastPingTime, profilePath);
+        } finally {
+            client.release();
+        }
+    }
+
+    /**
+     * Generate a new Health Report for the current Gecko profile.
+     *
+     * This method performs IO, so call it from a background thread.
+     */
+    public JSONObject generateReport() throws JSONException {
+        GeckoProfile profile = GeckoAppShell.getGeckoInterface().getProfile();
+        String profilePath = profile.getDir().getAbsolutePath();
+
+        long since = System.currentTimeMillis() - MILLISECONDS_PER_SIX_MONTHS;
+         // TODO: read this from per-profile SharedPreference owned by background uploader.
+        long lastPingTime = since;
+        return generateReport(since, lastPingTime, profilePath);
+    }
+
+    @Override
+    public void handleMessage(String event, JSONObject message) {
+        try {
+            ThreadUtils.postToBackgroundThread(new Runnable() {
+                @Override
+                public void run() {
+                    JSONObject report = new JSONObject();
+                    try {
+                        report = generateReport();
+                    } catch (Exception e) {
+                        Log.e(LOGTAG, "Generating report failed; responding with null.", e);
+                    }
+
+                    GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent(EVENT_RESPONSE, report.toString()));
+                }
+           });
+        } catch (Exception e) {
+            Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
+        }
+    }
+}
+
diff --git a/mobile/android/chrome/content/aboutHealthReport.js b/mobile/android/chrome/content/aboutHealthReport.js
index bd48102e1c8..6c3203fe27f 100644
--- a/mobile/android/chrome/content/aboutHealthReport.js
+++ b/mobile/android/chrome/content/aboutHealthReport.js
@@ -8,8 +8,6 @@
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
-Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
-Cu.import("resource://gre/modules/OrderedBroadcast.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/SharedPreferences.jsm");
 
@@ -17,86 +15,44 @@ Cu.import("resource://gre/modules/SharedPreferences.jsm");
 // health reports.
 const PREF_UPLOAD_ENABLED = "android.not_a_preference.healthreport.uploadEnabled";
 
-// Action sent via Android Ordered Broadcast to background service.
-const BROADCAST_ACTION_HEALTH_REPORT = "@ANDROID_PACKAGE_NAME@" + ".healthreport.request";
-
 // Name of Gecko Pref specifying report content location.
 const PREF_REPORTURL = "datareporting.healthreport.about.reportUrl";
 
+const EVENT_HEALTH_REQUEST = "HealthReport:Request";
+const EVENT_HEALTH_RESPONSE = "HealthReport:Response";
+
 function sendMessageToJava(message) {
   return Cc["@mozilla.org/android/bridge;1"]
     .getService(Ci.nsIAndroidBridge)
     .handleGeckoMessage(JSON.stringify(message));
 }
 
-// Default preferences for the application.
+// about:healthreport prefs are stored in Firefox's default Android
+// SharedPreferences.
 let sharedPrefs = new SharedPreferences();
 
-let reporter = {
-  onInit: function () {
-    let deferred = Promise.defer();
-    deferred.resolve();
-
-    return deferred.promise;
-  },
-
-  collectAndObtainJSONPayload: function () {
-    let deferred = Promise.defer();
-
-    let callback = function (data, token, action) {
-      if (data) {
-        // Bug 870992: the FHR report content expects FHR report data
-        // in string form.  This costs us a JSON parsing round trip,
-        // since the ordered broadcast module parses the stringified
-        // JSON returned from Java.  Since the FHR report content
-        // expects updates to preferences as a Javascript object, we
-        // cannot handle the situation uniformly, and we pay the price
-        // here, stringifying a huge chunk of JSON.
-        deferred.resolve(JSON.stringify(data));
-      } else {
-        deferred.reject();
-      }
-    };
-
-    sendOrderedBroadcast(BROADCAST_ACTION_HEALTH_REPORT, null, callback);
-
-    return deferred.promise;
-  },
-};
-
-let policy = {
-  get healthReportUploadEnabled() {
-    return sharedPrefs.getBoolPref(PREF_UPLOAD_ENABLED);
-  },
-
-  recordHealthReportUploadEnabled: function (enabled) {
-    sharedPrefs.setBoolPref(PREF_UPLOAD_ENABLED, !!enabled);
-  },
-};
-
 let healthReportWrapper = {
   init: function () {
-    reporter.onInit().then(healthReportWrapper.refreshPayload,
-                           healthReportWrapper.handleInitFailure);
-
     let iframe = document.getElementById("remote-report");
     iframe.addEventListener("load", healthReportWrapper.initRemotePage, false);
     let report = this._getReportURI();
     iframe.src = report.spec;
 
     sharedPrefs.addObserver(PREF_UPLOAD_ENABLED, this, false);
+    Services.obs.addObserver(this, EVENT_HEALTH_RESPONSE, false);
   },
 
   observe: function (subject, topic, data) {
-    if (topic != PREF_UPLOAD_ENABLED) {
-      return;
+    if (topic == PREF_UPLOAD_ENABLED) {
+      this.updatePrefState();
+    } else if (topic == EVENT_HEALTH_RESPONSE) {
+      this.updatePayload(data);
     }
-
-    subject.updatePrefState();
   },
 
   uninit: function () {
     sharedPrefs.removeObserver(PREF_UPLOAD_ENABLED, this);
+    Services.obs.removeObserver(this, EVENT_HEALTH_RESPONSE);
   },
 
   _getReportURI: function () {
@@ -105,21 +61,22 @@ let healthReportWrapper = {
   },
 
   onOptIn: function () {
-    policy.recordHealthReportUploadEnabled(true,
-                                           "Health report page sent opt-in command.");
+    console.log("AboutHealthReport: page sent opt-in command.");
+    sharedPrefs.setBoolPref(PREF_UPLOAD_ENABLED, true);
     this.updatePrefState();
   },
 
   onOptOut: function () {
-    policy.recordHealthReportUploadEnabled(false,
-                                           "Health report page sent opt-out command.");
+    console.log("AboutHealthReport: page sent opt-out command.");
+    sharedPrefs.setBoolPref(PREF_UPLOAD_ENABLED, false);
     this.updatePrefState();
   },
 
   updatePrefState: function () {
+    console.log("AboutHealthReport: page requested pref state.");
     try {
       let prefs = {
-        enabled: policy.healthReportUploadEnabled,
+        enabled: sharedPrefs.getBoolPref(PREF_UPLOAD_ENABLED),
       };
       this.injectData("prefs", prefs);
     } catch (e) {
@@ -128,21 +85,27 @@ let healthReportWrapper = {
   },
 
   refreshPayload: function () {
-    reporter.collectAndObtainJSONPayload().then(healthReportWrapper.updatePayload,
-                                                healthReportWrapper.handlePayloadFailure);
+    console.log("AboutHealthReport: page requested fresh payload.");
+    sendMessageToJava({
+      type: EVENT_HEALTH_REQUEST,
+    });
   },
 
   updatePayload: function (data) {
     healthReportWrapper.injectData("payload", data);
+    // Data is supposed to be a string, so the length should be
+    // defined.  Just in case, we do this after injecting the data.
+    console.log("AboutHealthReport: sending payload to page " +
+         "(" + typeof(data) + " of length " + data.length + ").");
   },
 
   injectData: function (type, content) {
     let report = this._getReportURI();
 
-    // file URIs can't be used for targetOrigin, so we use "*" for this special case
-    // in all other cases, pass in the URL to the report so we properly restrict the message dispatch
-
-    let reportUrl = report.scheme == "file" ? "*" : report.spec;
+    // file: URIs can't be used for targetOrigin, so we use "*" for
+    // this special case.  In all other cases, pass in the URL to the
+    // report so we properly restrict the message dispatch.
+    let reportUrl = (report.scheme == "file") ? "*" : report.spec;
 
     let data = {
       type: type,

From 07bd637224b6e9b39f391990896313edea4b75e1 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Thu, 30 May 2013 17:45:17 -0700
Subject: [PATCH 49/85] Bug 788549 Part 6: Remove a redundant if check r=dbaron

---
 layout/style/nsTransitionManager.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 628d75ebc4d..8fb9e73fb6e 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -912,12 +912,10 @@ nsTransitionManager::WalkTransitionRule(ElementDependentRuleProcessorData* aData
 
     // We need to immediately restyle with animation
     // after doing this.
-    if (et) {
-      nsRestyleHint hint =
-        aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ?
-        eRestyle_Self : eRestyle_Subtree;
-      mPresContext->PresShell()->RestyleForAnimation(aData->mElement, hint);
-    }
+    nsRestyleHint hint =
+      aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ?
+      eRestyle_Self : eRestyle_Subtree;
+    mPresContext->PresShell()->RestyleForAnimation(aData->mElement, hint);
     return;
   }
 

From 4c9888e06bdfb2c471e8fdd9ff99f22d0e482a40 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Thu, 30 May 2013 17:45:17 -0700
Subject: [PATCH 50/85] Bug 788549 Part 7: Make RecvGetTransform() return the
 untranslated transform since that is what getComputedStyle returns r=roc

---
 gfx/layers/ipc/LayerTransactionParent.cpp | 25 ++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gfx/layers/ipc/LayerTransactionParent.cpp b/gfx/layers/ipc/LayerTransactionParent.cpp
index 6e09c267843..0902dd5afce 100644
--- a/gfx/layers/ipc/LayerTransactionParent.cpp
+++ b/gfx/layers/ipc/LayerTransactionParent.cpp
@@ -26,6 +26,7 @@
 #include "mozilla/layers/ColorLayerComposite.h"
 #include "mozilla/layers/ContainerLayerComposite.h"
 #include "mozilla/layers/CanvasLayerComposite.h"
+#include "mozilla/layers/PLayerTransaction.h"
 
 typedef std::vector<mozilla::layers::EditReply> EditReplyVector;
 
@@ -454,7 +455,29 @@ LayerTransactionParent::RecvGetTransform(PLayerParent* aParent,
     return false;
   }
 
-  *aTransform = cast(aParent)->AsLayer()->GetLocalTransform();
+  // The following code recovers the untranslated transform
+  // from the shadow transform by undoing the translations in
+  // AsyncCompositionManager::SampleValue.
+  Layer* layer = cast(aParent)->AsLayer();
+  *aTransform = layer->GetLocalTransform();
+  float scale = 1;
+  gfxPoint3D scaledOrigin;
+  gfxPoint3D mozOrigin;
+  for (uint32_t i=0; i < layer->GetAnimations().Length(); i++) {
+    if (layer->GetAnimations()[i].data().type() == AnimationData::TTransformData) {
+      const TransformData& data = layer->GetAnimations()[i].data().get_TransformData();
+      scale = data.appUnitsPerDevPixel();
+      scaledOrigin =
+        gfxPoint3D(NS_round(NSAppUnitsToFloatPixels(data.origin().x, scale)),
+                   NS_round(NSAppUnitsToFloatPixels(data.origin().y, scale)),
+                   0.0f);
+      mozOrigin = data.mozOrigin();
+      break;
+    }
+  }
+
+  aTransform->Translate(-scaledOrigin);
+  *aTransform = nsLayoutUtils::ChangeMatrixBasis(-scaledOrigin - mozOrigin, *aTransform);
   return true;
 }
 

From d822bd353364f378bb1c0c3119a7960153e87437 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 20:52:26 -0400
Subject: [PATCH 51/85] Bug 877523 - Correctly handle small maximum delay
 values for DelayNode; r=roc

---
 content/media/webaudio/DelayNode.cpp          |  2 +-
 content/media/webaudio/test/Makefile.in       |  1 +
 .../test/test_delayNodeSmallMaxDelay.html     | 43 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 content/media/webaudio/test/test_delayNodeSmallMaxDelay.html

diff --git a/content/media/webaudio/DelayNode.cpp b/content/media/webaudio/DelayNode.cpp
index 4816626c97c..b29178f1866 100644
--- a/content/media/webaudio/DelayNode.cpp
+++ b/content/media/webaudio/DelayNode.cpp
@@ -116,7 +116,7 @@ public:
       if (!mBuffer.SetLength(aNumberOfChannels)) {
         return false;
       }
-      const int32_t numFrames = NS_lround(mMaxDelay) * aSampleRate;
+      const int32_t numFrames = NS_lround(mMaxDelay * aSampleRate);
       for (uint32_t channel = 0; channel < aNumberOfChannels; ++channel) {
         if (!mBuffer[channel].SetLength(numFrames)) {
           return false;
diff --git a/content/media/webaudio/test/Makefile.in b/content/media/webaudio/test/Makefile.in
index a21b1a6e890..bba89ba34fd 100644
--- a/content/media/webaudio/test/Makefile.in
+++ b/content/media/webaudio/test/Makefile.in
@@ -53,6 +53,7 @@ MOCHITEST_FILES := \
   test_channelSplitterNodeWithVolume.html \
   test_currentTime.html \
   test_delayNode.html \
+  test_delayNodeSmallMaxDelay.html \
   test_delayNodeWithGain.html \
   test_delayNodeWithGainAlternate.html \
   test_dynamicsCompressorNode.html \
diff --git a/content/media/webaudio/test/test_delayNodeSmallMaxDelay.html b/content/media/webaudio/test/test_delayNodeSmallMaxDelay.html
new file mode 100644
index 00000000000..b9cee458d77
--- /dev/null
+++ b/content/media/webaudio/test/test_delayNodeSmallMaxDelay.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test DelayNode</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<pre id="test">
+<script src="webaudio.js" type="text/javascript"></script>
+<script class="testbody" type="text/javascript">
+
+var gTest = {
+  length: 2048,
+  numberOfChannels: 1,
+  createGraph: function(context) {
+    var source = context.createBufferSource();
+
+    var delay = context.createDelay(0.02);
+
+    source.buffer = this.buffer;
+
+    source.connect(delay);
+
+    source.start(0);
+    return delay;
+  },
+  createExpectedBuffers: function(context) {
+    var expectedBuffer = context.createBuffer(1, 2048, context.sampleRate);
+    for (var i = 0; i < 2048; ++i) {
+      expectedBuffer.getChannelData(0)[i] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
+    }
+    this.buffer = expectedBuffer;
+    return expectedBuffer;
+  },
+};
+
+runTest();
+
+</script>
+</pre>
+</body>
+</html>

From 13fff291bffb0dbe22ccff7cf597cfb0b318e924 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 20:53:15 -0400
Subject: [PATCH 52/85] Bug 876024 - Sanity check all of the time values passed
 to Web Audio; r=roc

---
 content/media/test/crashtests/876024-1.html   |  5 ++++
 content/media/test/crashtests/876024-2.html   | 17 ++++++++++++++
 content/media/test/crashtests/crashtests.list |  2 ++
 .../media/webaudio/AudioBufferSourceNode.cpp  | 11 +++++++++
 content/media/webaudio/AudioParam.h           | 23 ++++++++++++++++++-
 content/media/webaudio/WebAudioUtils.h        |  5 ++++
 dom/webidl/AudioParam.webidl                  |  1 +
 7 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 content/media/test/crashtests/876024-1.html
 create mode 100644 content/media/test/crashtests/876024-2.html

diff --git a/content/media/test/crashtests/876024-1.html b/content/media/test/crashtests/876024-1.html
new file mode 100644
index 00000000000..5502d8e42d4
--- /dev/null
+++ b/content/media/test/crashtests/876024-1.html
@@ -0,0 +1,5 @@
+<script>
+o1 = new window.AudioContext(2, 8, 44100);
+o4 = o1.createBiquadFilter();
+o4.detune.setValueAtTime(0.0843, 1.7976931348623157e+308);
+</script>
diff --git a/content/media/test/crashtests/876024-2.html b/content/media/test/crashtests/876024-2.html
new file mode 100644
index 00000000000..d299ec4d2d6
--- /dev/null
+++ b/content/media/test/crashtests/876024-2.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+
+function boom()
+{
+  var bufferSource = AudioContext().createScriptProcessor().context.createBufferSource();
+  bufferSource.noteGrainOn(0, 0, 0);
+  bufferSource.noteOff(562949953421313);
+}
+
+</script></head>
+
+<body onload="boom();"></body>
+</html>
diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index 733e0ab602b..42a3a8c2bf8 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -22,6 +22,8 @@ load 874952.html
 load 875144.html
 load 875596.html
 load 875911.html
+load 876024-1.html
+load 876024-2.html
 load 876118.html
 load 876207.html
 load 876215.html
diff --git a/content/media/webaudio/AudioBufferSourceNode.cpp b/content/media/webaudio/AudioBufferSourceNode.cpp
index d5d680d9d04..67d55fc9a14 100644
--- a/content/media/webaudio/AudioBufferSourceNode.cpp
+++ b/content/media/webaudio/AudioBufferSourceNode.cpp
@@ -480,6 +480,12 @@ void
 AudioBufferSourceNode::Start(double aWhen, double aOffset,
                              const Optional<double>& aDuration, ErrorResult& aRv)
 {
+  if (!WebAudioUtils::IsTimeValid(aWhen) ||
+      (aDuration.WasPassed() && !WebAudioUtils::IsTimeValid(aDuration.Value()))) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return;
+  }
+
   if (mStartCalled) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
@@ -567,6 +573,11 @@ AudioBufferSourceNode::SendOffsetAndDurationParametersToStream(AudioNodeStream*
 void
 AudioBufferSourceNode::Stop(double aWhen, ErrorResult& aRv, bool aShuttingDown)
 {
+  if (!WebAudioUtils::IsTimeValid(aWhen)) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return;
+  }
+
   if (!mStartCalled) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
diff --git a/content/media/webaudio/AudioParam.h b/content/media/webaudio/AudioParam.h
index abf528444a6..53470cbe152 100644
--- a/content/media/webaudio/AudioParam.h
+++ b/content/media/webaudio/AudioParam.h
@@ -72,21 +72,38 @@ public:
   }
   void SetValueAtTime(float aValue, double aStartTime, ErrorResult& aRv)
   {
+    if (!WebAudioUtils::IsTimeValid(aStartTime)) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
     AudioParamTimeline::SetValueAtTime(aValue, aStartTime, aRv);
     mCallback(mNode);
   }
   void LinearRampToValueAtTime(float aValue, double aEndTime, ErrorResult& aRv)
   {
+    if (!WebAudioUtils::IsTimeValid(aEndTime)) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
     AudioParamTimeline::LinearRampToValueAtTime(aValue, aEndTime, aRv);
     mCallback(mNode);
   }
   void ExponentialRampToValueAtTime(float aValue, double aEndTime, ErrorResult& aRv)
   {
+    if (!WebAudioUtils::IsTimeValid(aEndTime)) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
     AudioParamTimeline::ExponentialRampToValueAtTime(aValue, aEndTime, aRv);
     mCallback(mNode);
   }
   void SetTargetAtTime(float aTarget, double aStartTime, double aTimeConstant, ErrorResult& aRv)
   {
+    if (!WebAudioUtils::IsTimeValid(aStartTime) ||
+        !WebAudioUtils::IsTimeValid(aTimeConstant)) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
     AudioParamTimeline::SetTargetAtTime(aTarget, aStartTime, aTimeConstant, aRv);
     mCallback(mNode);
   }
@@ -94,8 +111,12 @@ public:
   {
     SetTargetAtTime(aTarget, aStartTime, aTimeConstant, aRv);
   }
-  void CancelScheduledValues(double aStartTime)
+  void CancelScheduledValues(double aStartTime, ErrorResult& aRv)
   {
+    if (!WebAudioUtils::IsTimeValid(aStartTime)) {
+      aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+      return;
+    }
     AudioParamTimeline::CancelScheduledValues(aStartTime);
     mCallback(mNode);
   }
diff --git a/content/media/webaudio/WebAudioUtils.h b/content/media/webaudio/WebAudioUtils.h
index 7c559293103..ccaabd0cf52 100644
--- a/content/media/webaudio/WebAudioUtils.h
+++ b/content/media/webaudio/WebAudioUtils.h
@@ -104,6 +104,11 @@ struct WebAudioUtils {
     return 1.0 - std::exp(-1.0 / (sampleRate * timeConstant));
   }
 
+  static bool IsTimeValid(double aTime)
+  {
+    return aTime >= 0 &&  aTime <= (MEDIA_TIME_MAX >> MEDIA_TIME_FRAC_BITS);
+  }
+
   /**
    * Convert a stream position into the time coordinate of the destination
    * stream.
diff --git a/dom/webidl/AudioParam.webidl b/dom/webidl/AudioParam.webidl
index ba221250061..7981d377e99 100644
--- a/dom/webidl/AudioParam.webidl
+++ b/dom/webidl/AudioParam.webidl
@@ -34,6 +34,7 @@ interface AudioParam {
     void setValueCurveAtTime(Float32Array values, double startTime, double duration);
 
     // Cancels all scheduled parameter changes with times greater than or equal to startTime. 
+    [Throws]
     void cancelScheduledValues(double startTime);
 
 };

From 6f0d7033ca11907e0c70292c446f1a782936f24f Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 20:53:51 -0400
Subject: [PATCH 53/85] Bug 876273 - Only attempt to delete the media graph
 when the last stream goes away if we're waiting for all streams to be
 destroyed; r=roc

---
 content/media/MediaStreamGraph.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
index 9de36489daf..4ff20992eba 100644
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -1443,7 +1443,8 @@ MediaStreamGraphImpl::AppendMessage(ControlMessage* aMessage)
     // This should only happen during forced shutdown.
     aMessage->RunDuringShutdown();
     delete aMessage;
-    if (IsEmpty()) {
+    if (IsEmpty() &&
+        mLifecycleState >= LIFECYCLE_WAITING_FOR_STREAM_DESTRUCTION) {
       if (gGraph == this) {
         gGraph = nullptr;
       }

From 72c63d4e5c49f15bce5b705471469484ecef34b5 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 20:54:07 -0400
Subject: [PATCH 54/85] Bug 877820 - Improve the argument checking for
 OfflineAudioContext's sampleRate argument; r=roc

---
 content/media/test/crashtests/877820.html     | 4 ++++
 content/media/test/crashtests/crashtests.list | 1 +
 content/media/webaudio/AudioContext.cpp       | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 content/media/test/crashtests/877820.html

diff --git a/content/media/test/crashtests/877820.html b/content/media/test/crashtests/877820.html
new file mode 100644
index 00000000000..6d65c1e9d9b
--- /dev/null
+++ b/content/media/test/crashtests/877820.html
@@ -0,0 +1,4 @@
+<script>
+o1 = new window.OfflineAudioContext(2, 5, 0.39);
+window.location.reload();
+</script>
\ No newline at end of file
diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index 42a3a8c2bf8..9f1ebc48f19 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -30,3 +30,4 @@ load 876215.html
 load 876249.html
 load 876252.html
 load 876834.html
+load 877820.html
diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp
index 0d4ac1055d2..eacef00288c 100644
--- a/content/media/webaudio/AudioContext.cpp
+++ b/content/media/webaudio/AudioContext.cpp
@@ -106,7 +106,7 @@ AudioContext::Constructor(const GlobalObject& aGlobal,
   if (aNumberOfChannels == 0 ||
       aNumberOfChannels > WebAudioUtils::MaxChannelCount ||
       aLength == 0 ||
-      aSampleRate <= 0.0f ||
+      aSampleRate <= 1.0f ||
       aSampleRate >= TRACK_RATE_MAX) {
     // The DOM binding protects us against infinity and NaN
     aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);

From 286425d4f415e9b598c3700246a5a7e2708678d3 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 20:59:09 -0400
Subject: [PATCH 55/85] Crashtest for bug 868504

---
 content/media/test/crashtests/868504.html     | 14 ++++++++++++++
 content/media/test/crashtests/crashtests.list |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 content/media/test/crashtests/868504.html

diff --git a/content/media/test/crashtests/868504.html b/content/media/test/crashtests/868504.html
new file mode 100644
index 00000000000..637b710ad42
--- /dev/null
+++ b/content/media/test/crashtests/868504.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+function boom()
+{
+    AudioContext().createBufferSource().playbackRate.linearRampToValueAtTime(0, -1);
+}
+
+</script>
+</head>
+<body onload="boom();"></body>
+</html>
diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
index 9f1ebc48f19..385f4570657 100644
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -15,6 +15,7 @@ skip-if(Android||B2G) load 789075-1.html # load failed, bug 833371 for B2G
 load 844563.html
 load 846612.html
 load 852838.html
+load 868504.html
 load 874869.html
 load 874915.html
 load 874934.html

From 99a4283e34e54c7844f3ab296971b374b2831d0e Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Thu, 30 May 2013 21:30:13 -0400
Subject: [PATCH 56/85] Bug 877726 - Convert FrameMetrics.mScrollOffset to be a
 CSSPoint. r=kentuckyfriedtakahe

---
 dom/ipc/TabChild.cpp                         |  4 +--
 gfx/2d/Point.h                               | 11 +++++++
 gfx/layers/FrameMetrics.h                    |  3 +-
 gfx/layers/LayersLogging.cpp                 |  3 +-
 gfx/layers/LayersLogging.h                   |  3 +-
 gfx/layers/client/ClientTiledThebesLayer.cpp |  2 +-
 gfx/layers/client/TiledContentClient.cpp     |  2 +-
 gfx/layers/client/TiledContentClient.h       |  4 +--
 gfx/layers/ipc/AsyncPanZoomController.cpp    | 19 ++++++------
 gfx/layers/ipc/Axis.cpp                      |  6 ++--
 gfx/layers/ipc/Axis.h                        |  7 +++--
 ipc/glue/IPCMessageUtils.h                   |  6 ++--
 layout/base/Units.h                          | 31 ++++++++++++++++++++
 layout/base/moz.build                        |  1 +
 layout/base/nsDisplayList.cpp                |  8 ++---
 layout/generic/nsGfxScrollFrame.cpp          |  5 ++--
 layout/generic/nsGfxScrollFrame.h            |  7 ++---
 layout/generic/nsIScrollableFrame.h          |  6 ++--
 18 files changed, 86 insertions(+), 42 deletions(-)
 create mode 100644 layout/base/Units.h

diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index ffae28c011d..a6078ed6089 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -354,7 +354,7 @@ TabChild::Observe(nsISupports *aSubject,
                                                     mInnerSize);
         mLastMetrics.mResolution =
           AsyncPanZoomController::CalculateResolution(mLastMetrics);
-        mLastMetrics.mScrollOffset = gfx::Point(0, 0);
+        mLastMetrics.mScrollOffset = CSSPoint(0, 0);
         utils->SetResolution(mLastMetrics.mResolution.width,
                              mLastMetrics.mResolution.height);
 
@@ -1452,7 +1452,7 @@ TabChild::DispatchMessageManagerMessage(const nsAString& aMessageName,
 }
 
 static void
-ScrollWindowTo(nsIDOMWindow* aWindow, const mozilla::gfx::Point& aPoint)
+ScrollWindowTo(nsIDOMWindow* aWindow, const CSSPoint& aPoint)
 {
     nsGlobalWindow* window = static_cast<nsGlobalWindow*>(aWindow);
     nsIScrollableFrame* sf = window->GetScrollFrame();
diff --git a/gfx/2d/Point.h b/gfx/2d/Point.h
index efe3dd7d9a5..a50e85da4e7 100644
--- a/gfx/2d/Point.h
+++ b/gfx/2d/Point.h
@@ -36,6 +36,17 @@ struct PointTyped :
   PointTyped() : Super() {}
   PointTyped(Float aX, Float aY) : Super(aX, aY) {}
   PointTyped(const IntPointTyped<units>& point) : Super(float(point.x), float(point.y)) {}
+
+  // XXX When all of the code is ported, the following functions to convert to and from
+  // unknown types should be removed.
+
+  static PointTyped<units> FromUnknownPoint(const PointTyped<UnknownUnits>& pt) {
+    return PointTyped<units>(pt.x, pt.y);
+  }
+
+  PointTyped<UnknownUnits> ToUnknownPoint() const {
+    return PointTyped<UnknownUnits>(this->x, this->y);
+  }
 };
 typedef PointTyped<UnknownUnits> Point;
 
diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h
index 384a963ed41..bda6dcee0ad 100644
--- a/gfx/layers/FrameMetrics.h
+++ b/gfx/layers/FrameMetrics.h
@@ -10,6 +10,7 @@
 #include "gfxTypes.h"
 #include "nsRect.h"
 #include "mozilla/gfx/Rect.h"
+#include "Units.h"
 
 namespace mozilla {
 namespace layers {
@@ -190,7 +191,7 @@ public:
   //
   // This is valid for any layer, but is always relative to this frame and
   // not any parents, regardless of parent transforms.
-  gfx::Point mScrollOffset;
+  mozilla::CSSPoint mScrollOffset;
 
   // A unique ID assigned to each scrollable frame (unless this is
   // ROOT_SCROLL_ID, in which case it is not unique).
diff --git a/gfx/layers/LayersLogging.cpp b/gfx/layers/LayersLogging.cpp
index ff68324da45..877119c2826 100644
--- a/gfx/layers/LayersLogging.cpp
+++ b/gfx/layers/LayersLogging.cpp
@@ -95,8 +95,9 @@ AppendToString(nsACString& s, const nsIntPoint& p,
   return s += sfx;
 }
 
+template<class T>
 nsACString&
-AppendToString(nsACString& s, const Point& p,
+AppendToString(nsACString& s, const PointTyped<T>& p,
                const char* pfx, const char* sfx)
 {
   s += pfx;
diff --git a/gfx/layers/LayersLogging.h b/gfx/layers/LayersLogging.h
index 01c556ba42e..a936d8fa2f5 100644
--- a/gfx/layers/LayersLogging.h
+++ b/gfx/layers/LayersLogging.h
@@ -44,8 +44,9 @@ nsACString&
 AppendToString(nsACString& s, const nsIntPoint& p,
                const char* pfx="", const char* sfx="");
 
+template<class T>
 nsACString&
-AppendToString(nsACString& s, const mozilla::gfx::Point& p,
+AppendToString(nsACString& s, const mozilla::gfx::PointTyped<T>& p,
                const char* pfx="", const char* sfx="");
 
 nsACString&
diff --git a/gfx/layers/client/ClientTiledThebesLayer.cpp b/gfx/layers/client/ClientTiledThebesLayer.cpp
index 5f6d9d20619..bdfcb7b985d 100644
--- a/gfx/layers/client/ClientTiledThebesLayer.cpp
+++ b/gfx/layers/client/ClientTiledThebesLayer.cpp
@@ -18,7 +18,7 @@ ClientTiledThebesLayer::ClientTiledThebesLayer(ClientLayerManager* const aManage
   , mContentClient()
 {
   MOZ_COUNT_CTOR(ClientTiledThebesLayer);
-  mPaintData.mLastScrollOffset = gfx::Point(0, 0);
+  mPaintData.mLastScrollOffset = CSSPoint(0, 0);
   mPaintData.mFirstPaint = true;
 }
 
diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp
index 465866ad8d2..71bd1a78851 100644
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -273,7 +273,7 @@ BasicTiledLayerBuffer::ValidateTile(BasicTiledLayerTile aTile,
 
 static nsIntRect
 RoundedTransformViewportBounds(const gfx::Rect& aViewport,
-                               const gfx::Point& aScrollOffset,
+                               const CSSPoint& aScrollOffset,
                                const gfxSize& aResolution,
                                float aScaleX,
                                float aScaleY,
diff --git a/gfx/layers/client/TiledContentClient.h b/gfx/layers/client/TiledContentClient.h
index a82ced50a1f..84972ad8249 100644
--- a/gfx/layers/client/TiledContentClient.h
+++ b/gfx/layers/client/TiledContentClient.h
@@ -73,8 +73,8 @@ struct BasicTiledLayerTile {
  * doesn't need to be recalculated on every repeated transaction.
  */
 struct BasicTiledLayerPaintData {
-  gfx::Point mScrollOffset;
-  gfx::Point mLastScrollOffset;
+  CSSPoint mScrollOffset;
+  CSSPoint mLastScrollOffset;
   gfx3DMatrix mTransformScreenToLayer;
   nsIntRect mLayerCriticalDisplayPort;
   gfxSize mResolution;
diff --git a/gfx/layers/ipc/AsyncPanZoomController.cpp b/gfx/layers/ipc/AsyncPanZoomController.cpp
index 5b1c437f5be..071977d7198 100644
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -828,7 +828,7 @@ void AsyncPanZoomController::ScrollBy(const gfx::Point& aOffset) {
   gfx::Point newOffset(mFrameMetrics.mScrollOffset.x + aOffset.x,
                        mFrameMetrics.mScrollOffset.y + aOffset.y);
   FrameMetrics metrics(mFrameMetrics);
-  metrics.mScrollOffset = newOffset;
+  metrics.mScrollOffset = CSSPoint::FromUnknownPoint(newOffset);
   mFrameMetrics = metrics;
 }
 
@@ -940,7 +940,7 @@ const gfx::Rect AsyncPanZoomController::CalculatePendingDisplayPort(
       scrollableRect.height = compositionBounds.height;
   }
 
-  gfx::Point scrollOffset = aFrameMetrics.mScrollOffset;
+  CSSPoint scrollOffset = aFrameMetrics.mScrollOffset;
 
   gfx::Rect displayPort(0, 0,
                         compositionBounds.width * gXStationarySizeMultiplier,
@@ -1055,8 +1055,8 @@ void AsyncPanZoomController::RequestContentRepaint() {
                                 GetAccelerationVector(),
                                 estimatedPaintDuration);
 
-  gfx::Point oldScrollOffset = mLastPaintRequestMetrics.mScrollOffset,
-             newScrollOffset = mFrameMetrics.mScrollOffset;
+  CSSPoint oldScrollOffset = mLastPaintRequestMetrics.mScrollOffset,
+           newScrollOffset = mFrameMetrics.mScrollOffset;
 
   // If we're trying to paint what we already think is painted, discard this
   // request since it's a pointless paint.
@@ -1157,12 +1157,12 @@ bool AsyncPanZoomController::SampleContentTransformForFrame(const TimeStamp& aSa
                               startZoom * (1 - sampledPosition));
       mFrameMetrics.mZoom = gfxSize(sampledZoom, sampledZoom);
 
-      mFrameMetrics.mScrollOffset = gfx::Point(
+      mFrameMetrics.mScrollOffset = CSSPoint::FromUnknownPoint(gfx::Point(
         mEndZoomToMetrics.mScrollOffset.x * sampledPosition +
           mStartZoomToMetrics.mScrollOffset.x * (1 - sampledPosition),
         mEndZoomToMetrics.mScrollOffset.y * sampledPosition +
           mStartZoomToMetrics.mScrollOffset.y * (1 - sampledPosition)
-      );
+      ));
 
       requestAnimationFrame = true;
 
@@ -1191,7 +1191,7 @@ bool AsyncPanZoomController::SampleContentTransformForFrame(const TimeStamp& aSa
     }
 
     scrollOffset = gfxPoint(mFrameMetrics.mScrollOffset.x, mFrameMetrics.mScrollOffset.y);
-    mCurrentAsyncScrollOffset = mFrameMetrics.mScrollOffset;
+    mCurrentAsyncScrollOffset = mFrameMetrics.mScrollOffset.ToUnknownPoint();
   }
 
   // Cancel the mAsyncScrollTimeoutTask because we will fire a
@@ -1345,7 +1345,7 @@ void AsyncPanZoomController::ZoomToRect(const gfxRect& aRect) {
 
     nsIntRect compositionBounds = mFrameMetrics.mCompositionBounds;
     gfx::Rect cssPageRect = mFrameMetrics.mScrollableRect;
-    gfx::Point scrollOffset = mFrameMetrics.mScrollOffset;
+    CSSPoint scrollOffset = mFrameMetrics.mScrollOffset;
     gfxSize resolution = CalculateResolution(mFrameMetrics);
     gfxSize currentZoom = mFrameMetrics.mZoom;
     float targetZoom;
@@ -1419,7 +1419,8 @@ void AsyncPanZoomController::ZoomToRect(const gfxRect& aRect) {
     }
 
     mStartZoomToMetrics = mFrameMetrics;
-    mEndZoomToMetrics.mScrollOffset = gfx::Point(zoomToRect.x, zoomToRect.y);
+    mEndZoomToMetrics.mScrollOffset = CSSPoint::FromUnknownPoint(
+      gfx::Point(zoomToRect.x, zoomToRect.y));
 
     mAnimationStartTime = TimeStamp::Now();
 
diff --git a/gfx/layers/ipc/Axis.cpp b/gfx/layers/ipc/Axis.cpp
index 6d2241a7e29..6eb16f6698f 100644
--- a/gfx/layers/ipc/Axis.cpp
+++ b/gfx/layers/ipc/Axis.cpp
@@ -292,7 +292,7 @@ float Axis::GetPageEnd() {
 }
 
 float Axis::GetOrigin() {
-  gfx::Point origin = mAsyncPanZoomController->GetFrameMetrics().mScrollOffset;
+  CSSPoint origin = mAsyncPanZoomController->GetFrameMetrics().mScrollOffset;
   return GetPointOffset(origin);
 }
 
@@ -334,7 +334,7 @@ AxisX::AxisX(AsyncPanZoomController* aAsyncPanZoomController)
 
 }
 
-float AxisX::GetPointOffset(const gfx::Point& aPoint)
+float AxisX::GetPointOffset(const CSSPoint& aPoint)
 {
   return aPoint.x;
 }
@@ -355,7 +355,7 @@ AxisY::AxisY(AsyncPanZoomController* aAsyncPanZoomController)
 
 }
 
-float AxisY::GetPointOffset(const gfx::Point& aPoint)
+float AxisY::GetPointOffset(const CSSPoint& aPoint)
 {
   return aPoint.y;
 }
diff --git a/gfx/layers/ipc/Axis.h b/gfx/layers/ipc/Axis.h
index e613c357283..85a13eb5f17 100644
--- a/gfx/layers/ipc/Axis.h
+++ b/gfx/layers/ipc/Axis.h
@@ -11,6 +11,7 @@
 #include "mozilla/TimeStamp.h"
 #include "mozilla/gfx/2D.h"
 #include "nsTArray.h"
+#include "Units.h"
 
 namespace mozilla {
 namespace layers {
@@ -170,7 +171,7 @@ public:
   float GetCompositionEnd();
   float GetPageEnd();
 
-  virtual float GetPointOffset(const gfx::Point& aPoint) = 0;
+  virtual float GetPointOffset(const CSSPoint& aPoint) = 0;
   virtual float GetRectLength(const gfx::Rect& aRect) = 0;
   virtual float GetRectOffset(const gfx::Rect& aRect) = 0;
 
@@ -191,7 +192,7 @@ protected:
 class AxisX : public Axis {
 public:
   AxisX(AsyncPanZoomController* mAsyncPanZoomController);
-  virtual float GetPointOffset(const gfx::Point& aPoint);
+  virtual float GetPointOffset(const CSSPoint& aPoint);
   virtual float GetRectLength(const gfx::Rect& aRect);
   virtual float GetRectOffset(const gfx::Rect& aRect);
 };
@@ -199,7 +200,7 @@ public:
 class AxisY : public Axis {
 public:
   AxisY(AsyncPanZoomController* mAsyncPanZoomController);
-  virtual float GetPointOffset(const gfx::Point& aPoint);
+  virtual float GetPointOffset(const CSSPoint& aPoint);
   virtual float GetRectLength(const gfx::Rect& aRect);
   virtual float GetRectOffset(const gfx::Rect& aRect);
 };
diff --git a/ipc/glue/IPCMessageUtils.h b/ipc/glue/IPCMessageUtils.h
index 61885b94b71..4032718d63c 100644
--- a/ipc/glue/IPCMessageUtils.h
+++ b/ipc/glue/IPCMessageUtils.h
@@ -788,10 +788,10 @@ struct ParamTraits<nsIntSize>
   }
 };
 
-template<>
-struct ParamTraits<mozilla::gfx::Point>
+template<class T>
+struct ParamTraits< mozilla::gfx::PointTyped<T> >
 {
-  typedef mozilla::gfx::Point paramType;
+  typedef mozilla::gfx::PointTyped<T> paramType;
 
   static void Write(Message* msg, const paramType& param)
   {
diff --git a/layout/base/Units.h b/layout/base/Units.h
new file mode 100644
index 00000000000..1ff7f3d9ca6
--- /dev/null
+++ b/layout/base/Units.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 20; 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/. */
+
+#ifndef MOZ_UNITS_H_
+#define MOZ_UNITS_H_
+
+#include "mozilla/gfx/Point.h"
+#include "nsDeviceContext.h"
+
+namespace mozilla {
+
+// The pixels that content authors use to specify sizes in.
+struct CSSPixel {
+  static gfx::PointTyped<CSSPixel> FromAppUnits(const nsPoint &pt) {
+    return gfx::PointTyped<CSSPixel>(NSAppUnitsToFloatPixels(pt.x, float(nsDeviceContext::AppUnitsPerCSSPixel())),
+                                     NSAppUnitsToFloatPixels(pt.y, float(nsDeviceContext::AppUnitsPerCSSPixel())));
+  }
+
+  static nsPoint ToAppUnits(const gfx::PointTyped<CSSPixel> &pt) {
+    return nsPoint(NSFloatPixelsToAppUnits(pt.x, float(nsDeviceContext::AppUnitsPerCSSPixel())),
+                   NSFloatPixelsToAppUnits(pt.y, float(nsDeviceContext::AppUnitsPerCSSPixel())));
+  }
+};
+
+typedef gfx::PointTyped<CSSPixel> CSSPoint;
+
+};
+
+#endif
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 09e2c7fceab..dc280c40428 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -42,6 +42,7 @@ EXPORTS += [
     'FrameLayerBuilder.h',
     'FramePropertyTable.h',
     'StackArena.h',
+    'Units.h',
     'nsArenaMemoryStats.h',
     'nsBidi.h',
     'nsBidiPresUtils.h',
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 8792422a892..417c3e4a250 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -618,7 +618,6 @@ static void RecordFrameMetrics(nsIFrame* aForFrame,
                                bool aMayHaveTouchListeners) {
   nsPresContext* presContext = aForFrame->PresContext();
   int32_t auPerDevPixel = presContext->AppUnitsPerDevPixel();
-  float auPerCSSPixel = nsPresContext::AppUnitsPerCSSPixel();
 
   nsIntRect visible = aVisibleRect.ScaleToNearestPixels(
     aContainerParameters.mXScale, aContainerParameters.mYScale, auPerDevPixel);
@@ -664,9 +663,7 @@ static void RecordFrameMetrics(nsIFrame* aForFrame,
     metrics.mContentRect = contentBounds.ScaleToNearestPixels(
       aContainerParameters.mXScale, aContainerParameters.mYScale, auPerDevPixel);
     nsPoint scrollPosition = scrollableFrame->GetScrollPosition();
-    metrics.mScrollOffset = mozilla::gfx::Point(
-      NSAppUnitsToDoublePixels(scrollPosition.x, auPerCSSPixel),
-      NSAppUnitsToDoublePixels(scrollPosition.y, auPerCSSPixel));
+    metrics.mScrollOffset = CSSPoint::FromAppUnits(scrollPosition);
   }
   else {
     nsRect contentBounds = aForFrame->GetRect();
@@ -687,7 +684,8 @@ static void RecordFrameMetrics(nsIFrame* aForFrame,
   }
   metrics.mResolution = gfxSize(presShell->GetXResolution(), presShell->GetYResolution());
 
-  metrics.mDevPixelsPerCSSPixel = auPerCSSPixel / auPerDevPixel;
+  metrics.mDevPixelsPerCSSPixel =
+    (float)nsPresContext::AppUnitsPerCSSPixel() / auPerDevPixel;
 
   metrics.mMayHaveTouchListeners = aMayHaveTouchListeners;
 
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 74446c6b7c2..5a3fc5bf149 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1609,10 +1609,9 @@ nsGfxScrollFrameInner::ScrollToCSSPixels(nsIntPoint aScrollPosition)
 }
 
 void
-nsGfxScrollFrameInner::ScrollToCSSPixelsApproximate(const Point& aScrollPosition)
+nsGfxScrollFrameInner::ScrollToCSSPixelsApproximate(const CSSPoint& aScrollPosition)
 {
-  nsPoint pt(nsPresContext::CSSPixelsToAppUnits(aScrollPosition.x),
-             nsPresContext::CSSPixelsToAppUnits(aScrollPosition.y));
+  nsPoint pt = CSSPoint::ToAppUnits(aScrollPosition);
   nscoord halfRange = nsPresContext::CSSPixelsToAppUnits(1000);
   nsRect range(pt.x - halfRange, pt.y - halfRange, 2*halfRange - 1, 2*halfRange - 1);
   ScrollTo(pt, nsIScrollableFrame::INSTANT, &range);
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index ca4d274ed01..74e43e0fd6b 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -47,7 +47,6 @@ class ScrollbarActivity;
 
 class nsGfxScrollFrameInner : public nsIReflowCallback {
 public:
-  typedef mozilla::gfx::Point Point;
   typedef mozilla::layout::ScrollbarActivity ScrollbarActivity;
 
   class AsyncScroll;
@@ -172,7 +171,7 @@ public:
     ScrollToWithOrigin(aScrollPosition, aMode, nsGkAtoms::other, aRange);
   }
   void ScrollToCSSPixels(nsIntPoint aScrollPosition);
-  void ScrollToCSSPixelsApproximate(const Point& aScrollPosition);
+  void ScrollToCSSPixelsApproximate(const mozilla::CSSPoint& aScrollPosition);
   nsIntPoint GetScrollPositionCSSPixels();
   void ScrollToImpl(nsPoint aScrollPosition, const nsRect& aRange);
   void ScrollVisual(nsPoint aOldScrolledFramePosition);
@@ -520,7 +519,7 @@ public:
   virtual void ScrollToCSSPixels(nsIntPoint aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixels(aScrollPosition);
   }
-  virtual void ScrollToCSSPixelsApproximate(const Point& aScrollPosition) MOZ_OVERRIDE {
+  virtual void ScrollToCSSPixelsApproximate(const mozilla::CSSPoint& aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixelsApproximate(aScrollPosition);
   }
   virtual nsIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
@@ -783,7 +782,7 @@ public:
   virtual void ScrollToCSSPixels(nsIntPoint aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixels(aScrollPosition);
   }
-  virtual void ScrollToCSSPixelsApproximate(const Point& aScrollPosition) MOZ_OVERRIDE {
+  virtual void ScrollToCSSPixelsApproximate(const mozilla::CSSPoint& aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixelsApproximate(aScrollPosition);
   }
   virtual nsIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
diff --git a/layout/generic/nsIScrollableFrame.h b/layout/generic/nsIScrollableFrame.h
index b149b510dcc..430c683264c 100644
--- a/layout/generic/nsIScrollableFrame.h
+++ b/layout/generic/nsIScrollableFrame.h
@@ -15,6 +15,7 @@
 #include "nsPresContext.h"
 #include "mozilla/gfx/Point.h"
 #include "nsIScrollbarOwner.h"
+#include "Units.h"
 
 #define NS_DEFAULT_VERTICAL_SCROLL_DISTANCE   3
 #define NS_DEFAULT_HORIZONTAL_SCROLL_DISTANCE 5
@@ -30,8 +31,6 @@ class nsIFrame;
  */
 class nsIScrollableFrame : public nsIScrollbarOwner {
 public:
-  typedef mozilla::gfx::Point Point;
-
   NS_DECL_QUERYFRAME_TARGET(nsIScrollableFrame)
 
   /**
@@ -166,7 +165,8 @@ public:
    * number of layer pixels (so the operation is fast and looks clean).
    * The scroll mode is INSTANT.
    */
-  virtual void ScrollToCSSPixelsApproximate(const Point& aScrollPosition) = 0;
+  virtual void ScrollToCSSPixelsApproximate(const mozilla::CSSPoint& aScrollPosition) = 0;
+
   /**
    * Returns the scroll position in integer CSS pixels, rounded to the nearest
    * pixel.

From 9a5d492da7563d69200ad0f1cfe6240a4e902b44 Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Thu, 30 May 2013 09:50:50 -0400
Subject: [PATCH 57/85] Bug 867770 - Layerize all animated images.
 r=mattwoodrow

---
 layout/base/nsCSSRendering.cpp  | 12 +++++++++
 layout/base/nsCSSRendering.h    |  1 +
 layout/base/nsDisplayList.cpp   | 42 ++++++++++++++++-------------
 layout/base/nsDisplayList.h     |  2 ++
 layout/generic/nsImageFrame.cpp | 47 +++++++++++++++++++--------------
 5 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index a83bea7219a..7a54a5de048 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -4688,6 +4688,18 @@ nsImageRenderer::IsRasterImage()
   return mImageContainer->GetType() == imgIContainer::TYPE_RASTER;
 }
 
+bool
+nsImageRenderer::IsAnimatedImage()
+{
+  if (mType != eStyleImageType_Image || !mImageContainer)
+    return false;
+  bool animated = false;
+  if (NS_SUCCEEDED(mImageContainer->GetAnimated(&animated)) && animated)
+    return true;
+
+  return false;
+}
+
 already_AddRefed<mozilla::layers::ImageContainer>
 nsImageRenderer::GetContainer(LayerManager* aManager)
 {
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index fc3e97276b4..6e4435baf1a 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -63,6 +63,7 @@ public:
             const nsRect&        aDirty);
 
   bool IsRasterImage();
+  bool IsAnimatedImage();
   already_AddRefed<ImageContainer> GetContainer(LayerManager* aManager);
 
 private:
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 417c3e4a250..97b5ac15979 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1559,6 +1559,7 @@ nsDisplayBackgroundImage::nsDisplayBackgroundImage(nsDisplayListBuilder* aBuilde
   , mLayer(aLayer)
   , mIsThemed(aIsThemed)
   , mIsBottommostLayer(true)
+  , mIsAnimated(false)
 {
   MOZ_COUNT_CTOR(nsDisplayBackgroundImage);
 
@@ -1820,6 +1821,7 @@ nsDisplayBackgroundImage::TryOptimizeToImageLayer(LayerManager* aManager,
   int32_t appUnitsPerDevPixel = presContext->AppUnitsPerDevPixel();
   mDestRect = nsLayoutUtils::RectToGfxRect(state.mDestArea, appUnitsPerDevPixel);
   mImageContainer = imageContainer;
+  mIsAnimated = imageRenderer->IsAnimatedImage();
 
   // Ok, we can turn this into a layer if needed.
   return true;
@@ -1843,31 +1845,35 @@ nsDisplayBackgroundImage::GetLayerState(nsDisplayListBuilder* aBuilder,
                                         LayerManager* aManager,
                                         const FrameLayerBuilder::ContainerParameters& aParameters)
 {
-  if (!aManager->IsCompositingCheap() ||
-      !nsLayoutUtils::GPUImageScalingEnabled() ||
-      !TryOptimizeToImageLayer(aManager, aBuilder)) {
-    return LAYER_NONE;
+  if (!TryOptimizeToImageLayer(aManager, aBuilder) ||
+      !mIsAnimated) {
+    if (!aManager->IsCompositingCheap() ||
+        !nsLayoutUtils::GPUImageScalingEnabled()) {
+      return LAYER_NONE;
+    }
   }
 
-  gfxSize imageSize = mImageContainer->GetCurrentSize();
-  NS_ASSERTION(imageSize.width != 0 && imageSize.height != 0, "Invalid image size!");
+  if (!mIsAnimated) {
+    gfxSize imageSize = mImageContainer->GetCurrentSize();
+    NS_ASSERTION(imageSize.width != 0 && imageSize.height != 0, "Invalid image size!");
 
-  gfxRect destRect = mDestRect;
+    gfxRect destRect = mDestRect;
 
-  destRect.width *= aParameters.mXScale;
-  destRect.height *= aParameters.mYScale;
+    destRect.width *= aParameters.mXScale;
+    destRect.height *= aParameters.mYScale;
 
-  // Calculate the scaling factor for the frame.
-  gfxSize scale = gfxSize(destRect.width / imageSize.width, destRect.height / imageSize.height);
+    // Calculate the scaling factor for the frame.
+    gfxSize scale = gfxSize(destRect.width / imageSize.width, destRect.height / imageSize.height);
 
-  // If we are not scaling at all, no point in separating this into a layer.
-  if (scale.width == 1.0f && scale.height == 1.0f) {
-    return LAYER_NONE;
-  }
+    // If we are not scaling at all, no point in separating this into a layer.
+    if (scale.width == 1.0f && scale.height == 1.0f) {
+      return LAYER_NONE;
+    }
 
-  // If the target size is pretty small, no point in using a layer.
-  if (destRect.width * destRect.height < 64 * 64) {
-    return LAYER_NONE;
+    // If the target size is pretty small, no point in using a layer.
+    if (destRect.width * destRect.height < 64 * 64) {
+      return LAYER_NONE;
+    }
   }
 
   return LAYER_ACTIVE;
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 1eca3b8fd34..ecda275723c 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -2030,6 +2030,8 @@ protected:
   bool mIsThemed;
   /* true if this item represents the bottom-most background layer */
   bool mIsBottommostLayer;
+  /* true if this image is known to be animated */
+  bool mIsAnimated;
 };
 
 class nsDisplayBackgroundColor : public nsDisplayItem
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index f0944c95da7..3652fee1fc3 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1258,35 +1258,42 @@ nsDisplayImage::GetLayerState(nsDisplayListBuilder* aBuilder,
                               LayerManager* aManager,
                               const FrameLayerBuilder::ContainerParameters& aParameters)
 {
+  bool animated = false;
   if (mImage->GetType() != imgIContainer::TYPE_RASTER ||
-      !aManager->IsCompositingCheap() ||
-      !nsLayoutUtils::GPUImageScalingEnabled()) {
-    return LAYER_NONE;
+      NS_FAILED(mImage->GetAnimated(&animated)) ||
+      !animated) {
+    if (!aManager->IsCompositingCheap() ||
+        !nsLayoutUtils::GPUImageScalingEnabled()) {
+      return LAYER_NONE;
+    }
   }
 
-  int32_t imageWidth;
-  int32_t imageHeight;
-  mImage->GetWidth(&imageWidth);
-  mImage->GetHeight(&imageHeight);
+  if (!animated) {
+    int32_t imageWidth;
+    int32_t imageHeight;
+    mImage->GetWidth(&imageWidth);
+    mImage->GetHeight(&imageHeight);
 
-  NS_ASSERTION(imageWidth != 0 && imageHeight != 0, "Invalid image size!");
+    NS_ASSERTION(imageWidth != 0 && imageHeight != 0, "Invalid image size!");
 
-  gfxRect destRect = GetDestRect();
+    gfxRect destRect = GetDestRect();
 
-  destRect.width *= aParameters.mXScale;
-  destRect.height *= aParameters.mYScale;
+    destRect.width *= aParameters.mXScale;
+    destRect.height *= aParameters.mYScale;
 
-  // Calculate the scaling factor for the frame.
-  gfxSize scale = gfxSize(destRect.width / imageWidth, destRect.height / imageHeight);
+    // Calculate the scaling factor for the frame.
+    gfxSize scale = gfxSize(destRect.width / imageWidth,
+                            destRect.height / imageHeight);
 
-  // If we are not scaling at all, no point in separating this into a layer.
-  if (scale.width == 1.0f && scale.height == 1.0f) {
-    return LAYER_NONE;
-  }
+    // If we are not scaling at all, no point in separating this into a layer.
+    if (scale.width == 1.0f && scale.height == 1.0f) {
+      return LAYER_NONE;
+    }
 
-  // If the target size is pretty small, no point in using a layer.
-  if (destRect.width * destRect.height < 64 * 64) {
-    return LAYER_NONE;
+    // If the target size is pretty small, no point in using a layer.
+    if (destRect.width * destRect.height < 64 * 64) {
+      return LAYER_NONE;
+    }
   }
 
   nsRefPtr<ImageContainer> container;

From c4c196188fcbc256636033a135e3875a2e7aaa1c Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Thu, 30 May 2013 21:33:17 -0400
Subject: [PATCH 58/85] Bug 867770 - Add a pref as to whether we layerize
 animated images, disabled by default. r=mattwoodrow

---
 layout/base/nsDisplayList.cpp   |  1 +
 layout/base/nsLayoutUtils.cpp   | 16 ++++++++++++++++
 layout/base/nsLayoutUtils.h     |  5 +++++
 layout/generic/nsImageFrame.cpp |  3 ++-
 modules/libpref/src/init/all.js |  3 +++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 97b5ac15979..8f973cd4919 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1846,6 +1846,7 @@ nsDisplayBackgroundImage::GetLayerState(nsDisplayListBuilder* aBuilder,
                                         const FrameLayerBuilder::ContainerParameters& aParameters)
 {
   if (!TryOptimizeToImageLayer(aManager, aBuilder) ||
+      !nsLayoutUtils::AnimatedImageLayersEnabled() ||
       !mIsAnimated) {
     if (!aManager->IsCompositingCheap() ||
         !nsLayoutUtils::GPUImageScalingEnabled()) {
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 8db5fd1807f..496e3007aa9 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -382,6 +382,22 @@ nsLayoutUtils::GPUImageScalingEnabled()
   return sGPUImageScalingEnabled;
 }
 
+bool
+nsLayoutUtils::AnimatedImageLayersEnabled()
+{
+  static bool sAnimatedImageLayersEnabled;
+  static bool sAnimatedImageLayersPrefCached = false;
+
+  if (!sAnimatedImageLayersPrefCached) {
+    sAnimatedImageLayersPrefCached = true;
+    Preferences::AddBoolVarCache(&sAnimatedImageLayersEnabled,
+                                 "layout.animated-image-layers.enabled",
+                                 false);
+  }
+
+  return sAnimatedImageLayersEnabled;
+}
+
 void
 nsLayoutUtils::UnionChildOverflow(nsIFrame* aFrame,
                                   nsOverflowAreas& aOverflowAreas)
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index a8d7174de67..fa38fef2b1e 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -1613,6 +1613,11 @@ public:
    */
   static bool GPUImageScalingEnabled();
 
+  /**
+   * Checks whether we want to layerize animated images whenever possible.
+   */
+  static bool AnimatedImageLayersEnabled();
+
   /**
    * Unions the overflow areas of all non-popup children of aFrame with
    * aOverflowAreas.
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 3652fee1fc3..c038789908e 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1259,7 +1259,8 @@ nsDisplayImage::GetLayerState(nsDisplayListBuilder* aBuilder,
                               const FrameLayerBuilder::ContainerParameters& aParameters)
 {
   bool animated = false;
-  if (mImage->GetType() != imgIContainer::TYPE_RASTER ||
+  if (!nsLayoutUtils::AnimatedImageLayersEnabled() ||
+      mImage->GetType() != imgIContainer::TYPE_RASTER ||
       NS_FAILED(mImage->GetAnimated(&animated)) ||
       !animated) {
     if (!aManager->IsCompositingCheap() ||
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 114acdf4c48..cdfb53cb6b0 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4078,6 +4078,9 @@ pref("dom.event.handling-user-input-time-limit", 1000);
 //3D Transforms
 pref("layout.3d-transforms.enabled", true);
 
+// Whether we should layerize all animated images (if otherwise possible).
+pref("layout.animated-image-layers.enabled", false);
+
 pref("dom.vibrator.enabled", true);
 pref("dom.vibrator.max_vibrate_ms", 10000);
 pref("dom.vibrator.max_vibrate_list_len", 128);

From a7e0d442e82fd75420f0b1fe95e0f8d932b79468 Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Thu, 30 May 2013 21:33:17 -0400
Subject: [PATCH 59/85] Bug 867770 - Test to make sure that animated images are
 layerized correctly when the pref is enabled. r=mattwoodrow

---
 .../image_rgrg-256x256-animated.gif             | Bin 0 -> 1748 bytes
 layout/reftests/invalidation/reftest.list       |   2 ++
 .../test-animated-image-layers-background.html  |  16 ++++++++++++++++
 .../test-animated-image-layers-ref.html         |   8 ++++++++
 .../test-animated-image-layers.html             |  16 ++++++++++++++++
 5 files changed, 42 insertions(+)
 create mode 100644 layout/reftests/invalidation/image_rgrg-256x256-animated.gif
 create mode 100644 layout/reftests/invalidation/test-animated-image-layers-background.html
 create mode 100644 layout/reftests/invalidation/test-animated-image-layers-ref.html
 create mode 100644 layout/reftests/invalidation/test-animated-image-layers.html

diff --git a/layout/reftests/invalidation/image_rgrg-256x256-animated.gif b/layout/reftests/invalidation/image_rgrg-256x256-animated.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c03fad8bb09fb01a92f545cbccef322eec84a0dd
GIT binary patch
literal 1748
zcmZ?wbhEHbWME`qT*$=0@E-^n{)2(yPZmxt1||j_1`q(sGcf(@>0f#JE&t*<JU6;G
z-`n$>zwOb9z-OJyR(WoF$9?>**Y$6)Cx4y$F3rcorMhp?M-3^h>0V1dzfAF3ZnEO*
zs>NB`UDkY;e$;iGbHmR$imQ*l*jCBAeAn|EJ8C`8+rR&_;9vd~^$g~S6UH4Yl6FW;
zesSWEgy$y@NySRZu$42LZ~olO+4aD3mROco7gs{nEUR5ow_g3)CHdOYJG#4a^~}|~
zy>C|k<d%`K{1cH=GiSz`9cS+3{OFO;wbhM?t>~Tmcl+JzZ~xYcuQT_H^DEDrzHT4i
zb-V9;^7qa5hvnD%PwU@y{{H*3_GXL+c~l}UoOaaX+^=)zQouuJOTqO%OCkhM9sQ>%
zxi)9YrNGDTHj0aTa)N|TdQQ<~UMq6x(+TexhTUhr1YbVxt6*9BZqLQd$Nd*Lmh-5F
zn4G?-<(aCJdQ0TkWzj%sU*EvcSD_-2@i|X#l^zTCNObQ}jW)Y{Q!n%Cy4DM3C!@U!
z9nUO{zJ54%N9EUdr5CQhkN0ad<;e@!apWOur@gM;<sDa&11B2#w8h*!lzM7rXs+3X
z$j{Fi7TVV9+0H6?ab<=3cDuc|N^@?^jXZzvkJR_Kr*~GqpLa+4$NS?4JNe^dWPW};
zd~&9~{2iHJpZ8x}>3=_3_V?G_H+SaGzb*Uc`}T(?`{SeK{{Gzj^5%N^+j9SYumAY+
z{QW5T|9@Bi{P*+y{9E!3OaFckX<!xFF{P1HsbWeKuaU)+W<jSPlUqcCc1&)SOsbgN
zCR=1Nxm~g8$D|I`NjoNWYA&jn)TO)0Vp6x^p&t`_OfT)2*lYQyVq%}|CyR;wj!Zu%
zOmG$2IbouwQssn6zDAZ4CI>qG?4J@Ew6lL|WKw1SwAdoc{^^NLKl^5+PTJWwGjma8
z->lqCmVL7e5B=<&Q+jD<@7&5qmA&(7KUwz9Z)Ez_v!GRISI@#urK+Aqy+&3&izhn$
z>RvK6Xjk{rnMqaM%jOnYbuVAo^s8&d(n-6zR<2xh$}4x%POs>+Z3kCLuibZ3OJ?1%
zm#bvfpZlpLyWtw=YT1qVB(=TeHa*i^Ew}ldrMCQ*Z=S2=xBiRNR@la#wOe63f0ec3
z4)LztiaX_JSu5>QU$t9lxBf0`<vr%7b}R3-zh$km&;8YImHqy|tW^*E7hzxkW-dl9
S2IkSsHJZ6bGZ(cpmo)${7=cXy

literal 0
HcmV?d00001

diff --git a/layout/reftests/invalidation/reftest.list b/layout/reftests/invalidation/reftest.list
index 54862f02a4a..79f10fcb51e 100644
--- a/layout/reftests/invalidation/reftest.list
+++ b/layout/reftests/invalidation/reftest.list
@@ -5,3 +5,5 @@
 == 540247-1.xul 540247-1-ref.xul
 == 543681-1.html 543681-1-ref.html
 == test-image-layers.html test-image-layers-ref.html
+pref(layout.animated-image-layers.enabled,true) == test-animated-image-layers.html test-animated-image-layers-ref.html
+pref(layout.animated-image-layers.enabled,true) == test-animated-image-layers-background.html test-animated-image-layers-ref.html
diff --git a/layout/reftests/invalidation/test-animated-image-layers-background.html b/layout/reftests/invalidation/test-animated-image-layers-background.html
new file mode 100644
index 00000000000..06ebb2fbd3d
--- /dev/null
+++ b/layout/reftests/invalidation/test-animated-image-layers-background.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body>
+<div>
+<div id="image" style="width: 256px; height: 256px; background-image: url('image_rgrg-256x256-animated.gif');" class="reftest-no-paint"></div>
+</div>
+<script type="application/javascript">
+
+function doTest() {
+  document.body.style.background = "black";
+  document.documentElement.removeAttribute("class");
+}
+document.addEventListener("MozReftestInvalidate", doTest, false);
+</script>
+</body>
+</html>
diff --git a/layout/reftests/invalidation/test-animated-image-layers-ref.html b/layout/reftests/invalidation/test-animated-image-layers-ref.html
new file mode 100644
index 00000000000..d8bfb865563
--- /dev/null
+++ b/layout/reftests/invalidation/test-animated-image-layers-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:black">
+<div>
+<img id="image" src="./image_rgrg-256x256.png"></img>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/invalidation/test-animated-image-layers.html b/layout/reftests/invalidation/test-animated-image-layers.html
new file mode 100644
index 00000000000..3eecf7f5057
--- /dev/null
+++ b/layout/reftests/invalidation/test-animated-image-layers.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<body>
+<div>
+<img id="image" class="reftest-no-paint" src="./image_rgrg-256x256-animated.gif"></img>
+</div>
+<script type="application/javascript">
+
+function doTest() {
+  document.body.style.background = "black";
+  document.documentElement.removeAttribute("class");
+}
+document.addEventListener("MozReftestInvalidate", doTest, false);
+</script>
+</body>
+</html>

From 3fb03ee4f9936a8ad646a47e3c2fb83a77bc0135 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 30 May 2013 22:11:26 -0400
Subject: [PATCH 60/85] Backed out 5 changesets (bug 872388) for Android 2.2
 bustage on a CLOSED TREE.

Backed out changeset f2fbb5c6cfc7 (bug 872388)
Backed out changeset 416f9cdde0f7 (bug 872388)
Backed out changeset 684ba082942b (bug 872388)
Backed out changeset 7acb6c63fdf4 (bug 872388)
Backed out changeset 2076903c21fa (bug 872388)
---
 mobile/android/base/AwesomeBar.java           | 113 ++++++++-
 mobile/android/base/BrowserApp.java           |  57 +----
 mobile/android/base/EditBookmarkDialog.java   | 237 ------------------
 mobile/android/base/Makefile.in               |   8 -
 mobile/android/base/db/BrowserDB.java         |   6 -
 mobile/android/base/db/LocalBrowserDB.java    |  19 --
 .../base/locales/en-US/android_strings.dtd    |   1 -
 .../base/resources/drawable-mdpi/toast.9.png  | Bin 839 -> 0 bytes
 .../drawable-mdpi/toast_button_focused.9.png  | Bin 311 -> 0 bytes
 .../drawable-mdpi/toast_button_pressed.9.png  | Bin 311 -> 0 bytes
 .../drawable-mdpi/toast_divider.9.png         | Bin 963 -> 0 bytes
 .../base/resources/drawable/toast_button.xml  |  20 --
 .../base/resources/layout/gecko_app.xml       |  11 -
 .../android/base/resources/values/styles.xml  |  48 ----
 mobile/android/base/strings.xml.in            |   1 -
 mobile/android/base/widget/ButtonToast.java   | 150 -----------
 16 files changed, 114 insertions(+), 557 deletions(-)
 delete mode 100644 mobile/android/base/EditBookmarkDialog.java
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast_button_pressed.9.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/toast_divider.9.png
 delete mode 100644 mobile/android/base/resources/drawable/toast_button.xml
 delete mode 100644 mobile/android/base/widget/ButtonToast.java

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index 2e1c1f3ce81..4da8bece5e1 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -15,7 +15,9 @@ import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UiAsyncTask;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
@@ -553,6 +555,62 @@ public class AwesomeBar extends GeckoActivity
         mContextMenuSubject = tab.getSubject(menu, view, menuInfo);
     }
 
+    private abstract class EditBookmarkTextWatcher implements TextWatcher {
+        protected AlertDialog mDialog;
+        protected EditBookmarkTextWatcher mPairedTextWatcher;
+        protected boolean mEnabled = true;
+
+        public EditBookmarkTextWatcher(AlertDialog aDialog) {
+            mDialog = aDialog;
+        }
+
+        public void setPairedTextWatcher(EditBookmarkTextWatcher aTextWatcher) {
+            mPairedTextWatcher = aTextWatcher;
+        }
+
+        public boolean isEnabled() {
+            return mEnabled;
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            // Disable if the we're disabled or paired partner is disabled
+            boolean enabled = mEnabled && (mPairedTextWatcher == null || mPairedTextWatcher.isEnabled());
+            mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled);
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {}
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+    }
+
+    private class LocationTextWatcher extends EditBookmarkTextWatcher implements TextWatcher {
+        public LocationTextWatcher(AlertDialog aDialog) {
+            super(aDialog);
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            // Disable if the location is empty
+            mEnabled = (s.toString().trim().length() > 0);
+            super.onTextChanged(s, start, before, count);
+        }
+    }
+
+    private class KeywordTextWatcher extends EditBookmarkTextWatcher implements TextWatcher {
+        public KeywordTextWatcher(AlertDialog aDialog) {
+            super(aDialog);
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            // Disable if the keyword contains spaces
+            mEnabled = (s.toString().trim().indexOf(' ') == -1);
+            super.onTextChanged(s, start, before, count);
+       }
+    }
+
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         if (mContextMenuSubject == null)
@@ -595,7 +653,60 @@ public class AwesomeBar extends GeckoActivity
                 break;
             }
             case R.id.edit_bookmark: {
-                new EditBookmarkDialog(this).show(id, title, url, keyword);
+                AlertDialog.Builder editPrompt = new AlertDialog.Builder(this);
+                final View editView = getLayoutInflater().inflate(R.layout.bookmark_edit, null);
+                editPrompt.setTitle(R.string.bookmark_edit_title);
+                editPrompt.setView(editView);
+
+                final EditText nameText = ((EditText) editView.findViewById(R.id.edit_bookmark_name));
+                final EditText locationText = ((EditText) editView.findViewById(R.id.edit_bookmark_location));
+                final EditText keywordText = ((EditText) editView.findViewById(R.id.edit_bookmark_keyword));
+                nameText.setText(title);
+                locationText.setText(url);
+                keywordText.setText(keyword);
+
+                editPrompt.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int whichButton) {
+                        (new UiAsyncTask<Void, Void, Void>(ThreadUtils.getBackgroundHandler()) {
+                            @Override
+                            public Void doInBackground(Void... params) {
+                                String newUrl = locationText.getText().toString().trim();
+                                String newKeyword = keywordText.getText().toString().trim();
+                                BrowserDB.updateBookmark(getContentResolver(), id, newUrl, nameText.getText().toString(), newKeyword);
+                                return null;
+                            }
+
+                            @Override
+                            public void onPostExecute(Void result) {
+                                Toast.makeText(AwesomeBar.this, R.string.bookmark_updated, Toast.LENGTH_SHORT).show();
+                            }
+                        }).execute();
+                    }
+                });
+
+                editPrompt.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int whichButton) {
+                          // do nothing
+                      }
+                });
+
+                final AlertDialog dialog = editPrompt.create();
+
+                // Create our TextWatchers
+                LocationTextWatcher locationTextWatcher = new LocationTextWatcher(dialog);
+                KeywordTextWatcher keywordTextWatcher = new KeywordTextWatcher(dialog);
+
+                // Cross reference the TextWatchers
+                locationTextWatcher.setPairedTextWatcher(keywordTextWatcher);
+                keywordTextWatcher.setPairedTextWatcher(locationTextWatcher);
+
+                // Add the TextWatcher Listeners
+                locationText.addTextChangedListener(locationTextWatcher);
+                keywordText.addTextChangedListener(keywordTextWatcher);
+
+                dialog.show();
                 break;
             }
             case R.id.remove_bookmark: {
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index b233c79ce98..a1af84c7280 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -21,7 +21,6 @@ import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UiAsyncTask;
 import org.mozilla.gecko.widget.AboutHome;
-import org.mozilla.gecko.widget.ButtonToast;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -33,7 +32,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.PointF;
@@ -88,8 +86,6 @@ abstract public class BrowserApp extends GeckoApp
     private static final int READER_ADD_FAILED = 1;
     private static final int READER_ADD_DUPLICATE = 2;
 
-    private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast";
-
     private static final String STATE_DYNAMIC_TOOLBAR_ENABLED = "dynamic_toolbar";
 
     public static BrowserToolbar mBrowserToolbar;
@@ -109,7 +105,7 @@ abstract public class BrowserApp extends GeckoApp
     }
 
     private Vector<MenuItemInfo> mAddonMenuItemsCache;
-    private ButtonToast mToast;
+
     private PropertyAnimator mMainLayoutAnimator;
 
     private static final Interpolator sTabsInterpolator = new Interpolator() {
@@ -366,15 +362,6 @@ abstract public class BrowserApp extends GeckoApp
 
         RelativeLayout actionBar = (RelativeLayout) findViewById(R.id.browser_toolbar);
 
-        mToast = new ButtonToast(findViewById(R.id.toast), new ButtonToast.ToastListener() {
-            @Override
-            public void onButtonClicked(CharSequence token) {
-                if (ADD_SHORTCUT_TOAST.equals(token)) {
-                    showBookmarkDialog();
-                }
-            }
-        });
-
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener());
         ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() {
             @Override
@@ -481,42 +468,6 @@ abstract public class BrowserApp extends GeckoApp
         });
     }
 
-    private void showBookmarkDialog() {
-        final Tab tab = Tabs.getInstance().getSelectedTab();
-        final Prompt ps = new Prompt(this, new Prompt.PromptCallback() {
-            @Override
-            public void onPromptFinished(String result) {
-                int itemId = -1;
-                try {
-                  itemId = new JSONObject(result).getInt("button");
-                } catch(Exception ex) {
-                    Log.e(LOGTAG, "Exception reading bookmark prompt result", ex);
-                }
-
-                if (tab == null)
-                    return;
-
-                if (itemId == 0) {
-                    new EditBookmarkDialog(BrowserApp.this).show(tab.getURL());
-                } else if (itemId == 1) {
-                    String url = tab.getURL();
-                    String title = tab.getDisplayTitle();
-                    Bitmap favicon = tab.getFavicon();
-                    if (url != null && title != null) {
-                        GeckoAppShell.createShortcut(title, url, url, favicon == null ? null : favicon, "");
-                    }
-                }
-            }
-        });
-
-        final Prompt.PromptListItem[] items = new Prompt.PromptListItem[2];
-        Resources res = getResources();
-        items[0] = new Prompt.PromptListItem(res.getString(R.string.contextmenu_edit_bookmark));
-        items[1] = new Prompt.PromptListItem(res.getString(R.string.contextmenu_add_to_launcher));
-
-        ps.show("", "", items, false);
-    }
-
     private void setDynamicToolbarEnabled(boolean enabled) {
         if (enabled) {
             if (mLayerView != null) {
@@ -1600,11 +1551,7 @@ abstract public class BrowserApp extends GeckoApp
                         item.setIcon(R.drawable.ic_menu_bookmark_add);
                     } else {
                         tab.addBookmark();
-                        mToast.show(false,
-                                    getResources().getString(R.string.bookmark_added),
-                                    getResources().getString(R.string.bookmark_options),
-                                    0,
-                                    ADD_SHORTCUT_TOAST);
+                        Toast.makeText(this, R.string.bookmark_added, Toast.LENGTH_SHORT).show();
                         item.setIcon(R.drawable.ic_menu_bookmark_remove);
                     }
                 }
diff --git a/mobile/android/base/EditBookmarkDialog.java b/mobile/android/base/EditBookmarkDialog.java
deleted file mode 100644
index 867717ecf55..00000000000
--- a/mobile/android/base/EditBookmarkDialog.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/* -*- 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;
-
-import org.mozilla.gecko.db.BrowserContract.Bookmarks;
-import org.mozilla.gecko.db.BrowserDB;
-import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.gecko.util.UiAsyncTask;
-
-import android.content.Context;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.database.Cursor;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * A dialog that allows editing a bookmarks url, title, or keywords
- * <p>
- * Invoked by calling one of the {@link org.mozilla.gecko.EditBookmarkDialog.show}
- * methods.
- */
-public class EditBookmarkDialog {
-    private static final String LOGTAG = "GeckoEditBookmarkDialog";
-    private Context mContext;
-
-    public EditBookmarkDialog(Context context) {
-        mContext = context;
-    }
-
-    /**
-     * A private struct to make it easier to pass bookmark data across threads
-     */
-    private class Bookmark {
-        int id;
-        String title;
-        String url;
-        String keyword;
-
-        public Bookmark(int aId, String aTitle, String aUrl, String aKeyword) {
-            id = aId;
-            title = aTitle;
-            url = aUrl;
-            keyword = aKeyword;
-        }
-    }
-
-    /**
-     * This text watcher to enable or disable the OK button if the dialog contains
-     * valid information. This class is overridden to do data checking diffferent fields.
-     * By itself, it always enables the button.
-     *
-     * Callers can also assing a paired partner to the TextWatcher, and callers will check
-     * that both are enabled before enabling the ok button.
-     */
-    private class EditBookmarkTextWatcher implements TextWatcher {
-        // A stored reference to the dialog containing the text field being watched
-        protected AlertDialog mDialog;
-
-        // A stored text watcher to do the real verification of a field
-        protected EditBookmarkTextWatcher mPairedTextWatcher;
-
-        // Whether or not the ok button should be enabled.
-        protected boolean mEnabled = true;
-
-        public EditBookmarkTextWatcher(AlertDialog aDialog) {
-            mDialog = aDialog;
-        }
-
-        public void setPairedTextWatcher(EditBookmarkTextWatcher aTextWatcher) {
-            mPairedTextWatcher = aTextWatcher;
-        }
-
-        public boolean isEnabled() {
-            return mEnabled;
-        }
-
-        // Textwatcher interface
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            // Disable if the we're disabled or the paired partner is disabled
-            boolean enabled = mEnabled && (mPairedTextWatcher == null || mPairedTextWatcher.isEnabled());
-            mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled);
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {}
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-    }
-
-    /**
-     * A version of the EditBookmarkTextWatcher for the url field of the dialog.
-     * Only checks if the field is empty or not.
-     */
-    private class LocationTextWatcher extends EditBookmarkTextWatcher {
-        public LocationTextWatcher(AlertDialog aDialog) {
-            super(aDialog);
-        }
-
-        // Disables the ok button if the location field is empty.
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            mEnabled = (s.toString().trim().length() > 0);
-            super.onTextChanged(s, start, before, count);
-        }
-    }
-
-    /**
-     * A version of the EditBookmarkTextWatcher for the keyword field of the dialog.
-     * Checks if the field has any (non leading or trailing) spaces.
-     */
-    private class KeywordTextWatcher extends EditBookmarkTextWatcher {
-        public KeywordTextWatcher(AlertDialog aDialog) {
-            super(aDialog);
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            // Disable if the keyword contains spaces
-            mEnabled = (s.toString().trim().indexOf(' ') == -1);
-            super.onTextChanged(s, start, before, count);
-       }
-    }
-
-    /**
-     * Show the Edit bookmark dialog for a particular url. If the url is bookmarked multiple times
-     * this will just edit the first instance it finds.
-     *
-     * @param url The url of the bookmark to edit. The dialog will look up other information like the id,
-     *            current title, or keywords associated with this url. If the url isn't bookmarked, the
-     *            dialog will fail silently. If the url is bookmarked multiple times, this will only show
-     *            information about the first it finds.
-     */
-    public void show(final String url) {
-        (new UiAsyncTask<Void, Void, Bookmark>(ThreadUtils.getBackgroundHandler()) {
-            @Override
-            public Bookmark doInBackground(Void... params) {
-                Cursor cursor = BrowserDB.getBookmarkForUrl(mContext.getContentResolver(), url);
-                if (cursor == null) {
-                    return null;
-                }
-
-                cursor.moveToFirst();
-                Bookmark bookmark = new Bookmark(cursor.getInt(cursor.getColumnIndexOrThrow(Bookmarks._ID)),
-                                                 cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.TITLE)),
-                                                 cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.URL)),
-                                                 cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.KEYWORD)));
-                cursor.close();
-                return bookmark;
-            }
-
-            @Override
-            public void onPostExecute(Bookmark bookmark) {
-                if (bookmark == null)
-                    return;
-
-                show(bookmark.id, bookmark.title, bookmark.url, bookmark.keyword);
-            }
-        }).execute();
-    }
-
-    /**
-     * Show the Edit bookmark dialog for a set of data. This will show the dialog whether
-     * a bookmark with this url exists or not, but the results will NOT be saved if the id
-     * is not a valid bookmark id.
-     *
-     * @param id The id of the bookmark to change. If there is no bookmark with this ID, the dialog
-     *           will fail silently.
-     * @param title The initial title to show in the dialog
-     * @param url The initial url to show in the dialog
-     * @param keyword The initial keyword to show in the dialog
-     */
-    public void show(final int id, final String title, final String url, final String keyword) {
-        AlertDialog.Builder editPrompt = new AlertDialog.Builder(mContext);
-        final View editView = LayoutInflater.from(mContext).inflate(R.layout.bookmark_edit, null);
-        editPrompt.setTitle(R.string.bookmark_edit_title);
-        editPrompt.setView(editView);
-
-        final EditText nameText = ((EditText) editView.findViewById(R.id.edit_bookmark_name));
-        final EditText locationText = ((EditText) editView.findViewById(R.id.edit_bookmark_location));
-        final EditText keywordText = ((EditText) editView.findViewById(R.id.edit_bookmark_keyword));
-        nameText.setText(title);
-        locationText.setText(url);
-        keywordText.setText(keyword);
-
-        editPrompt.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int whichButton) {
-                (new UiAsyncTask<Void, Void, Void>(ThreadUtils.getBackgroundHandler()) {
-                    @Override
-                    public Void doInBackground(Void... params) {
-                        String newUrl = locationText.getText().toString().trim();
-                        String newKeyword = keywordText.getText().toString().trim();
-                        BrowserDB.updateBookmark(mContext.getContentResolver(), id, newUrl, nameText.getText().toString(), newKeyword);
-                        return null;
-                    }
-
-                    @Override
-                    public void onPostExecute(Void result) {
-                        Toast.makeText(mContext, R.string.bookmark_updated, Toast.LENGTH_SHORT).show();
-                    }
-                }).execute();
-            }
-        });
-
-        editPrompt.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int whichButton) {
-                  // do nothing
-              }
-        });
-
-        final AlertDialog dialog = editPrompt.create();
-
-        // Create our TextWatchers
-        LocationTextWatcher locationTextWatcher = new LocationTextWatcher(dialog);
-        KeywordTextWatcher keywordTextWatcher = new KeywordTextWatcher(dialog);
-
-        // Cross reference the TextWatchers
-        locationTextWatcher.setPairedTextWatcher(keywordTextWatcher);
-        keywordTextWatcher.setPairedTextWatcher(locationTextWatcher);
-
-        // Add the TextWatcher Listeners
-        locationText.addTextChangedListener(locationTextWatcher);
-        keywordText.addTextChangedListener(keywordTextWatcher);
-
-        dialog.show();
-    }
-}
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index af6e7e04082..bc1be95c530 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -82,7 +82,6 @@ FENNEC_JAVA_FILES = \
   Distribution.java \
   DoorHanger.java \
   DoorHangerPopup.java \
-  EditBookmarkDialog.java \
   Favicons.java \
   FilePickerResultHandler.java \
   FilePickerResultHandlerSync.java \
@@ -229,7 +228,6 @@ FENNEC_JAVA_FILES = \
   widget/AboutHomeView.java \
   widget/AboutHomeSection.java \
   widget/AddonsSection.java \
-  widget/ButtonToast.java \
   widget/DateTimePicker.java \
   widget/Divider.java \
   widget/FaviconView.java \
@@ -636,11 +634,6 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/tab_thumbnail_shadow.png \
   res/drawable-mdpi/tabs_count.png \
   res/drawable-mdpi/tabs_count_foreground.png \
-  res/drawable-mdpi/toast.9.png \
-  res/drawable-mdpi/toast_button_focused.9.png \
-  res/drawable-mdpi/toast_button_focused.9.png \
-  res/drawable-mdpi/toast_button_pressed.9.png \
-  res/drawable-mdpi/toast_divider.9.png \
   res/drawable-mdpi/address_bar_url_default.9.png \
   res/drawable-mdpi/address_bar_url_default_pb.9.png \
   res/drawable-mdpi/address_bar_url_pressed.9.png \
@@ -1067,7 +1060,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/tab_thumbnail.xml                      \
   mobile/android/base/resources/drawable/tabs_panel_indicator.xml               \
   mobile/android/base/resources/drawable/textbox_bg.xml                         \
-  mobile/android/base/resources/drawable/toast_button.xml                       \
   mobile/android/base/resources/drawable/webapp_titlebar_bg.xml                 \
   $(NULL)
 
diff --git a/mobile/android/base/db/BrowserDB.java b/mobile/android/base/db/BrowserDB.java
index fdf6d5a4fa2..b51014a317b 100644
--- a/mobile/android/base/db/BrowserDB.java
+++ b/mobile/android/base/db/BrowserDB.java
@@ -112,8 +112,6 @@ public class BrowserDB {
         public void unpinAllSites(ContentResolver cr);
 
         public Cursor getPinnedSites(ContentResolver cr, int limit);
-
-        public Cursor getBookmarkForUrl(ContentResolver cr, String url);
     }
 
     static {
@@ -291,10 +289,6 @@ public class BrowserDB {
         return sDb.getPinnedSites(cr, limit);
     }
 
-    public static Cursor getBookmarkForUrl(ContentResolver cr, String url) {
-        return sDb.getBookmarkForUrl(cr, url);
-    }
-
     public static class PinnedSite {
         public String title = "";
         public String url = "";
diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java
index d093662c4a7..484decc438b 100644
--- a/mobile/android/base/db/LocalBrowserDB.java
+++ b/mobile/android/base/db/LocalBrowserDB.java
@@ -1222,23 +1222,4 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
 
         return (count > 0);
     }
-
-    public Cursor getBookmarkForUrl(ContentResolver cr, String url) {
-        Cursor c = cr.query(bookmarksUriWithLimit(1),
-                            new String[] { Bookmarks._ID,
-                                           Bookmarks.URL,
-                                           Bookmarks.TITLE,
-                                           Bookmarks.KEYWORD },
-                            Bookmarks.URL + " = ?",
-                            new String[] { url },
-                            null);
-        if (c == null) {
-            return c;
-        } else if (c.getCount() == 0) {
-            c.close();
-            c = null;
-        }
-
-        return c;
-    }
 }
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 55535906e7c..1d326027fdb 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -42,7 +42,6 @@
 <!ENTITY bookmark_added "Bookmark added">
 <!ENTITY bookmark_removed "Bookmark removed">
 <!ENTITY bookmark_updated "Bookmark updated">
-<!ENTITY bookmark_options "Options">
 
 <!ENTITY history_today_section "Today">
 <!ENTITY history_yesterday_section "Yesterday">
diff --git a/mobile/android/base/resources/drawable-mdpi/toast.9.png b/mobile/android/base/resources/drawable-mdpi/toast.9.png
deleted file mode 100644
index b9105deeefb805737627a38fc0818ac00be90e11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 839
zcmV-N1GxN&P)<h;3K|Lk000e1NJLTq003eD001fo1^@s6NUn|#00004b3#c}2nYxW
zd<bNS00009a7bBm000Y#000Y#0XNCZtpET5=}AOERCt{2n_qI;Fc8K+V*^QhEe_My
z%=83(>j~O(aS~>jI*GARALPZW)ym*FPHDWq8I1(U46`4*`nM`D4nMO0(kX7~<h_~I
zFk)_Uoe}*EovX1YXW&9<%X;YfrQ(&gtYsU3Zb)u$URJCv`x(07J%BT7d!-+M)QH@;
zt4yKKsGkWD;6^6npED&9qf)+*i%@0?_YM;x!2j`Q0IsXsuI*S~E(U;D2p)n+gsLlR
z)~=9>VWc8B1QAYMk#;(>=Ms+~!;%PV0Gr)z_q{C3C+FM>Baw?0{`#|j2Eey%`+L9N
z|3EB+?_LjvCh`apVq4es)8TL!ErNlfs;X}Qej@gm6_n6K>hRD+9<c%Na6BGOgg4@x
zD*!y8AE+H`U%WyZSPM;C=Nyc;(S@ol`f;{|GOlVu@WFbG;1$L+HVC$)Ne)ePE^r}o
z;Yk}ujB#*pP^bP{?AN@)m<AUi@diK-O;mF+jA>{hWJ42J2f4U2rolzf7QueV$hL*?
zeq6Ps{oDTy*)c+Hc^mT++1otgPB0<v1QX&;Fd^;)5<;G*8uP<#UT7X+V$4rs<Dt-G
zUh;liwPj8Sc@S<)L#EUuNFikY4V@$z)8J_|svx;Bf@dSN^Zv#~Kq)m`j0nChtL5cT
zI>_q>{MgURD}oI*F)o7SLQ|BNQ`hyc?#qmEaNF@jv&1X-2A|B{*aCP2@CCrvu6{(w
zNRVf+OW!EuQRD=m0q_Fg89)u-Pgg%9cu0fTL!$F&Ei5(YjZL1?AU%UM(r`{<yg)a8
z<P|b8fQP0Q{WdMVcS4_LV`-N?@=r{ms6h}x3Xy~+O$bVS;<F`6rfqP;LHI)9(|wuu
zN~J}b5e^{l5pwOom6jry5COUN;u9WTt5aAxMifYe;Ik<05Zr_a<QBs`#WH(8B6njb
zcUvfTYsd)XZVPFv>cJaB@_p?Zmwe8|2zaHPyRMb2tUt<#|N9Q^takF=<1YkybI$aT
RjbH!(002ovPDHLkV1hAGdGG)L

diff --git a/mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png b/mobile/android/base/resources/drawable-mdpi/toast_button_focused.9.png
deleted file mode 100644
index e2a7942f5f45653f3b82f67549bf4ba1ee848e02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^`arD3!3HFiUopu8DYhhUcNd2LAh=-f^2tCE&H|6f
zVg?58P7r1^KY4mBP>{XE)7O>#E-OE)fUuRrYGI(z5l<J#kch)?XBu)b849@mSE**q
zPf5>BejUrQ@uNc11I906-{vJryH4I1k;)yr`BVqzzw4}<9ttw`C$gGpyb%y^;!ymq
z(36&(E0&v`)T7@eGH=e42S@Aw)t;7nemco~{<@$~q6{xK)@e_U<?J!zv|aIovth{|
zW53<3$rlY?Y`&QKYfiiB>E=&Umj6lCtN3g`)&I#XbN|Xy&sFq4xSmt0F`Kfy#xZ1j
zrNwefGlm;qrk?LjwYVA$wDxE9nz|dW#LvHb!j*entGxf-swY7IFnGH9xvX<aXaWFB
CaCqAQ

diff --git a/mobile/android/base/resources/drawable-mdpi/toast_button_pressed.9.png b/mobile/android/base/resources/drawable-mdpi/toast_button_pressed.9.png
deleted file mode 100644
index 28c57cdd76d2dfbf35258d21cfe6c9f094921b33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^`arD3!3HFiUopu8DYhhUcNd2LAh=-f^2tCE&H|6f
zVg?58P7r1^KY4mBP>{XE)7O>#E-ODPKQFK7jCVkxBc3jfArXh)&fLq(WXRJR?<1C=
z6w%mbt1+{ot*=RRMIJ+z+Jf{>Z3iZy_=E9<bBcuAR36oqCe?1zv9&DR;F#FXtk@#(
ziKFFWPARu!ZEA1U8$T7^eDBU5{O{~<zJ9vr#@gqzr|e;GC|KibC72^s)o?<@At<hA
z@!clQB$;oP8Z-Mo??|Z(nD=Q){&808|G__9Vm5!Cvb@Ic(>dO*JFXUHK(^zL-`q}q
z)j13SU#Fh$efl*d-;qP{$@`7JHeA)e_HGGdV5n|RpI})V&_4{Gu6{1-oD!M<r`dIe

diff --git a/mobile/android/base/resources/drawable-mdpi/toast_divider.9.png b/mobile/android/base/resources/drawable-mdpi/toast_divider.9.png
deleted file mode 100644
index 1b067d4e7d2104b04b3181c241d1063cdaf528f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 963
zcmaJ=O^?z*7%q!3n`JjK@gl~<q`L<-(lUh>+EB?tsY|jY1TafHS=s>_ww>AzQaBmo
zL2v#9vx!Ij0ebMfXK(%q6HjY2!6^%@2eD~8GjE>fc|Ye(v+-ze=k^Z6FnjeQtwq;s
z^xNIOPXD#DJ2&Z)CbceU<35>~0b&kq+(V%5ngi5AragUjj!F!ZJa9T)(lw413%i^d
zW4OrmDVt$R<;XX!5h9?629Bq)-#>q0fn%%eiD+aEzlw&=(JVmiS)*gkMwV=|<%ggY
zDOA8k!~~Ih>V-<AvI|{>?qf60f(3+(RQ58cuF(Wl93UWaxr~*C5J(aS^P(id2SCU|
zfzQ%c%D}uLN{Ubb%ZH`j0=uuYG=1rdo>X>7h_CScWHR9<ISvN{9?G&DYY0MyA~NCB
zBW9HG!u^$khC(ZFeBxja#ENDQkBQ3CNH0@x{k5zYF3Us<#z&^lLoOSqv;rE&|DmqC
zMu((@uHyZtaM+pph;N|~j{}P~uD>6<@|9|UOoD?B#;2<)HiwwtaEN_SZA;*;VOowC
z8}2O_hN0BGkeHr@>YB<@4bE|FMJ(hCIa#mOpj3pg24%gNE9#YE0cLffs#jKA4O?Ru
zd1S@4ueka~ZafUGPd#fWaGoPu53masNh{9gSgITKmRx&tEZRmcPlMs(*8bJ%m5I(z
zyj>42J*-C`d34?bI@s@@T>PMyLab|to#<QdVm>b?Z@hRt2U05e>hacDI-Q>9;Jd_e
p;;r!e{&tG_U>_K%<fpHRtzG8)*R9z}@241Ft9q@WeXKlv`3FLdC(-}_

diff --git a/mobile/android/base/resources/drawable/toast_button.xml b/mobile/android/base/resources/drawable/toast_button.xml
deleted file mode 100644
index 43b58ee28f8..00000000000
--- a/mobile/android/base/resources/drawable/toast_button.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Copyright 2012 Roman Nurik
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/toast_button_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/toast_button_focused" android:state_focused="true"/>
-    <item android:drawable="@android:color/transparent"/>
-</selector>
\ No newline at end of file
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index 7bffa430d21..a181be6375e 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -40,15 +40,4 @@
                  android:layout_height="@dimen/browser_toolbar_height"/>
     </view>
 
-    <LinearLayout android:id="@+id/toast"
-                  style="@style/Toast">
-
-        <TextView android:id="@+id/toast_message"
-                  style="@style/ToastMessage" />
-
-        <Button android:id="@+id/toast_button"
-                style="@style/ToastButton" />
-
-    </LinearLayout>
-
 </RelativeLayout>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 3dd8503283d..c1550e0800e 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -447,52 +447,4 @@
           <item name="android:ellipsize">middle</item>
     </style>
 
-    <style name="Toast">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:layout_gravity">bottom</item>
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:layout_marginBottom">64dp</item>
-        <item name="android:layout_marginTop">0dp</item>
-        <item name="android:orientation">horizontal</item>
-        <item name="android:background">@drawable/toast</item>
-        <item name="android:clickable">true</item>
-        <item name="android:showDividers">middle</item>
-        <item name="android:divider">@drawable/toast_divider</item>
-        <item name="android:dividerPadding">16dp</item>
-
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">0dp</item>
-    </style>
-
-    <style name="ToastMessage">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:textColor">#fff</item>
-        <item name="android:textAppearance">?android:textAppearanceSmall</item>
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:paddingLeft">8dp</item>
-        <item name="android:paddingRight">0dp</item>
-        <item name="android:layout_marginTop">0dp</item>
-        <item name="android:layout_marginBottom">0dp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">0dp</item>
-    </style>
-
-    <style name="ToastButton">
-        <item name="android:background">@drawable/toast_button</item>
-        <item name="android:textAppearance">?android:textAppearanceSmall</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">#fff</item>
-        <item name="android:layout_gravity">center_vertical</item>
-    </style>
-
 </resources>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index d4f5aa64f57..83a1bc068e2 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -57,7 +57,6 @@
   <string name="bookmark_added">&bookmark_added;</string>
   <string name="bookmark_removed">&bookmark_removed;</string>
   <string name="bookmark_updated">&bookmark_updated;</string>
-  <string name="bookmark_options">&bookmark_options;</string>
 
   <string name="history_today_section">&history_today_section;</string>
   <string name="history_yesterday_section">&history_yesterday_section;</string>
diff --git a/mobile/android/base/widget/ButtonToast.java b/mobile/android/base/widget/ButtonToast.java
deleted file mode 100644
index d58bcbd971a..00000000000
--- a/mobile/android/base/widget/ButtonToast.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2012 Roman Nurik
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mozilla.gecko.widget;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Parcelable;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewPropertyAnimator;
-import android.widget.Button;
-import android.widget.TextView;
-
-import org.mozilla.gecko.R;
-
-public class ButtonToast {
-    private final static int TOAST_DURATION = 5000;
-
-    private View mView;
-    private TextView mMessageView;
-    private Button mButton;
-    private ViewPropertyAnimator mBarAnimator;
-    private Handler mHideHandler = new Handler();
-
-    private ToastListener mListener;
-
-    // State objects
-    private CharSequence mToken;
-    private CharSequence mButtonMessage;
-    private int mButtonIcon;
-    private CharSequence mMessage;
-
-    public interface ToastListener {
-        void onButtonClicked(CharSequence token);
-    }
-
-    public ButtonToast(View view, ToastListener listener) {
-        mView = view;
-        mBarAnimator = mView.animate();
-        mListener = listener;
-
-        mMessageView = (TextView) mView.findViewById(R.id.toast_message);
-        mButton = (Button) mView.findViewById(R.id.toast_button);
-        mButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        hide(false);
-                        mListener.onButtonClicked(mToken);
-                    }
-                });
-
-        hide(true);
-    }
-
-    public void show(boolean immediate, CharSequence message,
-                     CharSequence buttonMessage, int buttonIcon,
-                     CharSequence token) {
-        mToken = token;
-        mMessage = message;
-        mButtonMessage = buttonMessage;
-        mMessageView.setText(mMessage);
-
-        mButton.setText(buttonMessage);
-        mButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, buttonIcon, 0);
-
-        mHideHandler.removeCallbacks(mHideRunnable);
-        mHideHandler.postDelayed(mHideRunnable, TOAST_DURATION);
-
-        mView.setVisibility(View.VISIBLE);
-        if (immediate) {
-            mView.setAlpha(1);
-        } else {
-            mBarAnimator.cancel();
-            mBarAnimator
-                    .alpha(1)
-                    .setDuration(
-                            mView.getResources()
-                                    .getInteger(android.R.integer.config_longAnimTime))
-                    .setListener(null);
-        }
-    }
-
-    public void hide(boolean immediate) {
-        mHideHandler.removeCallbacks(mHideRunnable);
-        if (immediate) {
-            mView.setVisibility(View.GONE);
-            mView.setAlpha(0);
-            mMessage = null;
-            mToken = null;
-
-        } else {
-            mBarAnimator.cancel();
-            mBarAnimator
-                    .alpha(0)
-                    .setDuration(mView.getResources()
-                            .getInteger(android.R.integer.config_shortAnimTime))
-                    .setListener(new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            mView.setVisibility(View.GONE);
-                            mMessage = null;
-                            mToken = null;
-                        }
-                    });
-        }
-    }
-
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putCharSequence("toast_message", mMessage);
-        outState.putCharSequence("toast_button_message", mButtonMessage);
-        outState.putInt("toast_button_drawable", mButtonIcon);
-        outState.putCharSequence("toast_token", mToken);
-    }
-
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
-            mMessage = savedInstanceState.getCharSequence("toast_message");
-            mButtonMessage = savedInstanceState.getCharSequence("toast_buttonmessage");
-            mButtonIcon = savedInstanceState.getInt("toast_button_drawable");
-            mToken = savedInstanceState.getCharSequence("toast_token");
-
-            if (mToken != null || !TextUtils.isEmpty(mMessage)) {
-                show(true, mMessage, mButtonMessage, mButtonIcon, mToken);
-            }
-        }
-    }
-
-    private Runnable mHideRunnable = new Runnable() {
-        @Override
-        public void run() {
-            hide(false);
-        }
-    };
-}

From 0791217381b77934e509c7d4eff6df4130dfcc39 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 30 May 2013 22:27:46 -0400
Subject: [PATCH 61/85] Backed out changeset b920312f99e3 (bug 877021) due to
 xpcshell bustage. CLOSED TREE

---
 js/src/builtin/RegExp.cpp | 73 +++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index 758c39ed606..2f3ea0f25ed 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -18,19 +18,42 @@ using namespace js::types;
 
 using mozilla::ArrayLength;
 
-static inline bool
-DefinePropertyHelper(JSContext *cx, HandleObject obj, Handle<PropertyName*> name, HandleValue v)
+class RegExpMatchBuilder
 {
-    return !!baseops::DefineProperty(cx, obj, name, v,
-                                     JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE);
-}
+    JSContext   * const cx;
+    RootedObject array;
+
+    bool setProperty(Handle<PropertyName*> name, HandleValue v) {
+        return !!baseops::DefineProperty(cx, array, name, v,
+                                         JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE);
+    }
+
+  public:
+    RegExpMatchBuilder(JSContext *cx, HandleObject array) : cx(cx), array(cx, array) {}
+
+    bool append(uint32_t index, HandleValue v) {
+        JS_ASSERT(!array->getOps()->getElement);
+        return !!baseops::DefineElement(cx, array, index, v, JS_PropertyStub, JS_StrictPropertyStub,
+                                        JSPROP_ENUMERATE);
+    }
+
+    bool setIndex(int index) {
+        RootedValue value(cx, Int32Value(index));
+        return setProperty(cx->names().index, value);
+    }
+
+    bool setInput(HandleString str) {
+        JS_ASSERT(str);
+        RootedValue value(cx, StringValue(str));
+        return setProperty(cx->names().input, value);
+    }
+};
 
 bool
 js::CreateRegExpMatchResult(JSContext *cx, HandleString input_, const jschar *chars, size_t length,
                             MatchPairs &matches, MutableHandleValue rval)
 {
     RootedString input(cx, input_);
-    RootedValue undefinedValue(cx, UndefinedValue());
 
     /*
      * Create the (slow) result array for a match.
@@ -41,47 +64,39 @@ js::CreateRegExpMatchResult(JSContext *cx, HandleString input_, const jschar *ch
      *  input:          input string
      *  index:          start index for the match
      */
+    RootedObject array(cx, NewDenseEmptyArray(cx));
+    if (!array)
+        return false;
+
     if (!input) {
         input = js_NewStringCopyN<CanGC>(cx, chars, length);
         if (!input)
             return false;
     }
 
+    RegExpMatchBuilder builder(cx, array);
+    RootedValue undefinedValue(cx, UndefinedValue());
+
     size_t numPairs = matches.length();
     JS_ASSERT(numPairs > 0);
 
-    AutoValueVector elements(cx);
-    if (!elements.reserve(numPairs))
-        return false;
-
-    /* Accumulate a Value for each pair, in a rooted vector. */
     for (size_t i = 0; i < numPairs; ++i) {
         const MatchPair &pair = matches[i];
 
+        RootedString captured(cx);
         if (pair.isUndefined()) {
             JS_ASSERT(i != 0); /* Since we had a match, first pair must be present. */
-            elements.infallibleAppend(undefinedValue);
-        } else {
-            JSLinearString *str = js_NewDependentString(cx, input, pair.start, pair.length());
-            if (!str)
+            if (!builder.append(i, undefinedValue))
+                return false;
+        } else {
+            captured = js_NewDependentString(cx, input, pair.start, pair.length());
+            RootedValue value(cx, StringValue(captured));
+            if (!captured || !builder.append(i, value))
                 return false;
-            elements.infallibleAppend(StringValue(str));
         }
     }
 
-    /* Copy the rooted vector into the array object. */
-    RootedObject array(cx, NewDenseCopiedArray(cx, elements.length(), elements.begin()));
-    if (!array)
-        return false;
-
-    /* Set the |index| property. */
-    RootedValue index(cx, Int32Value(matches[0].start));
-    if (!DefinePropertyHelper(cx, array, cx->names().index, index))
-        return false;
-
-    /* Set the |input| property. */
-    RootedValue inputVal(cx, StringValue(input));
-    if (!DefinePropertyHelper(cx, array, cx->names().input, inputVal))
+    if (!builder.setIndex(matches[0].start) || !builder.setInput(input))
         return false;
 
     rval.setObject(*array);

From 6972836f06a8282055c8b0af5c0f46180dea0eab Mon Sep 17 00:00:00 2001
From: Gene Lian <clian@mozilla.com>
Date: Fri, 31 May 2013 22:34:33 +0800
Subject: [PATCH 62/85] Bug 877627 - [Contacts][Dialer] Dialer doesn't show on
 screen when launching from contacts. r=fabrice,shianyow a=tef+

---
 dom/messages/SystemMessageInternal.js | 44 +++++++++++++++++++++------
 dom/messages/SystemMessageManager.js  |  1 +
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/dom/messages/SystemMessageInternal.js b/dom/messages/SystemMessageInternal.js
index 832b8904a17..a32be28c6df 100644
--- a/dom/messages/SystemMessageInternal.js
+++ b/dom/messages/SystemMessageInternal.js
@@ -243,7 +243,17 @@ SystemMessageInternal.prototype = {
     return -1;
   },
 
-  _removeTargetFromListener: function _removeTargetFromListener(aTarget, aManifest, aRemoveListener) {
+  _isEmptyObject: function _isEmptyObject(aObj) {
+    for (let name in aObj) {
+      return false;
+    }
+    return true;
+  },
+
+  _removeTargetFromListener: function _removeTargetFromListener(aTarget,
+                                                                aManifest,
+                                                                aRemoveListener,
+                                                                aUri) {
     let targets = this._listeners[aManifest];
     if (!targets) {
       return false;
@@ -260,7 +270,13 @@ SystemMessageInternal.prototype = {
       return true;
     }
 
-    if (--targets[index].winCount === 0) {
+    let target = targets[index];
+    if (aUri && target.winCounts[aUri] !== undefined &&
+        --target.winCounts[aUri] === 0) {
+      delete target.winCounts[aUri];
+    }
+
+    if (this._isEmptyObject(target.winCounts)) {
       if (targets.length === 1) {
         // If it's the only one, get rid of this manifest entirely.
         debug("remove the listener for " + aManifest);
@@ -297,17 +313,25 @@ SystemMessageInternal.prototype = {
       case "SystemMessageManager:Register":
       {
         debug("Got Register from " + msg.uri + " @ " + msg.manifest);
+        let uri = msg.uri;
         let targets, index;
         if (!(targets = this._listeners[msg.manifest])) {
+          let winCounts = {};
+          winCounts[uri] = 1;
           this._listeners[msg.manifest] = [{ target: aMessage.target,
-                                             uri: msg.uri,
-                                             winCount: 1 }];
+                                             winCounts: winCounts }];
         } else if ((index = this._findTargetIndex(targets, aMessage.target)) === -1) {
+          let winCounts = {};
+          winCounts[uri] = 1;
           targets.push({ target: aMessage.target,
-                         uri: msg.uri,
-                         winCount: 1 });
+                         winCounts: winCounts });
         } else {
-          targets[index].winCount++;
+          let winCounts = targets[index].winCounts;
+          if (winCounts[uri] === undefined) {
+            winCounts[uri] = 1;
+          } else {
+            winCounts[uri]++;
+          }
         }
 
         debug("listeners for " + msg.manifest + " innerWinID " + msg.innerWindowID);
@@ -318,7 +342,7 @@ SystemMessageInternal.prototype = {
         debug("Got child-process-shutdown from " + aMessage.target);
         for (let manifest in this._listeners) {
           // See if any processes in this manifest have this target.
-          if (this._removeTargetFromListener(aMessage.target, manifest, true)) {
+          if (this._removeTargetFromListener(aMessage.target, manifest, true, null)) {
             break;
           }
         }
@@ -327,7 +351,7 @@ SystemMessageInternal.prototype = {
       case "SystemMessageManager:Unregister":
       {
         debug("Got Unregister from " + aMessage.target + "innerWinID " + msg.innerWindowID);
-        this._removeTargetFromListener(aMessage.target, msg.manifest, false);
+        this._removeTargetFromListener(aMessage.target, msg.manifest, false, msg.uri);
         break;
       }
       case "SystemMessageManager:GetPendingMessages":
@@ -521,7 +545,7 @@ SystemMessageInternal.prototype = {
         let target = targets[index];
         // We only need to send the system message to the targets which match
         // the manifest URL and page URL of the destination of system message.
-        if (target.uri != aPageURI) {
+        if (target.winCounts[aPageURI] === undefined) {
           continue;
         }
 
diff --git a/dom/messages/SystemMessageManager.js b/dom/messages/SystemMessageManager.js
index 2b8c9cac3d0..1cff1f7ce19 100644
--- a/dom/messages/SystemMessageManager.js
+++ b/dom/messages/SystemMessageManager.js
@@ -144,6 +144,7 @@ SystemMessageManager.prototype = {
 
     cpmm.sendAsyncMessage("SystemMessageManager:Unregister",
                           { manifest: this._manifest,
+                            uri: this._uri,
                             innerWindowID: this.innerWindowID });
   },
 

From 2ffbeebc413d1cfa331564a280c20c1c8611cb8c Mon Sep 17 00:00:00 2001
From: "paul.feher@softvision.ro" <paul.feher@softvision.ro>
Date: Fri, 10 May 2013 10:56:53 +0300
Subject: [PATCH 63/85] Bug 838596 - Robocop: Add test for 'Master Password'
 feature. r=jmaher

---
 mobile/android/base/tests/robocop.ini         |   1 +
 .../base/tests/testMasterPassword.java.in     | 213 ++++++++++++++++++
 2 files changed, 214 insertions(+)
 create mode 100644 mobile/android/base/tests/testMasterPassword.java.in

diff --git a/mobile/android/base/tests/robocop.ini b/mobile/android/base/tests/robocop.ini
index bb47bc0ebc6..1ec068897a3 100644
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -40,6 +40,7 @@
 [testInputAwesomeBar]
 [testAddSearchEngine]
 [testImportFromAndroid]
+[testMasterPassword]
 
 # Used for Talos, please don't use in mochitest
 #[testPan]
diff --git a/mobile/android/base/tests/testMasterPassword.java.in b/mobile/android/base/tests/testMasterPassword.java.in
new file mode 100644
index 00000000000..c9473efe078
--- /dev/null
+++ b/mobile/android/base/tests/testMasterPassword.java.in
@@ -0,0 +1,213 @@
+#filter substitution
+package @ANDROID_PACKAGE_NAME@.tests;
+
+import @ANDROID_PACKAGE_NAME@.*;
+
+/* This patch tests the Master Password feature first by enabling the password,
+then testing it on a login page and finally disabling the password */
+public class testMasterPassword extends PixelTest {
+    Device dev;
+
+    @Override
+    protected int getTestType() {
+        return TEST_MOCHITEST;
+    }
+
+    public void testMasterPassword() {
+        blockForGeckoReady();
+
+        dev = new Device();
+        String password = ("Good");
+        String badPassword = ("Bad");
+
+        enableMasterPassword(password, badPassword);
+        verifyLoginPage(password, badPassword);
+        disableMasterPassword(password, badPassword);
+    }
+
+    public void enableMasterPassword(String password, String badPassword) {
+
+        // Look for the 'Settings' menu if this device/OS uses it
+        selectMenuItem("Settings");
+        if (dev.type.equals("tablet")) {
+            mSolo.waitForText("Privacy & Security");
+            mSolo.clickOnText("Privacy & Security");
+        }
+        mSolo.waitForText("^Use master password$");
+        mSolo.clickOnText("^Use master password$");
+        mSolo.waitForText("^Create Master Password$");
+
+        // Verify that the OK button is not activated until both fields are filled
+        closeTabletKeyboard();
+        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until both fields are filled");
+
+        // Verify that the OK button is not activated until the Confirm password field is filled
+        editPasswordField(0, password);
+        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until the Confirm password field is filled");
+
+        // Verify that the OK button is not activated until both fields contain the same password
+        editPasswordField(1, badPassword);
+        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until both fields contain the same password");
+
+        // Verify that the OK button is not activated until the Password field is filled
+        mSolo.clearEditText(0);
+        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until the Password field is filled");
+
+        // Check that the Master Password is not set when canceling the action
+        mSolo.clickOnEditText(0);
+        mActions.sendKeys(password);
+        mSolo.clearEditText(1);
+        mSolo.clickOnEditText(1);
+        mActions.sendKeys(password);
+        mSolo.waitForText("^Cancel$");
+        mSolo.clickOnText("^Cancel$");
+        mSolo.waitForText("^Use master password$");
+        mSolo.clickOnText("^Use master password$");
+        mAsserter.ok(mSolo.waitForText("^Create Master Password$"), "Checking if no password was set if the action was canceled", "No password was set");
+
+        // Enable Master Password
+        mSolo.clickOnEditText(0);
+        mActions.sendKeys(password);
+        mSolo.clickOnEditText(1);
+        mActions.sendKeys(password);
+
+        // Verify that the input characters are converted to dots automatically
+        mAsserter.ok(mSolo.waitForText("."), "waiting to convert the letters in dots", "The letters are converted in dots");
+        mSolo.clickOnButton("OK");
+
+        // Verify that the Master Password was set
+        mSolo.waitForText("^Use master password$");
+        mSolo.clickOnText("^Use master password$");
+        mAsserter.ok(mSolo.searchText("Remove Master Password"), "Checking if the password is enabled", "The password is enabled");
+        closeTabletKeyboard();
+        mActions.sendSpecialKey(Actions.SpecialKey.BACK); // Go back to settings menu
+        mSolo.waitForText("^Settings$");
+        mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the Settings Menu
+    }
+
+    public void disableMasterPassword(String password, String badPassword) {
+
+        // Look for the 'Settings' menu if this device/OS uses it
+        selectMenuItem("Settings");
+        if (dev.type.equals("tablet")) {
+            mSolo.waitForText("Privacy & Security");
+            mSolo.clickOnText("Privacy & Security");
+        }
+        mSolo.waitForText("^Use master password$");
+        mSolo.clickOnText("^Use master password$");
+        mSolo.waitForText("^Remove Master Password$");
+
+        // Verify that the OK button is not activated if the password field is empty
+        closeTabletKeyboard();
+        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive if the password field is empty");
+
+        // Verify that the OK button is activated if the password field contains characters
+        editPasswordField(0, badPassword);
+        mAsserter.ok(mSolo.getButton("OK").isEnabled(), "Verify if the OK button is activated", "The OK button is activated even if the wrong password is filled");
+        mSolo.clickOnButton("OK");
+        mAsserter.ok(mSolo.waitForText("^Incorrect password$"), "Waiting for Incorrect password notification", "The Incorrect password notification appears");
+
+        // Disable Master Password
+        mSolo.clickOnText("^Use master password$");
+        mSolo.waitForText("^Remove Master Password$");
+        closeTabletKeyboard();
+        editPasswordField(0, password);
+        mSolo.clickOnButton("OK");
+
+        // Verify that the Master Password was disabled
+        mSolo.waitForText("^Use master password$");
+        mSolo.clickOnText("^Use master password$");
+        mAsserter.ok(mSolo.waitForText("^Create Master Password$"), "Checking if the password is disabled", "The password is disabled");
+        mActions.sendSpecialKey(Actions.SpecialKey.BACK); // Close the VKB
+        mActions.sendSpecialKey(Actions.SpecialKey.BACK); // Close the Master Password menu
+    }
+
+    public void editPasswordField(int i, String password) {
+        mSolo.clickOnEditText(i);
+        mActions.sendKeys(password);
+        mActions.sendSpecialKey(Actions.SpecialKey.BACK); // Close the VKB
+    }
+
+    public void noDoorhangerDisplayed(String LOGIN_URL) {
+        mSolo.waitForText("Browser Blank Page 01 | Enter Search or Address");
+        loadUrl(LOGIN_URL);
+        mAsserter.is(mSolo.waitForText("Save password for"), false, "Doorhanger notification is hidden");
+    }
+
+    public void doorhangerDisplayed(String LOGIN_URL) {
+        mSolo.waitForText("Browser Blank Page 01 | Enter Search or Address");
+        loadUrl(LOGIN_URL);
+        mAsserter.is(mSolo.waitForText("Save password for"), true, "Doorhanger notification is displayed");
+    }
+
+    // Checks to see if the device is a Tablet, because for those devices we need an extra back action to close the keyboard
+    public void closeTabletKeyboard() {
+        if (dev.type.equals("tablet")) {
+            mSolo.sleep(1500);
+            mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the keyboard for tablets
+        }
+    }
+
+    public void clearPrivateData() {
+
+        // Look for the 'Settings' menu if this device/OS uses it
+        selectMenuItem("Settings");
+        if (dev.type.equals("tablet")) {
+            mSolo.waitForText("Privacy & Security");
+            mSolo.clickOnText("Privacy & Security");
+        }
+
+        // Clear private data
+        mSolo.waitForText("^Clear private data$");
+        mSolo.clickOnText("^Clear private data$");
+        mSolo.waitForText("^Clear data$");
+        mSolo.clickOnText("^Clear data$");
+        mAsserter.ok(mSolo.waitForText("^Private data cleared$"), "Waiting for private data to be cleared", "Private data is cleared");
+
+        // Check that the Master Password isn't disabled by clearing private data
+        mSolo.waitForText("^Use master password$");
+        mSolo.clickOnText("^Use master password$");
+        mAsserter.ok(mSolo.searchText("^Remove Master Password$"), "Checking if the master password was disabled by clearing private data", "The master password is not disabled by clearing private data");
+        closeTabletKeyboard();
+        mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the Master Password menu
+        mSolo.waitForText("^Settings$");
+        mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the Settings Menu
+    }
+
+    public void verifyLoginPage(String password, String badPassword) {
+        String LOGIN_URL = getAbsoluteUrl("/robocop/robocop_login.html");
+        String option [] = {"Save", "Don't save"};
+
+        doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed
+        for (String item:option) {
+            if (item.equals("Save")) {
+                mSolo.clickOnButton(item);
+
+                // Verify that the Master Password isn't deactivated when the password field is empty
+                closeTabletKeyboard();
+                mSolo.clickOnButton("OK");
+
+                // Verify that the Master Password isn't deactivated when using the wrong password
+                closeTabletKeyboard();
+                editPasswordField(0, badPassword);
+                mSolo.clickOnButton("OK");
+
+                // Verify that the Master Password is deactivated when using the right password
+                closeTabletKeyboard();
+                editPasswordField(0, password);
+                mSolo.clickOnButton("OK");
+
+                // Verify that the Master Password is triggered once per session
+                noDoorhangerDisplayed(LOGIN_URL);// Check that the doorhanger isn't displayed
+            }
+            else {
+                clearPrivateData();
+                doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed
+                mSolo.clickOnButton(item);
+                doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed again
+                mSolo.clickOnButton(item);
+                mSolo.waitForText("Browser Blank Page 01");
+            }
+        }
+    }
+}

From 9f1587bfc63b3edef7776993883ca15ac515e5f3 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Fri, 31 May 2013 16:51:49 +0200
Subject: [PATCH 64/85] Bug 877127. r=bhackett

--HG--
extra : rebase_source : d75719044ef260761a0c4b7d67bcfd2a2ee5566d
---
 js/src/ion/IonBuilder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index b1fc042fedd..d8ff77a7eae 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -4953,7 +4953,7 @@ DOMCallNeedsBarrier(const JSJitInfo* jitinfo, types::StackTypeSet *types)
         return true;
 
     // No need for a barrier if we're already expecting the type we'll produce.
-    return jitinfo->returnType == types->getKnownTypeTag();
+    return jitinfo->returnType != types->getKnownTypeTag();
 }
 
 bool

From 567bd29ab853aeaebac75ad9ecd621a95572681b Mon Sep 17 00:00:00 2001
From: Kannan Vijayan <kvijayan@mozilla.com>
Date: Fri, 31 May 2013 11:22:22 -0400
Subject: [PATCH 65/85] Bug 877589 - Check for null-prototype in proto-chain
 guard in SetElem_Dense and SetElem_DenseAdd stubs. r=jandem

---
 js/src/ion/BaselineIC.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/src/ion/BaselineIC.cpp b/js/src/ion/BaselineIC.cpp
index b3b36c7ca99..32bb06227bd 100644
--- a/js/src/ion/BaselineIC.cpp
+++ b/js/src/ion/BaselineIC.cpp
@@ -4509,6 +4509,7 @@ ICSetElemDenseAddCompiler::generateStubCode(MacroAssembler &masm)
     Register protoReg = regs.takeAny();
     for (size_t i = 0; i < protoChainDepth_; i++) {
         masm.loadObjProto(i == 0 ? obj : protoReg, protoReg);
+        masm.branchTestPtr(Assembler::Zero, protoReg, protoReg, &failureUnstow);
         masm.loadPtr(Address(BaselineStubReg, ICSetElem_DenseAddImpl<0>::offsetOfShape(i + 1)),
                      scratchReg);
         masm.branchTestObjShape(Assembler::NotEqual, protoReg, scratchReg, &failureUnstow);
@@ -6463,6 +6464,7 @@ ICSetPropNativeAddCompiler::generateStubCode(MacroAssembler &masm)
     // Check the proto chain.
     for (size_t i = 0; i < protoChainDepth_; i++) {
         masm.loadObjProto(i == 0 ? objReg : protoReg, protoReg);
+        masm.branchTestPtr(Assembler::Zero, protoReg, protoReg, &failureUnstow);
         masm.loadPtr(Address(BaselineStubReg, ICSetProp_NativeAddImpl<0>::offsetOfShape(i + 1)),
                      scratch);
         masm.branchTestObjShape(Assembler::NotEqual, protoReg, scratch, &failureUnstow);

From c9cecae7a9886b49a4d811fd85eea2a52a2261a6 Mon Sep 17 00:00:00 2001
From: "Nicholas D. Matsakis" <nmatsakis@mozilla.com>
Date: Tue, 9 Apr 2013 00:04:44 -0700
Subject: [PATCH 66/85] Bug 871634 - Rerun GVN after UCE r=dvander

---
 js/src/ion/MIR.h                          |  3 +++
 js/src/ion/UnreachableCodeElimination.cpp | 16 +++++++++++++++-
 js/src/ion/ValueNumbering.cpp             | 18 ++++++++++++++++++
 js/src/ion/ValueNumbering.h               |  1 +
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 85934212490..50ad5a12f93 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -371,6 +371,9 @@ class MDefinition : public MNode
     ValueNumberData *valueNumberData() {
         return valueNumber_;
     }
+    void clearValueNumberData() {
+        valueNumber_ = NULL;
+    }
     void setValueNumberData(ValueNumberData *vn) {
         JS_ASSERT(valueNumber_ == NULL);
         valueNumber_ = vn;
diff --git a/js/src/ion/UnreachableCodeElimination.cpp b/js/src/ion/UnreachableCodeElimination.cpp
index 50a27363928..0710d54ba08 100644
--- a/js/src/ion/UnreachableCodeElimination.cpp
+++ b/js/src/ion/UnreachableCodeElimination.cpp
@@ -7,6 +7,7 @@
 #include "UnreachableCodeElimination.h"
 #include "IonAnalysis.h"
 #include "AliasAnalysis.h"
+#include "ValueNumbering.h"
 
 using namespace js;
 using namespace ion;
@@ -63,7 +64,7 @@ UnreachableCodeElimination::removeUnmarkedBlocksAndCleanup()
 
     AssertGraphCoherency(graph_);
 
-    IonSpewPass("UCEMidPoint");
+    IonSpewPass("UCE-mid-point");
 
     // Pass 3: Recompute dominators and tweak phis.
     BuildDominatorTree(graph_);
@@ -77,6 +78,19 @@ UnreachableCodeElimination::removeUnmarkedBlocksAndCleanup()
             return false;
     }
 
+    // Pass 5: It's important for optimizations to re-run GVN (and in
+    // turn alias analysis) after UCE if we eliminated branches.
+    if (rerunAliasAnalysis_ && js_IonOptions.gvn) {
+        ValueNumberer gvn(mir_, graph_, js_IonOptions.gvnIsOptimistic);
+        if (!gvn.clear() || !gvn.analyze())
+            return false;
+        IonSpewPass("GVN-after-UCE");
+        AssertExtendedGraphCoherency(graph_);
+
+        if (mir_->shouldCancel("GVN-after-UCE"))
+            return false;
+    }
+
     return true;
 }
 
diff --git a/js/src/ion/ValueNumbering.cpp b/js/src/ion/ValueNumbering.cpp
index a8b83b5dc95..a2ec0965464 100644
--- a/js/src/ion/ValueNumbering.cpp
+++ b/js/src/ion/ValueNumbering.cpp
@@ -422,6 +422,24 @@ ValueNumberer::analyze()
     return computeValueNumbers() && eliminateRedundancies();
 }
 
+// Called by the compiler if we need to re-run GVN.
+bool
+ValueNumberer::clear()
+{
+    IonSpew(IonSpew_GVN, "Clearing value numbers");
+
+    // Clear the VN of every MDefinition
+    for (ReversePostorderIterator block(graph_.rpoBegin()); block != graph_.rpoEnd(); block++) {
+        if (mir->shouldCancel("Value Numbering (clearing)"))
+            return false;
+        for (MDefinitionIterator iter(*block); iter; iter++)
+            iter->clearValueNumberData();
+        block->lastIns()->clearValueNumberData();
+    }
+
+    return true;
+}
+
 uint32_t
 MDefinition::valueNumber() const
 {
diff --git a/js/src/ion/ValueNumbering.h b/js/src/ion/ValueNumbering.h
index c90eb7ca62e..fafc1cb98ee 100644
--- a/js/src/ion/ValueNumbering.h
+++ b/js/src/ion/ValueNumbering.h
@@ -86,6 +86,7 @@ class ValueNumberer
   public:
     ValueNumberer(MIRGenerator *mir, MIRGraph &graph, bool optimistic);
     bool analyze();
+    bool clear();
 };
 
 class ValueNumberData : public TempObject {

From 27618bb68c52269d92146df567f3461e23845a9a Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Fri, 31 May 2013 11:27:05 -0400
Subject: [PATCH 67/85] Bug 876080.  Don't use 'nativeOwnership':'owned' for
 MediaList.  r=bzbarsky

---
 dom/bindings/Bindings.conf                    |  2 -
 dom/bindings/Codegen.py                       |  6 +++
 .../src/peerconnection/MediaStreamList.cpp    | 41 +++++++++++++------
 .../src/peerconnection/MediaStreamList.h      | 14 +++++--
 .../src/peerconnection/PeerConnectionImpl.cpp | 18 +++++---
 5 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index ef0b36fb4e7..a8bb08fd6b6 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -599,8 +599,6 @@ DOMInterfaces = {
 
 'MediaStreamList': {
     'headerFile': 'MediaStreamList.h',
-    'wrapperCache': False,
-    'nativeOwnership': 'owned',
     'resultNotAddRefed': [ '__indexedGetter' ],
     'binaryNames': { '__indexedGetter': 'IndexedGetter' }
 },
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 8c540487eac..09b7d684068 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -7516,6 +7516,12 @@ class CGDescriptor(CGThing):
 
         if descriptor.concrete:
             if descriptor.proxy:
+                if descriptor.nativeOwnership != 'nsisupports':
+                    raise TypeError("We don't support non-nsISupports native classes for "
+                                    "proxy-based bindings yet (" + descriptor.name + ")")
+                if not descriptor.wrapperCache:
+                    raise TypeError("We need a wrappercache to support expandos for proxy-based "
+                                    "bindings (" + descriptor.name + ")")
                 cgThings.append(CGProxyIsProxy(descriptor))
                 cgThings.append(CGProxyUnwrap(descriptor))
                 cgThings.append(CGDOMJSProxyHandlerDOMClass(descriptor))
diff --git a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
index 7a2d2f708bd..fcd76b3c861 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
@@ -7,6 +7,7 @@
 #include "MediaStreamList.h"
 #ifdef MOZILLA_INTERNAL_API
 #include "mozilla/dom/MediaStreamListBinding.h"
+#include "nsContentUtils.h"
 #endif
 #include "nsIScriptGlobalObject.h"
 #include "PeerConnectionImpl.h"
@@ -19,33 +20,47 @@ MediaStreamList::MediaStreamList(sipcc::PeerConnectionImpl* peerConnection,
   : mPeerConnection(peerConnection),
     mType(type)
 {
-  MOZ_COUNT_CTOR(mozilla::dom::MediaStreamList);
+  SetIsDOMBinding();
 }
 
 MediaStreamList::~MediaStreamList()
 {
-  MOZ_COUNT_DTOR(mozilla::dom::MediaStreamList);
 }
 
+#ifdef MOZILLA_INTERNAL_API
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(MediaStreamList)
+#else
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(MediaStreamList)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(MediaStreamList)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(MediaStreamList)
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+#endif
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(MediaStreamList)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(MediaStreamList)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaStreamList)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
 JSObject*
-MediaStreamList::WrapObject(JSContext* cx, bool* aTookOwnership)
+MediaStreamList::WrapObject(JSContext* cx, JS::Handle<JSObject*> scope)
 {
 #ifdef MOZILLA_INTERNAL_API
-  nsCOMPtr<nsIScriptGlobalObject> global =
-    do_QueryInterface(mPeerConnection->GetWindow());
-  JS::Rooted<JSObject*> scope(cx, global->GetGlobalJSObject());
-  if (!scope) {
-    return nullptr;
-  }
-
-  JSAutoCompartment ac(cx, scope);
-  JSObject* obj = MediaStreamListBinding::Wrap(cx, scope, this, aTookOwnership);
-  return obj;
+  return MediaStreamListBinding::Wrap(cx, scope, this);
 #else
   return nullptr;
 #endif
 }
 
+nsISupports*
+MediaStreamList::GetParentObject()
+{
+  return mPeerConnection->GetWindow();
+}
+
 template<class T>
 static DOMMediaStream*
 GetStreamFromInfo(T* info, bool& found)
diff --git a/media/webrtc/signaling/src/peerconnection/MediaStreamList.h b/media/webrtc/signaling/src/peerconnection/MediaStreamList.h
index fa71d0ecb6b..2b45984aa0b 100644
--- a/media/webrtc/signaling/src/peerconnection/MediaStreamList.h
+++ b/media/webrtc/signaling/src/peerconnection/MediaStreamList.h
@@ -9,7 +9,7 @@
 #include "nsISupportsImpl.h"
 #include "nsAutoPtr.h"
 #include "jspubtd.h"
-#include "mozilla/dom/NonRefcountedDOMObject.h"
+#include "nsWrapperCache.h"
 
 #ifdef USE_FAKE_MEDIA_STREAMS
 #include "FakeMediaStreams.h"
@@ -24,7 +24,8 @@ class PeerConnectionImpl;
 namespace mozilla {
 namespace dom {
 
-class MediaStreamList : public NonRefcountedDOMObject
+class MediaStreamList : public nsISupports,
+                        public nsWrapperCache
 {
 public:
   enum StreamType {
@@ -33,9 +34,14 @@ public:
   };
 
   MediaStreamList(sipcc::PeerConnectionImpl* peerConnection, StreamType type);
-  ~MediaStreamList();
+  virtual ~MediaStreamList();
 
-  JSObject* WrapObject(JSContext* cx, bool* aTookOwnership);
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MediaStreamList)
+
+  virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
+    MOZ_OVERRIDE;
+  nsISupports* GetParentObject();
 
   DOMMediaStream* IndexedGetter(uint32_t index, bool& found);
   uint32_t Length();
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index da25068e289..89c898e70e0 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -1486,18 +1486,24 @@ static nsresult
 GetStreams(JSContext* cx, PeerConnectionImpl* peerConnection,
            MediaStreamList::StreamType type, JS::Value* streams)
 {
-  nsAutoPtr<MediaStreamList> list(new MediaStreamList(peerConnection, type));
+  nsRefPtr<MediaStreamList> list(new MediaStreamList(peerConnection, type));
 
-  bool tookOwnership = false;
-  JSObject* obj = list->WrapObject(cx, &tookOwnership);
-  if (!tookOwnership) {
+  nsCOMPtr<nsIScriptGlobalObject> global =
+    do_QueryInterface(peerConnection->GetWindow());
+  JS::Rooted<JSObject*> scope(cx, global->GetGlobalJSObject());
+  if (!scope) {
+    streams->setNull();
+    return NS_ERROR_FAILURE;
+  }
+
+  JSAutoCompartment ac(cx, scope);
+  JSObject* obj = list->WrapObject(cx, scope);
+  if (!obj) {
     streams->setNull();
     return NS_ERROR_FAILURE;
   }
 
-  // Transfer ownership to the binding.
   streams->setObject(*obj);
-  list.forget();
   return NS_OK;
 }
 #endif

From 5ce2573638bfde3568a2cae873f2846acc815dc0 Mon Sep 17 00:00:00 2001
From: Max Li <maxli@maxli.ca>
Date: Sat, 7 Apr 2012 14:16:05 -0400
Subject: [PATCH 68/85] Bug 743250 - test_xhr_implicit_cancel.html is() calls
 miss their msg parameter. r=khuey

---
 dom/workers/test/test_xhr_implicit_cancel.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/workers/test/test_xhr_implicit_cancel.html b/dom/workers/test/test_xhr_implicit_cancel.html
index 24a74195fbb..bf95c943204 100644
--- a/dom/workers/test/test_xhr_implicit_cancel.html
+++ b/dom/workers/test/test_xhr_implicit_cancel.html
@@ -24,13 +24,13 @@ Tests of DOM Worker Threads XHR(Bug 450452 )
   var worker = new Worker("xhr_implicit_cancel_worker.js");
 
   worker.onmessage = function(event) {
-    is(event.target, worker);
+    is(event.target, worker, "Expected event target for message");
     ok(true, "Worker didn't have an error");
     SimpleTest.finish();
   };
 
   worker.onerror = function(event) {
-    is(event.target, worker);
+    is(event.target, worker, "Expected event target for error");
     ok(false, "Worker had an error:" + event.data);
     SimpleTest.finish();
   }

From a49be103f951d8302c2345f9aaa67a062217bfea Mon Sep 17 00:00:00 2001
From: "ABE Hiroki (hATrayflood)" <h.rayflood@gmail.com>
Date: Sun, 30 Dec 2012 23:19:38 +0900
Subject: [PATCH 69/85] Bug 775939 - Fix gyp Makefile include error on msvc
 (change topsrcdir, srcdir and VPATH to absolute path). r=ted

---
 .../tools/gyp/pylib/gyp/generator/mozmake.py   | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
index b4956f4c0c7..5ab8db2b3a6 100644
--- a/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+++ b/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
@@ -374,14 +374,10 @@ class MakefileGenerator(object):
     else:
       # Maybe nothing?
       return False
-    if self.flavor == 'win':
-      top = self.relative_topsrcdir
-    else:
-      top = self.topsrcdir
-    WriteMakefile(output_file, data, build_file, depth, top,
+    WriteMakefile(output_file, data, build_file, depth, self.topsrcdir,
                   # we set srcdir up one directory, since the subdir
                   # doesn't actually exist in the source directory
-                  swapslashes(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
+                  swapslashes(os.path.normpath(os.path.join(self.topsrcdir, self.relative_srcdir, os.path.split(rel_path)[0]))),
                   self.relative_srcdir,
                   self.common_mk_path)
     return True
@@ -437,16 +433,10 @@ def GenerateOutput(target_list, target_dicts, data, params):
   topdata = {'DIRS': generator.dirs}
   if generator.parallel_dirs:
     topdata['PARALLEL_DIRS'] = generator.parallel_dirs
-  if flavor == 'win':
-    top = relative_topsrcdir
-    src = srcdir
-  else:
-    top = topsrcdir
-    src = abs_srcdir
   WriteMakefile(makefile_path, topdata, params['build_files'][0],
                 depth,
-                swapslashes(top),
-                swapslashes(src),
+                swapslashes(topsrcdir),
+                swapslashes(abs_srcdir),
                 swapslashes(relative_srcdir),
                 common_mk_path)
   scriptname = "$(topsrcdir)/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py"

From 408b70f2b032033d6a490f06948dd5bb1b871ab1 Mon Sep 17 00:00:00 2001
From: Girish Sharma <scrapmachines@gmail.com>
Date: Fri, 31 May 2013 11:26:13 +0530
Subject: [PATCH 70/85] Bug 844606 - Remove all selected entries while removing
 items from history. r=mano

---
 .../downloads/content/allDownloadsViewOverlay.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/browser/components/downloads/content/allDownloadsViewOverlay.js b/browser/components/downloads/content/allDownloadsViewOverlay.js
index 48e2b3047f4..f3664d24f3f 100644
--- a/browser/components/downloads/content/allDownloadsViewOverlay.js
+++ b/browser/components/downloads/content/allDownloadsViewOverlay.js
@@ -992,17 +992,19 @@ DownloadsPlacesView.prototype = {
 
   _removeElement: function DPV__removeElement(aElement) {
     // If the element was selected exclusively, select its next
-    // sibling first, if any.
-    if (aElement.nextSibling &&
+    // sibling first, if not, try for previous sibling, if any.
+    if ((aElement.nextSibling || aElement.previousSibling) &&
         this._richlistbox.selectedItems &&
-        this._richlistbox.selectedItems.length > 0 &&
+        this._richlistbox.selectedItems.length == 1 &&
         this._richlistbox.selectedItems[0] == aElement) {
-      this._richlistbox.selectItem(aElement.nextSibling);
+      this._richlistbox.selectItem(aElement.nextSibling ||
+                                   aElement.previousSibling);
     }
 
     if (this._lastSessionDownloadElement == aElement)
       this._lastSessionDownloadElement = aElement.previousSibling;
 
+    this._richlistbox.removeItemFromSelection(aElement);
     this._richlistbox.removeChild(aElement);
     this._ensureVisibleElementsAreActive();
     goUpdateCommand("downloadsCmd_clearDownloads");
@@ -1461,7 +1463,11 @@ DownloadsPlacesView.prototype = {
         goUpdateCommand("downloadsCmd_clearDownloads");
         break;
       default: {
-        let selectedElements = this._richlistbox.selectedItems;
+        // Slicing the array to get a freezed list of selected items. Otherwise,
+        // the selectedItems array is live and doCommand may alter the selection
+        // while we are trying to do one particular action, like removing items
+        // from history.
+        let selectedElements = this._richlistbox.selectedItems.slice();
         for (let element of selectedElements) {
           element._shell.doCommand(aCommand);
         }

From e3a11dcceda6cfe634d8f82e9d8e3269cc51f3ea Mon Sep 17 00:00:00 2001
From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Fri, 31 May 2013 11:48:33 -0400
Subject: [PATCH 71/85] Bug 877409 - Replace depreciated GDK_ROOT_PARENT().
 r=karlt

---
 widget/gtk2/nsWindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp
index 4512b4669f5..e58386d1135 100644
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -1952,7 +1952,7 @@ gdk_window_flash(GdkWindow *    aGdkWindow,
                          &x,
                          &y);
 
-  gc = gdk_gc_new(GDK_ROOT_PARENT());
+  gc = gdk_gc_new(gdk_get_default_root_window());
 
   white.pixel = WhitePixel(gdk_display,DefaultScreen(gdk_display));
 
@@ -1969,7 +1969,7 @@ gdk_window_flash(GdkWindow *    aGdkWindow,
    */
   for (i = 0; i < aTimes * 2; i++)
   {
-    gdk_draw_rectangle(GDK_ROOT_PARENT(),
+    gdk_draw_rectangle(gdk_get_default_root_window(),
                        gc,
                        TRUE,
                        x,

From 5046c8ffeee00684e17cb096c5bd8e7ae32ea39e Mon Sep 17 00:00:00 2001
From: Sean Stangl <sstangl@mozilla.com>
Date: Tue, 28 May 2013 18:57:56 -0700
Subject: [PATCH 72/85] Bug 877021 - Speed up CreateRegExpMatchResult().
 r=h4writer

---
 js/src/builtin/RegExp.cpp | 71 +++++++++++++++------------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index 2f3ea0f25ed..758c39ed606 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -18,42 +18,19 @@ using namespace js::types;
 
 using mozilla::ArrayLength;
 
-class RegExpMatchBuilder
+static inline bool
+DefinePropertyHelper(JSContext *cx, HandleObject obj, Handle<PropertyName*> name, HandleValue v)
 {
-    JSContext   * const cx;
-    RootedObject array;
-
-    bool setProperty(Handle<PropertyName*> name, HandleValue v) {
-        return !!baseops::DefineProperty(cx, array, name, v,
-                                         JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE);
-    }
-
-  public:
-    RegExpMatchBuilder(JSContext *cx, HandleObject array) : cx(cx), array(cx, array) {}
-
-    bool append(uint32_t index, HandleValue v) {
-        JS_ASSERT(!array->getOps()->getElement);
-        return !!baseops::DefineElement(cx, array, index, v, JS_PropertyStub, JS_StrictPropertyStub,
-                                        JSPROP_ENUMERATE);
-    }
-
-    bool setIndex(int index) {
-        RootedValue value(cx, Int32Value(index));
-        return setProperty(cx->names().index, value);
-    }
-
-    bool setInput(HandleString str) {
-        JS_ASSERT(str);
-        RootedValue value(cx, StringValue(str));
-        return setProperty(cx->names().input, value);
-    }
-};
+    return !!baseops::DefineProperty(cx, obj, name, v,
+                                     JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE);
+}
 
 bool
 js::CreateRegExpMatchResult(JSContext *cx, HandleString input_, const jschar *chars, size_t length,
                             MatchPairs &matches, MutableHandleValue rval)
 {
     RootedString input(cx, input_);
+    RootedValue undefinedValue(cx, UndefinedValue());
 
     /*
      * Create the (slow) result array for a match.
@@ -64,39 +41,47 @@ js::CreateRegExpMatchResult(JSContext *cx, HandleString input_, const jschar *ch
      *  input:          input string
      *  index:          start index for the match
      */
-    RootedObject array(cx, NewDenseEmptyArray(cx));
-    if (!array)
-        return false;
-
     if (!input) {
         input = js_NewStringCopyN<CanGC>(cx, chars, length);
         if (!input)
             return false;
     }
 
-    RegExpMatchBuilder builder(cx, array);
-    RootedValue undefinedValue(cx, UndefinedValue());
-
     size_t numPairs = matches.length();
     JS_ASSERT(numPairs > 0);
 
+    AutoValueVector elements(cx);
+    if (!elements.reserve(numPairs))
+        return false;
+
+    /* Accumulate a Value for each pair, in a rooted vector. */
     for (size_t i = 0; i < numPairs; ++i) {
         const MatchPair &pair = matches[i];
 
-        RootedString captured(cx);
         if (pair.isUndefined()) {
             JS_ASSERT(i != 0); /* Since we had a match, first pair must be present. */
-            if (!builder.append(i, undefinedValue))
-                return false;
+            elements.infallibleAppend(undefinedValue);
         } else {
-            captured = js_NewDependentString(cx, input, pair.start, pair.length());
-            RootedValue value(cx, StringValue(captured));
-            if (!captured || !builder.append(i, value))
+            JSLinearString *str = js_NewDependentString(cx, input, pair.start, pair.length());
+            if (!str)
                 return false;
+            elements.infallibleAppend(StringValue(str));
         }
     }
 
-    if (!builder.setIndex(matches[0].start) || !builder.setInput(input))
+    /* Copy the rooted vector into the array object. */
+    RootedObject array(cx, NewDenseCopiedArray(cx, elements.length(), elements.begin()));
+    if (!array)
+        return false;
+
+    /* Set the |index| property. */
+    RootedValue index(cx, Int32Value(matches[0].start));
+    if (!DefinePropertyHelper(cx, array, cx->names().index, index))
+        return false;
+
+    /* Set the |input| property. */
+    RootedValue inputVal(cx, StringValue(input));
+    if (!DefinePropertyHelper(cx, array, cx->names().input, inputVal))
         return false;
 
     rval.setObject(*array);

From fc2fb3b2020a5678ef939e50017efa113bebae19 Mon Sep 17 00:00:00 2001
From: Nikhil Marathe <nsm.nikhil@gmail.com>
Date: Thu, 30 May 2013 08:08:07 -0700
Subject: [PATCH 73/85] Bug 876935 - Millisecond calculation in AlarmService.
 r=gene

---
 dom/alarm/AlarmService.jsm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dom/alarm/AlarmService.jsm b/dom/alarm/AlarmService.jsm
index 556170ff907..8c03bfe5fcd 100644
--- a/dom/alarm/AlarmService.jsm
+++ b/dom/alarm/AlarmService.jsm
@@ -92,11 +92,15 @@ this.AlarmService = {
   },
   set _currentAlarm(aAlarm) {
     this._alarm = aAlarm;
-    if (!aAlarm)
+    if (!aAlarm) {
       return;
+    }
 
-    if (!this._alarmHalService.setAlarm(this._getAlarmTime(aAlarm) / 1000, 0))
+    let alarmTimeInMs = this._getAlarmTime(aAlarm);
+    let ns = (alarmTimeInMs % 1000) * 1000000;
+    if (!this._alarmHalService.setAlarm(alarmTimeInMs / 1000, ns)) {
       throw Components.results.NS_ERROR_FAILURE;
+    }
   },
 
   receiveMessage: function receiveMessage(aMessage) {

From 1a1cd79e1cd24168d95119765ebd3abf093d8ea8 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Thu, 30 May 2013 12:08:15 -0400
Subject: [PATCH 74/85] Bug 865207 - Move webapps actor from
 /b2g/chrome/content to /toolkit/devtools/apps/. r=fabrice, r=dcamp

--HG--
rename : dom/apps/tests/unit/data/app.zip => toolkit/devtools/apps/tests/unit/data/app.zip
rename : dom/apps/tests/unit/test_webappsActor.js => toolkit/devtools/apps/tests/unit/test_webappsActor.js
rename : b2g/chrome/content/dbg-webapps-actors.js => toolkit/devtools/server/actors/webapps.js
---
 b2g/chrome/content/shell.js                   |   2 +-
 b2g/chrome/jar.mn                             |   1 -
 dom/apps/src/Webapps.jsm                      |   5 ++
 dom/apps/tests/unit/xpcshell.ini              |   2 -
 testing/xpcshell/xpcshell.ini                 |   1 +
 testing/xpcshell/xpcshell_b2g.ini             |   1 +
 toolkit/devtools/apps/Makefile.in             |  15 +++++
 toolkit/devtools/apps/moz.build               |   7 +++
 toolkit/devtools/apps/tests/Makefile.in       |  15 +++++
 toolkit/devtools/apps/tests/moz.build         |   7 +++
 .../devtools}/apps/tests/unit/data/app.zip    | Bin
 .../apps/tests/unit/test_webappsActor.js      |  52 +++++++++++++++++-
 toolkit/devtools/apps/tests/unit/xpcshell.ini |   5 ++
 toolkit/devtools/moz.build                    |   3 +-
 .../devtools/server/actors/webapps.js         |  44 +++++++--------
 toolkit/devtools/server/main.js               |   1 +
 16 files changed, 131 insertions(+), 30 deletions(-)
 create mode 100644 toolkit/devtools/apps/Makefile.in
 create mode 100644 toolkit/devtools/apps/moz.build
 create mode 100644 toolkit/devtools/apps/tests/Makefile.in
 create mode 100644 toolkit/devtools/apps/tests/moz.build
 rename {dom => toolkit/devtools}/apps/tests/unit/data/app.zip (100%)
 rename {dom => toolkit/devtools}/apps/tests/unit/test_webappsActor.js (79%)
 create mode 100644 toolkit/devtools/apps/tests/unit/xpcshell.ini
 rename b2g/chrome/content/dbg-webapps-actors.js => toolkit/devtools/server/actors/webapps.js (91%)

diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 25219860975..0044c2add94 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -1009,7 +1009,7 @@ let RemoteDebugger = {
       }
       DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
       DebuggerServer.addActors('chrome://browser/content/dbg-browser-actors.js');
-      DebuggerServer.addActors('chrome://browser/content/dbg-webapps-actors.js');
+      DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webapps.js");
     }
 
     let port = Services.prefs.getIntPref('devtools.debugger.remote-port') || 6000;
diff --git a/b2g/chrome/jar.mn b/b2g/chrome/jar.mn
index 886e9e17327..2104fdbf2e5 100644
--- a/b2g/chrome/jar.mn
+++ b/b2g/chrome/jar.mn
@@ -10,7 +10,6 @@ chrome.jar:
 
   content/arrow.svg                     (content/arrow.svg)
 * content/dbg-browser-actors.js         (content/dbg-browser-actors.js)
-* content/dbg-webapps-actors.js         (content/dbg-webapps-actors.js)
   content/forms.js                      (content/forms.js)
 * content/settings.js                   (content/settings.js)
 * content/shell.xul                     (content/shell.xul)
diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm
index 683b19493ce..ac33a3e8a58 100644
--- a/dom/apps/src/Webapps.jsm
+++ b/dom/apps/src/Webapps.jsm
@@ -84,6 +84,11 @@ this.DOMApplicationRegistry = {
   webapps: { },
   children: [ ],
   allAppsLaunchable: false,
+#ifdef MOZ_OFFICIAL_BRANDING
+  get allowSideloadingCertified() false,
+#else
+  get allowSideloadingCertified() true,
+#endif
 
   init: function() {
     this.messages = ["Webapps:Install", "Webapps:Uninstall",
diff --git a/dom/apps/tests/unit/xpcshell.ini b/dom/apps/tests/unit/xpcshell.ini
index 7d8fa3e6b72..bacd1de945e 100644
--- a/dom/apps/tests/unit/xpcshell.ini
+++ b/dom/apps/tests/unit/xpcshell.ini
@@ -3,5 +3,3 @@ head =
 tail =
 
 [test_manifestSanitizer.js]
-[test_webappsActor.js]
-run-if = toolkit == "gonk"
diff --git a/testing/xpcshell/xpcshell.ini b/testing/xpcshell/xpcshell.ini
index 18b4b78eefb..15be2202c67 100644
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -30,6 +30,7 @@
 [include:toolkit/components/contentprefs/tests/unit/xpcshell.ini]
 [include:toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini]
 [include:toolkit/devtools/server/tests/unit/xpcshell.ini]
+[include:toolkit/devtools/apps/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]
 [include:toolkit/components/passwordmgr/test/unit/xpcshell.ini]
 # Bug 676989: tests hang on Android
diff --git a/testing/xpcshell/xpcshell_b2g.ini b/testing/xpcshell/xpcshell_b2g.ini
index 8668cb5cf22..45f06aaa8ba 100644
--- a/testing/xpcshell/xpcshell_b2g.ini
+++ b/testing/xpcshell/xpcshell_b2g.ini
@@ -5,6 +5,7 @@
 [include:dom/apps/tests/unit/xpcshell.ini]
 [include:dom/mobilemessage/tests/xpcshell.ini]
 [include:dom/system/gonk/tests/xpcshell.ini]
+[include:toolkit/devtools/apps/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]
 [include:toolkit/mozapps/downloads/tests/unit/xpcshell.ini]
diff --git a/toolkit/devtools/apps/Makefile.in b/toolkit/devtools/apps/Makefile.in
new file mode 100644
index 00000000000..57f2fc4df4a
--- /dev/null
+++ b/toolkit/devtools/apps/Makefile.in
@@ -0,0 +1,15 @@
+# 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/.
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
+#libs::
+#	$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/toolkit/devtools/apps/moz.build b/toolkit/devtools/apps/moz.build
new file mode 100644
index 00000000000..1465d98b2e1
--- /dev/null
+++ b/toolkit/devtools/apps/moz.build
@@ -0,0 +1,7 @@
+# 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/.
+
+TEST_DIRS += ['tests']
+
diff --git a/toolkit/devtools/apps/tests/Makefile.in b/toolkit/devtools/apps/tests/Makefile.in
new file mode 100644
index 00000000000..3afec4be6a2
--- /dev/null
+++ b/toolkit/devtools/apps/tests/Makefile.in
@@ -0,0 +1,15 @@
+# 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/.
+
+DEPTH           = @DEPTH@
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+relativesrcdir = @relativesrcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+XPCSHELL_TESTS = unit
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/devtools/apps/tests/moz.build b/toolkit/devtools/apps/tests/moz.build
new file mode 100644
index 00000000000..293d11b386a
--- /dev/null
+++ b/toolkit/devtools/apps/tests/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+MODULE = 'test_webapps_actor'
diff --git a/dom/apps/tests/unit/data/app.zip b/toolkit/devtools/apps/tests/unit/data/app.zip
similarity index 100%
rename from dom/apps/tests/unit/data/app.zip
rename to toolkit/devtools/apps/tests/unit/data/app.zip
diff --git a/dom/apps/tests/unit/test_webappsActor.js b/toolkit/devtools/apps/tests/unit/test_webappsActor.js
similarity index 79%
rename from dom/apps/tests/unit/test_webappsActor.js
rename to toolkit/devtools/apps/tests/unit/test_webappsActor.js
index 703834254bd..126d8a100b2 100644
--- a/dom/apps/tests/unit/test_webappsActor.js
+++ b/toolkit/devtools/apps/tests/unit/test_webappsActor.js
@@ -7,6 +7,11 @@ Components.utils.import("resource://gre/modules/devtools/dbg-client.jsm");
 Components.utils.import("resource://gre/modules/FileUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cu = Components.utils;
+const Cr = Components.results;
+
 let gClient, gActor;
 let gAppId = "actor-test";
 
@@ -16,7 +21,6 @@ add_test(function testSetup() {
   // We need to register browser actors to have `listTabs` working
   // and also have a root actor
   DebuggerServer.addBrowserActors();
-  DebuggerServer.addActors("chrome://browser/content/dbg-webapps-actors.js");
 
   // Setup client and actor used in all tests
   gClient = new DebuggerClient(DebuggerServer.connectPipe());
@@ -61,6 +65,12 @@ add_test(function testInstallPackaged() {
   // if the installation succeed or failed
   gClient.addListener("webappsEvent", function (aState, aType, aPacket) {
     do_check_eq(aType.appId, gAppId);
+    if ("error" in aType) {
+      do_print("Error: " + aType.error);
+    }
+    if ("message" in aType) {
+      do_print("Error message: " + aType.message);
+    }
     do_check_eq("error" in aType, false);
 
     run_next_test();
@@ -175,6 +185,10 @@ function run_test() {
   // will throw random exception when trying to get profile folder
   do_get_profile();
 
+  // The webapps dir isn't registered on b2g xpcshell tests,
+  // we have to manually set it to the directory service.
+  do_get_webappsdir();
+
   // We also need a valid nsIXulAppInfo service as Webapps.jsm is querying it
   Components.utils.import("resource://testing-common/AppInfo.jsm");
   updateAppInfo();
@@ -187,3 +201,39 @@ function run_test() {
   run_next_test();
 }
 
+function do_get_webappsdir() {
+  var webappsDir = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
+  webappsDir.append("test_webapps");
+  if (!webappsDir.exists())
+    webappsDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0755);
+
+  var coreAppsDir = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
+  coreAppsDir.append("test_coreapps");
+  if (!coreAppsDir.exists())
+    coreAppsDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0755);
+
+  // Register our own provider for the profile directory.
+  // It will return our special docshell profile directory.
+  var provider = {
+    getFile: function(prop, persistent) {
+      persistent.value = true;
+      if (prop == "webappsDir") {
+        return webappsDir.clone();
+      }
+      else if (prop == "coreAppsDir") {
+        return coreAppsDir.clone();
+      }
+      throw Cr.NS_ERROR_FAILURE;
+    },
+    QueryInterface: function(iid) {
+      if (iid.equals(Ci.nsIDirectoryServiceProvider) ||
+          iid.equals(Ci.nsISupports)) {
+        return this;
+      }
+      throw Cr.NS_ERROR_NO_INTERFACE;
+    }
+  };
+  Services.dirsvc.QueryInterface(Ci.nsIDirectoryService).registerProvider(provider);
+}
+
+
diff --git a/toolkit/devtools/apps/tests/unit/xpcshell.ini b/toolkit/devtools/apps/tests/unit/xpcshell.ini
new file mode 100644
index 00000000000..06e25f96304
--- /dev/null
+++ b/toolkit/devtools/apps/tests/unit/xpcshell.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+head =
+tail =
+
+[test_webappsActor.js]
diff --git a/toolkit/devtools/moz.build b/toolkit/devtools/moz.build
index e7e002968d3..e265608954d 100644
--- a/toolkit/devtools/moz.build
+++ b/toolkit/devtools/moz.build
@@ -9,5 +9,6 @@ PARALLEL_DIRS += [
     'client',
     'gcli',
     'sourcemap',
-    'webconsole'
+    'webconsole',
+    'apps'
 ]
diff --git a/b2g/chrome/content/dbg-webapps-actors.js b/toolkit/devtools/server/actors/webapps.js
similarity index 91%
rename from b2g/chrome/content/dbg-webapps-actors.js
rename to toolkit/devtools/server/actors/webapps.js
index d486c2d82d7..cb7dedcb018 100644
--- a/b2g/chrome/content/dbg-webapps-actors.js
+++ b/toolkit/devtools/server/actors/webapps.js
@@ -8,12 +8,6 @@ let Cu = Components.utils;
 let Cc = Components.classes;
 let Ci = Components.interfaces;
 
-Cu.import("resource://gre/modules/Webapps.jsm");
-Cu.import("resource://gre/modules/AppsUtils.jsm");
-Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import('resource://gre/modules/Services.jsm');
-Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
-
 function debug(aMsg) {
   /*
   Cc["@mozilla.org/consoleservice;1"]
@@ -22,17 +16,21 @@ function debug(aMsg) {
   */
 }
 
-#ifdef MOZ_WIDGET_GONK
-  const DIRECTORY_NAME = "webappsDir";
-#else
-  const DIRECTORY_NAME = "ProfD";
-#endif
-
 /**
  * Creates a WebappsActor. WebappsActor provides remote access to
  * install apps.
  */
-function WebappsActor(aConnection) { debug("init"); }
+function WebappsActor(aConnection) {
+  debug("init");
+  // Load actor dependencies lazily as this actor require extra environnement
+  // preparation to work (like have a profile setup in xpcshell tests)
+
+  Cu.import("resource://gre/modules/Webapps.jsm");
+  Cu.import("resource://gre/modules/AppsUtils.jsm");
+  Cu.import("resource://gre/modules/FileUtils.jsm");
+  Cu.import('resource://gre/modules/Services.jsm');
+  Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js");
+}
 
 WebappsActor.prototype = {
   actorPrefix: "webapps",
@@ -46,7 +44,7 @@ WebappsActor.prototype = {
     aApp.installState = "installed";
     aApp.removable = true;
     aApp.id = aId;
-    aApp.basePath = FileUtils.getDir(DIRECTORY_NAME, ["webapps"], true).path;
+    aApp.basePath = reg.getWebAppsBasePath();
     aApp.localId = (aId in reg.webapps) ? reg.webapps[aId].localId
                                         : reg._nextLocalId();
 
@@ -128,15 +126,14 @@ WebappsActor.prototype = {
             let appType = self._getAppType(aManifest.type);
 
             // In production builds, don't allow installation of certified apps.
-#ifdef MOZ_OFFICIAL_BRANDING
-            if (appType == Ci.nsIPrincipal.APP_STATUS_CERTIFIED) {
+            if (!DOMApplicationRegistry.allowSideloadingCertified &&
+                appType == Ci.nsIPrincipal.APP_STATUS_CERTIFIED) {
               self._sendError("Installing certified apps is not allowed.", aId);
               return;
             }
-#endif
+
             // The destination directory for this app.
-            let installDir = FileUtils.getDir(DIRECTORY_NAME,
-                                              ["webapps", aId], true);
+            let installDir = DOMApplicationRegistry._getAppDir(aId);
             manFile.moveTo(installDir, "manifest.webapp");
 
             // Read the origin and manifest url from metadata.json
@@ -186,8 +183,7 @@ WebappsActor.prototype = {
       run: function run() {
         try {
           // The destination directory for this app.
-          let installDir = FileUtils.getDir(DIRECTORY_NAME,
-                                            ["webapps", aId], true);
+          let installDir = DOMApplicationRegistry._getAppDir(aId);
 
           // Move application.zip to the destination directory, and
           // extract manifest.webapp there.
@@ -210,12 +206,12 @@ WebappsActor.prototype = {
             let appType = self._getAppType(aManifest.type);
 
             // In production builds, don't allow installation of certified apps.
-#ifdef MOZ_OFFICIAL_BRANDING
-            if (appType == Ci.nsIPrincipal.APP_STATUS_CERTIFIED) {
+            if (!DOMApplicationRegistry.allowSideloadingCertified &&
+                appType == Ci.nsIPrincipal.APP_STATUS_CERTIFIED) {
               self._sendError("Installing certified apps is not allowed.", aId);
               return;
             }
-#endif
+
             let origin = "app://" + aId;
 
             // Create a fake app object with the minimum set of properties we need.
diff --git a/toolkit/devtools/server/main.js b/toolkit/devtools/server/main.js
index 182460739a3..e6c3f2cd1d4 100644
--- a/toolkit/devtools/server/main.js
+++ b/toolkit/devtools/server/main.js
@@ -184,6 +184,7 @@ var DebuggerServer = {
       this.addActors("resource://gre/modules/devtools/server/actors/profiler.js");
 
     this.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
+    this.addActors("resource://gre/modules/devtools/server/actors/webapps.js");
   },
 
   /**

From 60e1e3ca62e81e980b712628927fe569b21bf16c Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 30 May 2013 12:59:24 -0400
Subject: [PATCH 75/85] Bug 870675 - Add a test for bug 870480. r=vingtetun

We now run test_HighPriority while holding the CPU and high-priority wake locks.  This tests exactly the problem caused by bug 870480.
---
 .../mochitest/priority/test_HighPriority.html         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dom/browser-element/mochitest/priority/test_HighPriority.html b/dom/browser-element/mochitest/priority/test_HighPriority.html
index 7a4b2238452..83bbf2312fa 100644
--- a/dom/browser-element/mochitest/priority/test_HighPriority.html
+++ b/dom/browser-element/mochitest/priority/test_HighPriority.html
@@ -20,6 +20,13 @@ browserElementTestHelpers.addPermission();
 browserElementTestHelpers.enableProcessPriorityManager();
 
 function runTest() {
+  // To test bug 870480, run this test while holding the CPU and high-priority
+  // wake locks.  Without the fix for bug 870480, we won't set the priority of
+  // the child process if the main process holds these wake locks and the test
+  // will hang.
+  navigator.requestWakeLock('cpu');
+  navigator.requestWakeLock('high-priority');
+
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', true);
   iframe.setAttribute('mozapptype', 'critical');
@@ -86,8 +93,8 @@ function runTest() {
       [expectMozbrowserEvent(iframe, 'showmodalprompt').then(checkAlertInfo),
        expectPriorityChange(childID, priority).then(checkGracePeriod)]
     ).then(function(results) {
-      // expectMozbrowserEvent returns the function to call to unblock the
-      // alert.  It comes to us as the first element of the results array.
+      // checkAlertInfo returns the function to call to unblock the alert.
+      // It comes to us as the first element of the results array.
       results[0]();
     });
   }

From 0839a02f90f99658142b7c2d3e49f7e5e2459741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Thu, 30 May 2013 10:34:27 -0700
Subject: [PATCH 76/85] Bug 852720 - Allow packaged apps to have an origin
 r=ferjm

---
 dom/apps/src/Webapps.js  |  1 +
 dom/apps/src/Webapps.jsm | 62 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/dom/apps/src/Webapps.js b/dom/apps/src/Webapps.js
index e23d769b435..7f42b05f699 100644
--- a/dom/apps/src/Webapps.js
+++ b/dom/apps/src/Webapps.js
@@ -590,6 +590,7 @@ WebappsApplication.prototype = {
         this.progress = app.progress || msg.progress || 0;
         this.readyToApplyDownload = app.readyToApplyDownload;
         this.updateTime = app.updateTime;
+        this.origin = app.origin;
 
         switch(msg.type) {
           case "error":
diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm
index ac33a3e8a58..cac030f1104 100644
--- a/dom/apps/src/Webapps.jsm
+++ b/dom/apps/src/Webapps.jsm
@@ -132,6 +132,10 @@ this.DOMApplicationRegistry = {
           let appDir = FileUtils.getDir(DIRECTORY_NAME, ["webapps"], false);
           for (let id in this.webapps) {
             let app = this.webapps[id];
+            if (!app) {
+              delete this.webapps[id];
+              continue;
+            }
 
             app.id = id;
 
@@ -1141,6 +1145,8 @@ this.DOMApplicationRegistry = {
           DOMApplicationRegistry._writeFile(manFile,
                                             JSON.stringify(aManifest),
                                             function() { });
+
+          app = DOMApplicationRegistry.webapps[aId];
           // Set state and fire events.
           app.downloading = false;
           app.downloadAvailable = false;
@@ -2049,7 +2055,7 @@ this.DOMApplicationRegistry = {
       manifest = new ManifestHelper(jsonManifest, app.manifestURL);
       this.downloadPackage(manifest, appObject, false, (function(aId, aManifest) {
         // Success! Move the zip out of TmpD.
-        let app = DOMApplicationRegistry.webapps[id];
+        let app = DOMApplicationRegistry.webapps[aId];
         let zipFile = FileUtils.getFile("TmpD", ["webapps", aId, "application.zip"], true);
         let dir = FileUtils.getDir(DIRECTORY_NAME, ["webapps", aId], true, true);
         zipFile.moveTo(dir, "application.zip");
@@ -2557,15 +2563,65 @@ this.DOMApplicationRegistry = {
                   app.appStatus = AppsUtils.getAppManifestStatus(manifest);
                 }
 
+                // Check if the app declares which origin it will use.
+                if (isSigned &&
+                    app.appStatus >= Ci.nsIPrincipal.APP_STATUS_PRIVILEGED &&
+                    manifest.origin !== undefined) {
+
+                  let uri;
+                  try {
+                    uri = Services.io.newURI(manifest.origin, null, null);
+                  } catch(e) {
+                    throw "INVALID_ORIGIN";
+                  }
+
+                  if (uri.scheme != "app") {
+                    throw "INVALID_ORIGIN";
+                  }
+
+                  // Changing the origin during an update is not allowed.
+                  if (aIsUpdate && uri.prePath != app.origin) {
+                    throw "INVALID_ORIGIN_CHANGE";
+                  }
+
+                  debug("Setting origin to " + uri.prePath +
+                        " for " + app.manifestURL);
+                  let newId = uri.prePath.substring(6); // "app://".length
+
+                  if (newId in self.webapps) {
+                    throw "DUPLICATE_ORIGIN";
+                  }
+                  app.origin = uri.prePath;
+
+                  // Update the registry.
+                  app.id = newId;
+                  self.webapps[newId] = app;
+                  delete self.webapps[id];
+
+                  // Rename the directories where the files are installed.
+                  [DIRECTORY_NAME, "TmpD"].forEach(function(aDir) {
+                    let parent = FileUtils.getDir(aDir,
+                                             ["webapps"], true, true);
+                    let dir = FileUtils.getDir(aDir,
+                                             ["webapps", id], true, true);
+                    dir.moveTo(parent, newId);
+                  });
+
+                  // Signals that we need to swap the old id with the new app.
+                  self.broadcastMessage("Webapps:RemoveApp", { id: id });
+                  self.broadcastMessage("Webapps:AddApp", { id: newId,
+                                                            app: app });
+                }
+
                 if (aOnSuccess) {
-                  aOnSuccess(id, manifest);
+                  aOnSuccess(app.id, manifest);
                 }
               } catch (e) {
                 // Something bad happened when reading the package.
                 // Unrecoverable error, don't bug the user.
                 // Apps with installState 'pending' does not produce any
                 // notification, so we are safe with its current
-                // downladAvailable state.
+                // downloadAvailable state.
                 if (app.installState !== "pending") {
                   app.downloadAvailable = false;
                 }

From 3ee8d0ff82cb971cc1cbb9ebee6ee1b54e41b468 Mon Sep 17 00:00:00 2001
From: Andreas Gal <gal@uci.edu>
Date: Thu, 30 May 2013 10:52:58 -0700
Subject: [PATCH 77/85] Bug 876099 - re-enable 3gp support in web content
 r=roc, a=gal

---
 content/media/DecoderTraits.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp
index a694508310f..bad2a94b431 100644
--- a/content/media/DecoderTraits.cpp
+++ b/content/media/DecoderTraits.cpp
@@ -404,7 +404,7 @@ DecoderTraits::CreateDecoder(const nsACString& aType, MediaDecoderOwner* aOwner)
   if (IsOmxSupportedType(aType)) {
     // AMR audio is enabled for MMS, but we are discouraging Web and App
     // developers from using AMR, thus we only allow AMR to be played on WebApps.
-    if (aType.EqualsASCII("audio/amr") || aType.EqualsASCII("video/3gpp")) {
+    if (aType.EqualsASCII("audio/amr")) {
       HTMLMediaElement* element = aOwner->GetMediaElement();
       if (!element) {
         return nullptr;

From d43bbb0dde4b133f8eb7b6291180d3cb4396888c Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Thu, 30 May 2013 15:56:34 -0700
Subject: [PATCH 78/85] Bug 874459 - Set a valid window icon for desktop on
 Mac; r=myk

--HG--
extra : amend_source : 19a58dfe68f8ff349ebf8858dc8e0fb27ef51b02
---
 b2g/app/Makefile.in |   1 +
 b2g/app/b2g.icns    | Bin 0 -> 11953 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 b2g/app/b2g.icns

diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in
index 55788d37bfc..0a71a0a1764 100644
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -139,6 +139,7 @@ else
 	$(RM) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
 endif
+	cp -RL $(srcdir)/b2g.icns $(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME).icns
 	printf "APPLMOZB" > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
 
 else # MOZ_WIDGET_TOOLKIT != cocoa
diff --git a/b2g/app/b2g.icns b/b2g/app/b2g.icns
new file mode 100644
index 0000000000000000000000000000000000000000..eba850aaee10662fa3bc796ac97ec59e4c3b5df8
GIT binary patch
literal 11953
zcmd6N1yq$w*Z)3%D58R5fRwZ%E!`=NbPFm-35cjjDM$*~eZ7d+yau8m2q=P*il7qG
zA>ANI9O}$B2NbaGd%yMn)_=X@TKJr2_UxFMJ-^v|Kdug*`vHU!UH5Mh1E3@<2SFDD
zIesROuy}hQsE5L0XJc+BSAeBQA!x0<q^LYc@TdF(8gOGZ4al)btQHn=$h+>m*G$XR
zNl11h@QI3PnaBz3a{<?F3L+bUM_7P|dF5tDUG>|ch>I20aPsqUa!EQy$7iO!4~B4F
zN=_LuAvMp`oY!>94?6&!7zxX&>hC<3_AD3mqQP)2SrttKiyh`(&mWyO2<jb8GZa$L
zGB7X-dlKgaepx8r&sRZG(f(G#5k^K+28*kyUipn)A<5^}p0=KmziGeGH*<hgdEEuz
zyi-8n&QJiQuq)mSJZFOdgo9z}o=8UOWj5%%gp6r0EC++@`|WnZ*5uMCV0I3HB`dC<
zFg|?_KmuFuEa~fHZu+>l_L?))2(1K{E$-_LcShCJBwP%*c=hn!FikLaay}Gy@!*Zq
zaDDql2My4(vvdkHGl@NHlXev;3b67@>ziw;IsJM2P2S6rC^*SYBkpLu?a1Zq4<Bv(
zXRJ3--sSG>cJfJj7PfvUOiNZx-_*k1%q#8T*%|ANgcY{x8yJN@iE|-a|8nm^#Rb;K
zCGXB`+WXD=TlO3MGC$8+f6gf&VAlFSe{cPL)RU9W`?z<cDkLr&TQ7vh?^QJbT*KC1
zzgv`)nAkZn)|?IKjthKx)OWt9riVB=)bgPkC8CT9yWHyL_Wr(xzGlaPm&2)9kX2n?
z)mNU|R~6q}_vzE|{4>w0s&XF|4_5crw-i@H!-|ls_TucWhU(S^gvi#X9lcvs`z+*Q
zYR%9yy!MegQkvE_X4}o(-sc>}){iA>@hhn5ZZi%`{=*9VUQLq<W8|b1?Y^$P)s^x$
zsKWc3^*6jWd!=`y@77*9{I_erU)p020AUH>MnUoI5BV3l(F?N7KH$FuO5TX}si6dM
zAdue?DCi!esmUqSE<5vr0K#=s#L0;f6huYlLjbkD$%)Cy2^6=S5|1Dd_^QzO6p4iL
zq=5>*pjzxkoF*YeLfw|Q7t?GX!9NhfFCQ}yfG>IG7bcjPMp}yk$H*Pz?rGHJK%tGM
z#%F#_p~)-jfk1y@8cj`;rbwtj9_xn1D-|Lvtjl!~P-1-ultAtF>GMUVSu3%E*jffw
zvhS0v0athOL9mqb4$w-;DvPTcyB*kJs&91)=xCQLqGuuy=pZm6Y!`saaaifGP4|>2
z0F9`TDV`r60Au`;SqFp!)h-oR*TmTvGoF`02P0wKN&q>LEgI~byi?nIdn-=`Y?IcO
z76X}ZU}Axl{Op^=H_5357ni38>iHbls->VUfi(&RMs8r<z``dYDX+9AHu*t}r{f84
zXC15Uw9CVQk&=>!V}q!$h`5B6<F4IGd|XaP_8M&8O-UUN>z1>#Z`>lXMN-3FMMH{v
zgM#xRdqWAeMO2}{L<6)eEc~LvqMJ8uSWQPmM<?&?q-(W>i;g-Jn3uwGmUZ0x`~n<Y
zjB7S<tz?#UH`Va;23<T)c<dskb?bTgg#|@~gv8~AH!AJ)^x7GH4rG8P1eghnfR=6@
z6OXVU6CDG?S^)zMk1NmP{V$Z|z4>?)SSVpJJ^ea1c3wdl>5UwM%KE#`L|uDd@>fPn
z4RJCA)-MKXHrmC!sv1fPib`sFmVvqN@1<b(Ln)cT5Tpul<sz~SFy6RPTv}FMb(_uZ
zpzP|@ghG^w`Tz>^b6R!K@N-8YQ895D#jScKcCM~YA(g|SAzhi-6)*D}i3nAmkP}u^
zQP<MjW^8V?-QK~)Wl#LQgtEU1(vtGd9_qNQy>W}2oT93Rw%#@q3u}8vmtCH>d-Bh^
zzIQ?p^tN^4Z>fzEGBOIvYFfGm#^%;LY`32-DUA)V0^}c2F*rFkJs2arNnSw-bI><5
zx7fDtMa|;~mraO76MwyoIQC__zr4_Olaz{zx~9I7mc{j&>@)jS0NlNT5}eQH^`UC+
z&7OtvTZNQ0bkx<36qj5Jv{<qBPbYvS(Zbth0&Z0eL~iBg8TcF_BPnhBv^Fu^c_W}O
zS{iPAKrg0McMebeQXczud;}HkJ6Dr)#+%Gr4PbdNtVa(KaGH3XDV`<`j*U%x{_t0T
z1s&rRJIp%_*2-G~h;8@%tGs`#ujF316Ca>Znk8J}uy!$k<+;^M)ptiHy-YfLKpDVM
z0dqVCt9YoF`Xkt2;&#x-l6GyZE#?#hbaWVCeCc2V|N4G(f@U$-DOg5kfyMz<3IZ&P
z2JBdF2Yehog3e!!3O*c)9ZO0~Kt+H3dTH3}x8EE1Y_Jcd-MaoBlZ!cpMCt)FjEqji
zz$$shI+|VELb4m$JMyBO6^|c6$FOI`B%cY`>FTHDm{2kBWvC<dMu4-gyZ<wH>{;Bv
zBPb-PX|QKcd}n9loBQ`-ckMPcm&BfhZDv(bRM&Cv-@o@lM)}8rl(@9GlineJO5jb7
z4}#6cx@z_|+qW6Jhb3e_z2p^}7<VM*xN8Kg)wR(x+T-lyd-87FUlC5*J!9`3+rQJs
z47=lMDr;+PGj~UKQ%j$t!7h5rPPb#deXZ3@!ho3(L=;4obv4XnOsq_H>{eHCzJ31a
z#XsT1tXnBaNy_M&IoiAK@!aQQuXFI)?YQXVR8WPbp|F10Qo7ZQ>>^sG5}aIIo3<T4
zdirjD?%mwlyxj7mz{UiOg4_b)GKRbMx#-E7_=R6ek9|=6=}B1+_9}p2iuKs<SSXeV
zTX=i9Iy(nML|rVYep=9q{VF*F`;{g@+!f>)ZmXba=H%q)y3flq@?F`j%tG`M_0Rj2
zgOHTE-cBc12dka#dt3uvkNW#|e&<)p8r#gRY;3G;$bRLvH~#wF@*n(4NljD7z}Uiu
z>{lMQdkYr$mE??HVbA=HUk#lQ-uO>`)m!{}&p-H8B?GfV&i8(`e9e^we${_inPqkN
z;P3rv_}!^IjA#q|3VQ+Jn_rpkJ@bzAU*K0y;**nKy{~PlFL_si{p#k8n>Qb&q$NRB
zRZZc8%>3gJjA%&_CPudkKGwe$hJj#&y{euLX(!z+?i(eJ4_3WOxu0?KZ|qff9$m}6
zmr!{2#UOEtG(9!YRFw51vjAm90Apl);^XwPH!W?07}SZw{cS}#&yqe*BN9I2kAUUl
zn<>w8YPvgGyT6Q$kBxK>x7HQDAINop$Y5YmP*i=JoSjxySzX)M*!p>Nbg-d&xT~h2
zty-L44EKLVs3bKvx4yoqb8vWYxUZ?Yw0o$z>|JtQOwg$iSa-VM<;%Rfn#R)N+OE#J
zg3Pyr10RaguC)at3?L_R?ml{2TweXEw6^9`{j0R1!S2fX2K&x7)Pz~fi7Q+>bMNn$
zC5<(oTD#lo3ZAzN54BYdeU=Uc)nH(y1n|3fA|&o{X+v$+z1x5Ok>1hM{;{p6t)VOD
zWmO2s={^e$Iddzes-?Z`(fO2ymd=4!FT2J{M#g3wjS4{OfY;t5Co&p3x;i@ATG|`)
zy1VnLhuZ+XAOqMIfUGohBO@`Xpt8Qcp|SEt<fYo?<f821jIp*^M>9a9nQq&{ALo^o
zzD<eRcfiZzaN$5D>dJUF4`3pSYGw`|PIeX+wsvGkyEiiM{zm>n08>)Jj-+q$&C%-9
z&$)h>12BF`8CgXYGQ!OP*tH|y0Bn@h7c8*(_l`D9oJ2MDzjd?$G}aoQH~rxE09G;H
z=M_4RdLw@WU=hh3h%`<dUFc}v1K7E|&y$~j2VnlUDt-%KPXA{B=00;%rkc4a&s-V*
z#UBC%B_;Xx`RhiQy?Wxy?=SoD+r_-vMv6@2+w3nICF72)eiE8&xvIDf@8a(pB`uG~
zH6p$wkK@~O>nQ;`yiw;Hfs&TPd1z{ah%e}q<9K-!rPnN?n3qDJT+Zb?GBS>P$&ENN
zeu#V7d_RG(Xw8;~)1wpQ;rKL|7@dyeUr9M{2L%nAVdE_K84BWL{?;|ra}z<JpkcRY
z9skB2t1!{-&bH*ceycX(xBjW=iRt&ATV}$FSsN%8GpW3u8k-f5qk?Jl)=q8NoO}X-
zYL&nh(g?YKnj9tIR=S@P=H>t^z-HP)BI596u1!2-orx645^y-OVv~Q*__x8B2!|cb
z)&v|`%r?qJAX<p!&Np)Gks&g>R5;oI^ZM_)$t-ZJqCp;xw*-F*IXd~VjUs$Az=KzW
zkKkzL$6gZF!3+0;X&sr@j}7<s1kwYn!+{gl<%foQC+>@rr5{EM?V2Sc;n?b(#p0Q*
z7=y-t9E}He2jM7dW`{_8KxFdyhI=Q;tY^Ckz#P_3p02NLhPC;Uuf1440SGb)lV77b
zGGTWR(|j+PfB-bMWn>{_izn{mBXn+Q$p*~)WDe`Y@gWHnFJwL2J4-;2zTZDy{{!ne
z0y0PHP14Liv0gwye*8f&e&gywjuaU@5yS$mu&CH(QFS9LeGOHex3DJkaNs3iVBEZR
z6}yy%zKDR;H7AJ`CYN9>1<);K6p|LzJ)K!rQ<-x}Pg6~Pz5eD4z|70Ho{f)>pWom@
zW$)lnZ*SVcBSy-WdUh7;5IPC$1cJPx%my`GHqI?Ru@7rn+uECI?nK6zDI2J5m9wLu
zIu0BZz_gK%n@vK3okv1WJv6(xH2Y?NmfoR2RRtAk2_*|y9}V1i<1({v*ub?}Oj=1_
z%j$k^adG;|9X2*0r@U<Kb@U81PEjqPjRFoz;9_Iv<P;GR6_rrj>Jfb-BRToTX=kf*
zK|cG8tjzU~u8RgP3Rud^%*iGsDkzG>E<x388oGvZJZqUaT?72R%}mVgov8>>z)b@p
zoE%)-k|H8v;_^zCabX@u0?d>oHVT^@40LlgFflf#0g7Y5O%3df92|U-crwMMWK3n4
zh56Pqu3=>}ciZD{Wu-4JD@jeJ<D>?*^&2?&C9qVH&6~tHS1~MGx|D`~t*)<|m%6Sk
z-$u@**ite#cDBtTg2KX^dAOKZc{y2_S@A!mJ@$55*6tQ;s@VT#q;fE>W8~oH-XzG)
z%(r3LQW_S{B{Ym&TRrXdHEp~O^J}wy)sBswnU!S|zsMF5AyIJ&aXB?JIUx}N4QC$@
zBR$VkQD`qvMgb=UETd&uy@8E$<7QzIZZ017wT!$1+(NoWYQZ-y2A;fq4h*7zhXNl$
zl*^VetX{*$Cm_hTa?vuT^>nK^4Yn!R_=aWV#h<xab@|et*o-Bs*D|f+=H?R?6BQMg
z5n)@$DlDyMw9EIDkI(Z@MfX>t+Uj>5$AFgtD3?&vuUbaW#4E3(AtNb;ab8v1#OG$(
zqq8?^8eXM8``G9h_9_y1sexw2YBmN2aa}EW8F>W-IYnhnLkoMK)aFk~#}jIMs{mfS
z$b1nBo3NWNr36)0*y?62!Y?KxD<`j@tgd5fWxw0!VMBk;AGwzr`<?^3{U8iBo?wTB
zm=h7NQXF{L@#=_6NMjAQZnJdSx8EZyE4{lmu<3K}hchSzGfvD&ZUrdsy00T3B`+^0
zEhVd@p=V@jX}8PKd5@#>`DWB?!}#oT%Jb(q^>+V&WfnqNy~QpY#gr74R5Ubo4YwJa
zm|0re+U?l2+s%Eq*YmPn=bB4X5CXXE>GrxM$f>6xT7*YNRz_Y)MNLCfN6)~>)XdVx
zZs)Gu&TjkMO;b_l+lL_lu}^Qty+n{Y_*jWsLP|nP78|IluBoG|Z)j|0X=Q7_)6q4^
z)&5{c-J2&DqrBkRlg#@F-K*+GH^uoSrNkv=<P@-kt=hVJ+l)*ttZcULbh350THWyK
zMs$!pEO*`)|H!wrZFF>m)D$4FNm@#ZtPxHC=;#|5nwVMG?65UE`nI*`-l<S`A<)KC
z8FjX3aBPx9>?NXnV=hrSoN&-q#uBu2^|1tNYeT1`=8q{Cq7G?+9s)b`;Ksd@;o;H2
zp-J*7_&}CN1~2GWn~lx&OwZReW?hR8wg$S)5`>Nd{mJC_z2n4jRO7SFuVElqNH|z&
zjjD#GmY$)W`u_aZqPu58y*R)T0VdvrU{~19jK;}nqBe+2$zLJmZWoYNS5@7rtD|HQ
z-&~n|G4hZCh_$0CysE*Vv3vi?dwE?bO<uuT4-TM_TN=VDnp*Oz(N#?^uSFlVqFnKI
z5Kv1f@EQmLhox)4r6(W8yCbA{mDA7!`V=B7Ch3~phII(pBLMp+QF8=vgrd_-u*J?j
z^hW9@Qgdk!n)uv3LCOiZ-ByLg`>IoM2BTxZm4cx7;gY2~PTr^PW)Gt2!M@>X;^5>+
z!^>+?!8Ww;7DLr>U~WP^yMWi!+5f`h;xFAJXmog>D(CL05I13P4o0Vd1snci)gl>t
z&(IrLjotkNEybyqkNIeV0RnGy78nN*DIJz-JMKG^Sn#3v`Hd)ie_k<_j?hI|-G`7e
z@S3^!Mx8qs6XMB+M*#W*R(=86u`M9C-POxypAtw_qq3_&hfv>3SkBDDx|n*j9Z+)|
zgrfUEsimuF7rgxv%;1WxoxS;PpO6@T8%wWi5K0jYp)prrP3+~1e*?X?2%n;byI-iI
zfnV;$qvw1hU=bDMpeYmq%=n7qdfH3J#o9SKwY<5#z50HTtEZcmf3~=w-YH-|nU!L~
zZ7L>fY+`b%q<>^=Y~)M*owJ7=_IQL?ngK+_00+L{9tzoiz#uSG$K3x(c40?fe}7kV
zL2_c)z9T++kL{-<V-6)qiVJNK(A1LAbaQl1#!*pQRbk?loA(?n?2WWdG+-k>!UREt
zn~`5wdW-IXgMO~ZN<Ou>))!?YU458wE+E+1&0*JF09t&m?*}&%L+kApo<|QK2?#oT
z=}}h2$I{oi2^U@@-Hr_k4~@QkJQ_F&pd~9N&abmo-auARLe$VPJnh-j<Uf2}|9o^m
zF6d~;(GxdgfJ?^N-gdj?Az$C1z>uhm*^mEDNxpsMtp9-%4<5vxIU4Hc_7qk{0uMFt
z*c<6>)pg#r-DTf_u(-1^S1twaHnK20eD!*K*dbqQGgZ$SLJBZ4)z?<jcD6ONvr*J`
z3JeYn_0W+LmvX;*^^W`QBig$1X0Qmu36;NvwS}qup@V@T2W@w`cnA0$ICx;UgPrfK
ztCs^JPlYME`2z!%jDc8?larN4nw>*t6O**LjFOzOg(Qc7w8yP0C&QyI-Lc&f2&<xi
zOF>s%b*sAV4tKx(djrD4L!wS!IP7F;8h$e|{$yZWN)k$e<rsF>NU-y6;+K|C(a|@u
zQPMC_!=)1=O}m&Afj86dT}m!UgdKR@DXAAPTgxY}sk4EGo|T1uz4+m1-(wff=f8jc
zH2-GYrK=c77J;IolB|rbzNtr0L`3*e4<mVXw<BjS+<2IFDzc!bI$IOfRJ?AB1U>>#
z($Y}S(Jo%Lnn%-ahn}{szKy%fL7!_c@-wbJZ0&lNnE3J2uFzKzz_%Fa=~pr`G4krT
z`S~93-skDy78G^n?6H`<zOIb8tj^Ehfesz88gqjAAvYaUr@j7ufdRh${=t6k`+}c#
zO(gwMb*-`Q#W&F5goNnh;aSN$*cn;YvWTl`sBgt*x3&8rzx^?}fhBE+TYJf%^E4FJ
zeFdHF2YMoknl_Hk-u{8XA$}eX!A>h&-5s4Sx1uJ!<&TDb0Xi6S^o%X7t*y+>Eo{i3
z<Fp5Z&Wra(QB7sP1|19{7!&mI5x)R*(olENZ$U>xOIPnF(0ToT2s&g~`&XdD`M&_2
z2{P!!%lsO2f_?^_kIwQg)t`d|e+He9y&HZ4osq4;C%F0e^e;h2djK_l2RcccW$m<K
z_pd<b4L*j^_n^}e$g^DF5gPv&pflZ2-1%=nX9!LGXV5A7((~UAI*E@HlX8m7>+9Zs
zsKTK027}I93_5w)*~MbvDQ8aqomp5~Q<0rLRY&X@3I)nFytG{*WYBSQ+}Yoh@<)1n
za%uPQ7;&7~QIelum~`YJ1MuQXfRdb=iqrAPv+>uH8peaC>2Opx(OLaE??q<urznKn
zVsL_T`R(lVXXo-tPhKk<`7$yQJViG-Invizl9!i}{2brfhR5&?7K57>y8QBS`t9QC
z<Tvdt&4c6|0ZttC^>%%Do1OhMvlUe#gbz=hgv<95($jOQdwP0XddPW-iLueqz8+%B
zhw|L#sdvyM!iqEGgv)i_eeyK7@MUFdOIurKOXuKFFp++YIMgyc*xvH7ysQaz{CzVi
z99FLpWok-%_#pjJZdq|<MP*%ib#u#?;E`pYdmDR(hk6?7YMLj9f>Ai|96J|N_ck;C
zU0!`tLvwRm=fH69z{to@e}8>h)6igNeO=Y-c;p)eyh&3}lCocA)z{TFw)PB;^y4~4
zZ%bumQF+(kP)pUvcdxF0ZcTcW9|7D?+a6@Se34aKg%g{l?<!mS`udyS735}@eHj=k
zdHpWs(X|&y1)t&1KRtVuoAbJ%uA!ykRen)L<EMtYkFQ>&zx~|b_pY>}=+9dud`-ZX
z^Tv;!h`n>?@4URC>VnMD=E}<I#)jh5w2Y5~{T&UpjU8D@sgqSLUHE>_D$SW6dNn@z
zaqfrO*81Ak-ogIC{`QZ#FW>YHk9=vW?Ciza+atKf69#;=%UAfvMqT~mN<wNuRb6d;
zVPVDlS6O*!j|zMH`iHt|N`}T7A(qt^<E8rBh@hauC*tnqRn*j0C0>rb9((+3d~HX2
zXKQhLXKm+H#<Rz1;jjr`N5s(mlc&$0f0&e2*V@_LS@HaWZ&+$gS7(1uck0dBsou7~
zP(yWL2Sz5j`}S^L?*3;^+<jC2sk6JOvZA)(Q(Z$%XJ2>uqZfmdpKkp1zRK?`MkZRp
zRPTM>`=ifa$!=^7ZeeU~!HMb4uI@L9O{DR+2_+LF7@0C>!XY}G^HIzVKY3i~uY&w1
zxmAt9Eo+;bn;IIDPaZp+Gm7%!`yMuRCw)bxqttLKKK75&{4oEEx07DIEh#N6`%rX0
zH1b%);q%4el|8-{sQ>->1>w-go`;6AMhEX?=9g7fmKUX-^YM0fb@SN0`%)_!?)`$A
zpFe;0V>qOuqP=~$uisv0TT3%sdznQh@ATf@(e4kazY2$xRaDe)xPpT%^EqVNW0o{s
zRgm!Oa0rJI+Iskti@9(}n;Z@`6s2DNe+-8L1vUjs1(L%dRSm5lk?C~E&*4yk1@8<p
z{kv#rl88pGEAjrjXlQb3cmSu$nhp#93`{>qLsN*@(Qzj%6-^h|{l{o1zlStgWiE4Q
zjEIQ0|3x%3f|?6^h~wi^{|T6`r#Fz$IB|Mn;Gd(RllOBwNYlgrAsV`v^!~p(8giM*
zy3_oxvhMRKy#K#X6gb;I^9{|v5<8b|pL_W2Fr0*>q*}r#@95*ROO|Od)z@!UX6OmC
zZNXTayry2os(HSA2<Kp@2Fp&Uu+ULc{G7=AI)p&6h>lzKFit5?j^j2lMXCstXI@S<
zpYC748z?Ag*04EUyEZm8IzE$rpCFD+4;Q-%vC#fv1Xg9qY5}#xsgd!quf+mfEf^b{
z>JE_RSiZ30Fe?Km?r9iBjPobI%#oAJ3**C+jrLoZX{mlR0@E*L6t(y;F+Bc_J-Hq+
zP8=S;q`>==)i`}my@FHb$d_Tven$J5>I7N9#B<Hf3`>5PC9FQp8bQ5`so{m>WQ9g1
zURw&RrCCt&zy{!zprU0Kx2+rdIyW=i$qG#nM_W%Qu>N524E_2o)-|}kvOpd30OBa|
zt~n1q^>+fu^vhTz9a=|!;7_I>x#}Ri0x$D|#hRrT-_bzUXWm@=4c7EHvHOIx=87Ly
zfNbw-LA_^_Ux@ScGnsx8YVg`_!2#d##|Bd@rsq>SKQX^tb7}waOjjM1r9V`z$P>gS
z;nqI()!+qX3KHr)ZOl$FSE8A*gS>wjHmg6J9Kr@nd|wg4C5SQ)Y6AIFviUZ%0$c3s
zr|^cDQ{`(R0@o5IudfHng|#v~MT?fR%lNm9{Z#Y7qwt6Z2b{6}R`kJg$aA`qjsGGJ
ze}2(O_;QsggK6e90xBwCx%Bzh^fNV~p%~ivX~K0Su&w!3ZRnf0sVQ`Nu9AgS6MKTt
zT$Sq^(Zc^HQSMj%RFuFJ-j6Vce`*ux&CGF&*MeYGg}?FpC*qk>Qw$BBAzaiF!bPoL
z&Eo<Fc-1;1IjHeO!m4A#|49|R0HcXo^mtAvK%(Z~sPf)z!%Ur#5>n9EFV|>J8O*%%
zxG47FnZ;UEK)xCOzL9Vx>ai}vxBW?=&HlMeHb0t#v$Dmm?DHj03L3kf1x2xW%9*Db
zRm7GqJlCn{byFsOJpxk?C+MwOv~ZW<8KUO!EJtL)-#2nC@SO`Q_4m}|txUOG>fBFC
zkr(Lr7TSfX%xz`@6@%fE(S=H3RYo4^(0`kiIm&MjluJ1FeZ(j<s}xz4_ik+Sv+|8>
z{(l1HGKn)-DSSwgu)lXji~d@b1tS(Q7(OL`3ra#02|BBOtIGTc@=WFQkM?HbSy|xP
l^8`OVQ7+z~VxY{n`1|AUC$jk$KTY<0*KeM_J2QT!`5*9-e`Wvx

literal 0
HcmV?d00001


From c6de5cf9bd9b8da9ee4e8b3cdfd2aa2fc33a3260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Thu, 30 May 2013 16:19:22 -0700
Subject: [PATCH 79/85] Bug 877869 - Fix typo in indexedbHelper.jsm r=bent

---
 dom/base/IndexedDBHelper.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/base/IndexedDBHelper.jsm b/dom/base/IndexedDBHelper.jsm
index 698fcf36755..f9e428317b3 100644
--- a/dom/base/IndexedDBHelper.jsm
+++ b/dom/base/IndexedDBHelper.jsm
@@ -68,7 +68,7 @@ IndexedDBHelper.prototype = {
     };
     req.onerror = function (aEvent) {
       if (DEBUG) debug("Failed to open database:" + self.dbName);
-      aFailureCb(aEvent.target.errorMessage);
+      aFailureCb(aEvent.target.error.name);
     };
     req.onblocked = function (aEvent) {
       if (DEBUG) debug("Opening database request is blocked.");

From 20745d46d0ed7e57d97456e09bcfbf8f41793f30 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 30 May 2013 20:50:36 -0400
Subject: [PATCH 80/85] Bug 874065 - On B2G, dmp memory reports to
 /data/local/tmp/memory-reports, and make that directory have 0777
 permissions. r=dhylands

---
 xpcom/base/nsMemoryInfoDumper.cpp | 38 ++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index 59c9377cd2e..fe6050f77f9 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -713,13 +713,44 @@ nsMemoryInfoDumper::OpenTempFile(const nsACString &aFilename, nsIFile* *aFile)
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
+#ifdef ANDROID
+  // /data/local/tmp is a true tmp directory; anyone can create a file there,
+  // but only the user which created the file can remove it.  We want non-root
+  // users to be able to remove these files, so we write them into a
+  // subdirectory of the temp directory and chmod 777 that directory.
+  rv = (*aFile)->AppendNative(NS_LITERAL_CSTRING("memory-reports"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // It's OK if this fails; that probably just means that the directory already
+  // exists.
+  (*aFile)->Create(nsIFile::DIRECTORY_TYPE, 0777);
+
+  nsAutoCString dirPath;
+  rv = (*aFile)->GetNativePath(dirPath);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  while (chmod(dirPath.get(), 0777) == -1 && errno == EINTR) {}
+#endif
+
   nsCOMPtr<nsIFile> file(*aFile);
 
   rv = file->AppendNative(aFilename);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = file->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0644);
+  rv = file->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0666);
   NS_ENSURE_SUCCESS(rv, rv);
+
+#ifdef ANDROID
+    // Make this file world-read/writable; the permissions passed to the
+    // CreateUnique call above are not sufficient on Android, which runs with a
+    // umask.
+    nsAutoCString path;
+    rv = file->GetNativePath(path);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    while (chmod(path.get(), 0666) == -1 && errno == EINTR) {}
+#endif
+
   return NS_OK;
 }
 
@@ -906,6 +937,11 @@ DumpProcessMemoryInfoToTempDir(const nsAString& aIdentifier)
   rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(mrFinalFile));
   NS_ENSURE_SUCCESS(rv, rv);
 
+#ifdef ANDROID
+  rv = mrFinalFile->AppendNative(NS_LITERAL_CSTRING("memory-reports"));
+  NS_ENSURE_SUCCESS(rv, rv);
+#endif
+
   rv = mrFinalFile->AppendNative(mrFilename);
   NS_ENSURE_SUCCESS(rv, rv);
 

From 51f6ad7ea174638e35800b0fab4cafc61613096c Mon Sep 17 00:00:00 2001
From: Scott Johnson <sjohnson@mozilla.com>
Date: Fri, 31 May 2013 10:51:43 -0500
Subject: [PATCH 81/85] Bug 730559: Limit the number of columns during layout
 of column sets to prevent hang. [r=mats] In nsRuleNode, when we parse a
 number of columns from a CSS style sheet, we enforce a rule that the number
 of columns cannot exceed 1000. This patch simply enforces the same rule when
 we decide that the column count will be generated based on the available
 width (e.g. the column-count property has a value of 'auto').

---
 layout/generic/crashtests/730559.html     | 1 +
 layout/generic/crashtests/crashtests.list | 1 +
 layout/generic/nsColumnSetFrame.cpp       | 7 ++++++-
 layout/style/nsRuleNode.cpp               | 5 +++--
 layout/style/nsStyleStruct.cpp            | 2 ++
 layout/style/nsStyleStruct.h              | 6 ++++++
 6 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 layout/generic/crashtests/730559.html

diff --git a/layout/generic/crashtests/730559.html b/layout/generic/crashtests/730559.html
new file mode 100644
index 00000000000..33c12a37cde
--- /dev/null
+++ b/layout/generic/crashtests/730559.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html style="height: 6523790304542em; width: 6207636626031em; -moz-box-sizing: border-box; border-style: dotted; -moz-column-width: 20px;"></html>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 456684f1f27..b815433b9c0 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -447,6 +447,7 @@ load 700031.xhtml
 load 718516.html
 load 723108.html
 load 724978.xhtml
+load 730559.html
 load first-letter-638937.html
 load first-letter-638937-2.html
 load 734777.html
diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index 75675e28268..ccc1f335cb3 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -228,7 +228,9 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState,
         && numColumns > 0) {
       // This expression uses truncated rounding, which is what we
       // want
-      int32_t maxColumns = (availContentWidth + colGap)/(colGap + colWidth);
+      int32_t maxColumns =
+        std::min(nscoord(nsStyleColumn::kMaxColumnCount),
+                 (availContentWidth + colGap)/(colGap + colWidth));
       numColumns = std::max(1, std::min(numColumns, maxColumns));
     }
   } else if (numColumns > 0 && availContentWidth != NS_INTRINSICSIZE) {
@@ -254,6 +256,9 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState,
       // make sure to round down
       if (colGap + colWidth > 0) {
         numColumns = (availContentWidth + colGap)/(colGap + colWidth);
+        // The number of columns should never exceed kMaxColumnCount.
+        numColumns = std::min(nscoord(nsStyleColumn::kMaxColumnCount),
+                              numColumns);
       }
       if (numColumns <= 0) {
         numColumns = 1;
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 87fd928f1b8..19b720b41c3 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -7201,8 +7201,9 @@ nsRuleNode::ComputeColumnData(void* aStartStruct,
     column->mColumnCount = NS_STYLE_COLUMN_COUNT_AUTO;
   } else if (eCSSUnit_Integer == columnCountValue->GetUnit()) {
     column->mColumnCount = columnCountValue->GetIntValue();
-    // Max 1000 columns - wallpaper for bug 345583.
-    column->mColumnCount = std::min(column->mColumnCount, 1000U);
+    // Max kMaxColumnCount columns - wallpaper for bug 345583.
+    column->mColumnCount = std::min(column->mColumnCount,
+                                    nsStyleColumn::kMaxColumnCount);
   } else if (eCSSUnit_Inherit == columnCountValue->GetUnit()) {
     canStoreInRuleTree = false;
     column->mColumnCount = parent->mColumnCount;
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 1614f9b020d..c1638cb0cb2 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -740,6 +740,8 @@ nsChangeHint nsStyleXUL::CalcDifference(const nsStyleXUL& aOther) const
 // --------------------
 // nsStyleColumn
 //
+/* static */ const uint32_t nsStyleColumn::kMaxColumnCount = 1000;
+
 nsStyleColumn::nsStyleColumn(nsPresContext* aPresContext)
 {
   MOZ_COUNT_CTOR(nsStyleColumn);
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index e94d867270d..9201def7d83 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -2127,6 +2127,12 @@ struct nsStyleColumn {
     return NS_STYLE_HINT_FRAMECHANGE;
   }
 
+  /**
+   * This is the maximum number of columns we can process. It's used in both
+   * nsColumnSetFrame and nsRuleNode.
+   */
+  static const uint32_t kMaxColumnCount;
+
   uint32_t     mColumnCount; // [reset] see nsStyleConsts.h
   nsStyleCoord mColumnWidth; // [reset] coord, auto
   nsStyleCoord mColumnGap;   // [reset] coord, normal

From f21406d5f82a4375400ff8f91a04cdf59391058d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 30 May 2013 22:23:49 -0400
Subject: [PATCH 82/85] Bug 865806 - Part 2: Prefer to look at <body> instead
 of <html> when determining whether the background color of a page is dark or
 not; r=roc

This seems to be a slightly better heuristic to follow the CSS Rendering code
in all cases, since the background color for the body element often overrides
that of the html element.

--HG--
extra : rebase_source : 6c0dba10c1ac4f08914632179e15c13c2ff271aa
---
 widget/xpwidgets/nsNativeTheme.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/widget/xpwidgets/nsNativeTheme.cpp b/widget/xpwidgets/nsNativeTheme.cpp
index 3e57f0e8b62..952d5828cf7 100644
--- a/widget/xpwidgets/nsNativeTheme.cpp
+++ b/widget/xpwidgets/nsNativeTheme.cpp
@@ -25,6 +25,7 @@
 #include "nsRangeFrame.h"
 #include "nsCSSRendering.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/HTMLBodyElement.h"
 #include <algorithm>
 
 nsNativeTheme::nsNativeTheme()
@@ -679,6 +680,21 @@ nsNativeTheme::IsRangeHorizontal(nsIFrame* aFrame)
   return static_cast<nsRangeFrame*>(rangeFrame)->IsHorizontal();
 }
 
+static nsIFrame*
+GetBodyFrame(nsIFrame* aCanvasFrame)
+{
+  nsIContent* content = aCanvasFrame->GetContent();
+  if (!content) {
+    return nullptr;
+  }
+  nsIDocument* document = content->OwnerDoc();
+  nsIContent* body = document->GetBodyElement();
+  if (!body) {
+    return nullptr;
+  }
+  return body->GetPrimaryFrame();
+}
+
 bool
 nsNativeTheme::IsDarkBackground(nsIFrame* aFrame)
 {
@@ -691,6 +707,16 @@ nsNativeTheme::IsDarkBackground(nsIFrame* aFrame)
     return false;
 
   nsIFrame* frame = scrollFrame->GetScrolledFrame();
+  if (nsCSSRendering::IsCanvasFrame(frame)) {
+    // For canvas frames, prefer to look at the body first, because the body
+    // background color is most likely what will be visible as the background
+    // color of the page, even if the html element has a different background
+    // color which prevents that of the body frame to propagate to the viewport.
+    nsIFrame* bodyFrame = GetBodyFrame(frame);
+    if (bodyFrame) {
+      frame = bodyFrame;
+    }
+  }
   nsStyleContext* bgSC = nullptr;
   if (!nsCSSRendering::FindBackground(frame, &bgSC) ||
       bgSC->StyleBackground()->IsTransparent()) {

From 7ffbc4ccf38efdb385a5e28f25e4ceb7b886be50 Mon Sep 17 00:00:00 2001
From: Shawn Huang <shuang@mozilla.com>
Date: Fri, 31 May 2013 11:07:21 +0800
Subject: [PATCH 83/85] Bug 872890:Reset HFP call array when RIL reports
 NotifyError(), r=echou

---
 dom/bluetooth/BluetoothTelephonyListener.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dom/bluetooth/BluetoothTelephonyListener.cpp b/dom/bluetooth/BluetoothTelephonyListener.cpp
index c7d4ff175b5..71b92b4d8e4 100644
--- a/dom/bluetooth/BluetoothTelephonyListener.cpp
+++ b/dom/bluetooth/BluetoothTelephonyListener.cpp
@@ -67,6 +67,17 @@ NS_IMETHODIMP
 TelephonyListener::NotifyError(int32_t aCallIndex,
                                const nsAString& aError)
 {
+  BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
+  // In order to not miss any related call state transition.
+  // It's possible that 3G network signal lost for unknown reason.
+  // If a call is released abnormally, NotifyError() will be called,
+  // instead of CallStateChanged(). We need to reset the call array state
+  // via setting CALL_STATE_DISCONNECTED
+  hfp->HandleCallStateChanged(aCallIndex,
+                              nsITelephonyProvider::CALL_STATE_DISCONNECTED,
+                              EmptyString(), false, true);
+  NS_WARNING("Reset the call state due to call transition ends abnormally");
+  NS_WARNING(aError.get());
   return NS_OK;
 }
 

From e81694112acdeab9557a77e2d005e77305ae30a5 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Fri, 31 May 2013 12:12:41 -0400
Subject: [PATCH 84/85] Backed out changeset 662f6427c909 (bug 872890) for
 debug bustage.

---
 dom/bluetooth/BluetoothTelephonyListener.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dom/bluetooth/BluetoothTelephonyListener.cpp b/dom/bluetooth/BluetoothTelephonyListener.cpp
index 71b92b4d8e4..c7d4ff175b5 100644
--- a/dom/bluetooth/BluetoothTelephonyListener.cpp
+++ b/dom/bluetooth/BluetoothTelephonyListener.cpp
@@ -67,17 +67,6 @@ NS_IMETHODIMP
 TelephonyListener::NotifyError(int32_t aCallIndex,
                                const nsAString& aError)
 {
-  BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
-  // In order to not miss any related call state transition.
-  // It's possible that 3G network signal lost for unknown reason.
-  // If a call is released abnormally, NotifyError() will be called,
-  // instead of CallStateChanged(). We need to reset the call array state
-  // via setting CALL_STATE_DISCONNECTED
-  hfp->HandleCallStateChanged(aCallIndex,
-                              nsITelephonyProvider::CALL_STATE_DISCONNECTED,
-                              EmptyString(), false, true);
-  NS_WARNING("Reset the call state due to call transition ends abnormally");
-  NS_WARNING(aError.get());
   return NS_OK;
 }
 

From 9755fce1d6f5f6445e8434d3a539c46678729bfa Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 31 May 2013 13:08:55 -0400
Subject: [PATCH 85/85] Backed out changeset cfca6afaaf9b (bug 865806) because
 it doesn't speak the secret phrase "nsIDocumentInlines.h" (on a CLOSED TREE,
 because that's how I roll)

---
 widget/xpwidgets/nsNativeTheme.cpp | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/widget/xpwidgets/nsNativeTheme.cpp b/widget/xpwidgets/nsNativeTheme.cpp
index 952d5828cf7..3e57f0e8b62 100644
--- a/widget/xpwidgets/nsNativeTheme.cpp
+++ b/widget/xpwidgets/nsNativeTheme.cpp
@@ -25,7 +25,6 @@
 #include "nsRangeFrame.h"
 #include "nsCSSRendering.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/dom/HTMLBodyElement.h"
 #include <algorithm>
 
 nsNativeTheme::nsNativeTheme()
@@ -680,21 +679,6 @@ nsNativeTheme::IsRangeHorizontal(nsIFrame* aFrame)
   return static_cast<nsRangeFrame*>(rangeFrame)->IsHorizontal();
 }
 
-static nsIFrame*
-GetBodyFrame(nsIFrame* aCanvasFrame)
-{
-  nsIContent* content = aCanvasFrame->GetContent();
-  if (!content) {
-    return nullptr;
-  }
-  nsIDocument* document = content->OwnerDoc();
-  nsIContent* body = document->GetBodyElement();
-  if (!body) {
-    return nullptr;
-  }
-  return body->GetPrimaryFrame();
-}
-
 bool
 nsNativeTheme::IsDarkBackground(nsIFrame* aFrame)
 {
@@ -707,16 +691,6 @@ nsNativeTheme::IsDarkBackground(nsIFrame* aFrame)
     return false;
 
   nsIFrame* frame = scrollFrame->GetScrolledFrame();
-  if (nsCSSRendering::IsCanvasFrame(frame)) {
-    // For canvas frames, prefer to look at the body first, because the body
-    // background color is most likely what will be visible as the background
-    // color of the page, even if the html element has a different background
-    // color which prevents that of the body frame to propagate to the viewport.
-    nsIFrame* bodyFrame = GetBodyFrame(frame);
-    if (bodyFrame) {
-      frame = bodyFrame;
-    }
-  }
   nsStyleContext* bgSC = nullptr;
   if (!nsCSSRendering::FindBackground(frame, &bgSC) ||
       bgSC->StyleBackground()->IsTransparent()) {