diff --git a/addon-sdk/source/examples/reading-data/lib/main.js b/addon-sdk/source/examples/reading-data/lib/main.js
index 71c8be6b6ad..468a497b12e 100644
--- a/addon-sdk/source/examples/reading-data/lib/main.js
+++ b/addon-sdk/source/examples/reading-data/lib/main.js
@@ -1,10 +1,11 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
var self = require("sdk/self");
-var panels = require("sdk/panel");
-var widgets = require("sdk/widget");
+var { Panel } = require("sdk/panel");
+var { ToggleButton } = require("sdk/ui");
function replaceMom(html) {
return html.replace("World", "Mom");
@@ -21,20 +22,18 @@ exports.main = function(options, callbacks) {
helloHTML = replaceMom(helloHTML);
// ... and then create a panel that displays it.
- var myPanel = panels.Panel({
- contentURL: "data:text/html," + helloHTML
+ var myPanel = Panel({
+ contentURL: "data:text/html," + helloHTML,
+ onHide: handleHide
});
- // Load the URL of the sample image.
- var iconURL = self.data.url("mom.png");
-
// Create a widget that displays the image. We'll attach the panel to it.
// When you click the widget, the panel will pop up.
- widgets.Widget({
+ var button = ToggleButton({
id: "test-widget",
label: "Mom",
- contentURL: iconURL,
- panel: myPanel
+ icon: './mom.png',
+ onChange: handleChange
});
// If you run cfx with --static-args='{"quitWhenDone":true}' this program
@@ -42,3 +41,13 @@ exports.main = function(options, callbacks) {
if (options.staticArgs.quitWhenDone)
callbacks.quit();
}
+
+function handleChange(state) {
+ if (state.checked) {
+ myPanel.show({ position: button });
+ }
+}
+
+function handleHide() {
+ button.state('window', { checked: false });
+}
diff --git a/addon-sdk/source/examples/reading-data/tests/test-main.js b/addon-sdk/source/examples/reading-data/tests/test-main.js
index 1e6a18e46bb..4e85f49de4a 100644
--- a/addon-sdk/source/examples/reading-data/tests/test-main.js
+++ b/addon-sdk/source/examples/reading-data/tests/test-main.js
@@ -3,9 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-// Disable tests below for now.
-// See https://bugzilla.mozilla.org/show_bug.cgi?id=987348
-/*
var m = require("main");
var self = require("sdk/self");
@@ -26,4 +23,3 @@ exports.testID = function(test) {
test.assertEqual(self.data.url("sample.html"),
"resource://reading-data-example-at-jetpack-dot-mozillalabs-dot-com/reading-data/data/sample.html");
};
-*/
diff --git a/addon-sdk/source/examples/reddit-panel/lib/main.js b/addon-sdk/source/examples/reddit-panel/lib/main.js
index 95da781ca95..0d25ba65a43 100644
--- a/addon-sdk/source/examples/reddit-panel/lib/main.js
+++ b/addon-sdk/source/examples/reddit-panel/lib/main.js
@@ -1,26 +1,34 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
-var data = require("sdk/self").data;
+var { data } = require("sdk/self");
+var { ToggleButton } = require("sdk/ui");
+
+var base64png = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYA" +
+ "AABzenr0AAAASUlEQVRYhe3O0QkAIAwD0eyqe3Q993AQ3cBSUKpygfsNTy" +
+ "N5ugbQpK0BAADgP0BRDWXWlwEAAAAAgPsA3rzDaAAAAHgPcGrpgAnzQ2FG" +
+ "bWRR9AAAAABJRU5ErkJggg%3D%3D";
var reddit_panel = require("sdk/panel").Panel({
width: 240,
height: 320,
contentURL: "http://www.reddit.com/.mobile?keep_extension=True",
contentScriptFile: [data.url("jquery-1.4.4.min.js"),
- data.url("panel.js")]
+ data.url("panel.js")],
+ onHide: handleHide
});
reddit_panel.port.on("click", function(url) {
require("sdk/tabs").open(url);
});
-require("sdk/widget").Widget({
+let button = ToggleButton({
id: "open-reddit-btn",
label: "Reddit",
- contentURL: "http://www.reddit.com/static/favicon.ico",
- panel: reddit_panel
+ icon: base64png,
+ onChange: handleChange
});
exports.main = function(options, callbacks) {
@@ -29,3 +37,13 @@ exports.main = function(options, callbacks) {
if (options.staticArgs.quitWhenDone)
callbacks.quit();
};
+
+function handleChange(state) {
+ if (state.checked) {
+ reddit_panel.show({ position: button });
+ }
+}
+
+function handleHide() {
+ button.state('window', { checked: false });
+}
diff --git a/addon-sdk/source/examples/reddit-panel/tests/test-main.js b/addon-sdk/source/examples/reddit-panel/tests/test-main.js
index f13003e7654..6d916d25c17 100644
--- a/addon-sdk/source/examples/reddit-panel/tests/test-main.js
+++ b/addon-sdk/source/examples/reddit-panel/tests/test-main.js
@@ -3,9 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-// Disable tests below for now.
-// See https://bugzilla.mozilla.org/show_bug.cgi?id=987348
-/*
var m = require("main");
var self = require("sdk/self");
@@ -23,4 +20,3 @@ exports.testMain = function(test) {
exports.testData = function(test) {
test.assert(self.data.load("panel.js").length > 0);
};
-*/
diff --git a/addon-sdk/source/lib/sdk/content/content-worker.js b/addon-sdk/source/lib/sdk/content/content-worker.js
index 23ddd5cafec..0d7d675c285 100644
--- a/addon-sdk/source/lib/sdk/content/content-worker.js
+++ b/addon-sdk/source/lib/sdk/content/content-worker.js
@@ -107,7 +107,9 @@ const ContentWorker = Object.freeze({
error: pipe.emit.bind(null, "console", "error"),
debug: pipe.emit.bind(null, "console", "debug"),
exception: pipe.emit.bind(null, "console", "exception"),
- trace: pipe.emit.bind(null, "console", "trace")
+ trace: pipe.emit.bind(null, "console", "trace"),
+ time: pipe.emit.bind(null, "console", "time"),
+ timeEnd: pipe.emit.bind(null, "console", "timeEnd")
});
},
diff --git a/addon-sdk/source/lib/sdk/content/mod.js b/addon-sdk/source/lib/sdk/content/mod.js
index 6ce0c7608d3..f46ac49b1f0 100644
--- a/addon-sdk/source/lib/sdk/content/mod.js
+++ b/addon-sdk/source/lib/sdk/content/mod.js
@@ -31,6 +31,9 @@ let detachFrom = method("detatchFrom");
exports.detachFrom = detachFrom;
function attach(modification, target) {
+ if (!modification)
+ return;
+
let window = getTargetWindow(target);
attachTo(modification, window);
@@ -42,6 +45,9 @@ function attach(modification, target) {
exports.attach = attach;
function detach(modification, target) {
+ if (!modification)
+ return;
+
if (target) {
let window = getTargetWindow(target);
detachFrom(modification, window);
diff --git a/addon-sdk/source/lib/sdk/loader/sandbox.js b/addon-sdk/source/lib/sdk/loader/sandbox.js
index 3d715ac178d..2edb71f90ce 100644
--- a/addon-sdk/source/lib/sdk/loader/sandbox.js
+++ b/addon-sdk/source/lib/sdk/loader/sandbox.js
@@ -67,3 +67,8 @@ function load(sandbox, uri) {
}
}
exports.load = load;
+
+/**
+ * Forces the given `sandbox` to be freed immediately.
+ */
+exports.nuke = Cu.nukeSandbox
diff --git a/addon-sdk/source/lib/sdk/page-mod.js b/addon-sdk/source/lib/sdk/page-mod.js
index b13a176f9df..f706b1e4c10 100644
--- a/addon-sdk/source/lib/sdk/page-mod.js
+++ b/addon-sdk/source/lib/sdk/page-mod.js
@@ -201,6 +201,10 @@ function createWorker (mod, window) {
contentScript: mod.contentScript,
contentScriptFile: mod.contentScriptFile,
contentScriptOptions: mod.contentScriptOptions,
+ // Bug 980468: Syntax errors from scripts can happen before the worker
+ // can set up an error handler. They are per-mod rather than per-worker
+ // so are best handled at the mod level.
+ onError: (e) => emit(mod, 'error', e)
});
workers.set(mod, worker);
pipe(worker, mod);
diff --git a/addon-sdk/source/lib/sdk/panel.js b/addon-sdk/source/lib/sdk/panel.js
index 274c2c50a62..5071ea828c4 100644
--- a/addon-sdk/source/lib/sdk/panel.js
+++ b/addon-sdk/source/lib/sdk/panel.js
@@ -18,7 +18,7 @@ const { isPrivateBrowsingSupported } = require('./self');
const { isWindowPBSupported } = require('./private-browsing/utils');
const { Class } = require("./core/heritage");
const { merge } = require("./util/object");
-const { WorkerHost, detach, attach, destroy } = require("./content/utils");
+const { WorkerHost } = require("./content/utils");
const { Worker } = require("./content/worker");
const { Disposable } = require("./core/disposable");
const { WeakReference } = require('./core/reference');
@@ -34,6 +34,8 @@ const { getNodeView, getActiveView } = require("./view/core");
const { isNil, isObject, isNumber } = require("./lang/type");
const { getAttachEventType } = require("./content/utils");
const { number, boolean, object } = require('./deprecated/api-utils');
+const { Style } = require("./stylesheet/style");
+const { attach, detach } = require("./content/mod");
let isRect = ({top, right, bottom, left}) => [top, right, bottom, left].
some(value => isNumber(value) && !isNaN(value));
@@ -63,7 +65,16 @@ let displayContract = contract({
position: position
});
-let panelContract = contract(merge({}, displayContract.rules, loaderContract.rules));
+let panelContract = contract(merge({
+ // contentStyle* / contentScript* are sharing the same validation constraints,
+ // so they can be mostly reused, except for the messages.
+ contentStyle: merge(Object.create(loaderContract.rules.contentScript), {
+ msg: 'The `contentStyle` option must be a string or an array of strings.'
+ }),
+ contentStyleFile: merge(Object.create(loaderContract.rules.contentScriptFile), {
+ msg: 'The `contentStyleFile` option must be a local URL or an array of URLs'
+ })
+}, displayContract.rules, loaderContract.rules));
function isDisposed(panel) !views.has(panel);
@@ -72,12 +83,13 @@ let panels = new WeakMap();
let models = new WeakMap();
let views = new WeakMap();
let workers = new WeakMap();
+let styles = new WeakMap();
-function viewFor(panel) views.get(panel)
-function modelFor(panel) models.get(panel)
-function panelFor(view) panels.get(view)
-function workerFor(panel) workers.get(panel)
-
+const viewFor = (panel) => views.get(panel);
+const modelFor = (panel) => models.get(panel);
+const panelFor = (view) => panels.get(view);
+const workerFor = (panel) => workers.get(panel);
+const styleFor = (panel) => styles.get(panel);
// Utility function takes `panel` instance and makes sure it will be
// automatically hidden as soon as other panel is shown.
@@ -125,6 +137,12 @@ const Panel = Class({
}, panelContract(options));
models.set(this, model);
+ if (model.contentStyle || model.contentStyleFile) {
+ styles.set(this, Style({
+ uri: model.contentStyleFile,
+ source: model.contentStyle
+ }));
+ }
// Setup view
let view = domPanel.make();
@@ -148,7 +166,8 @@ const Panel = Class({
this.hide();
off(this);
- destroy(workerFor(this));
+ workerFor(this).destroy();
+ detach(styleFor(this));
domPanel.dispose(viewFor(this));
@@ -177,7 +196,7 @@ const Panel = Class({
domPanel.setURL(viewFor(this), model.contentURL);
// Detach worker so that messages send will be queued until it's
// reatached once panel content is ready.
- detach(workerFor(this));
+ workerFor(this).detach();
},
/* Public API: Panel.isShowing */
@@ -262,12 +281,25 @@ let hides = filter(panelEvents, ({type}) => type === "popuphidden");
let ready = filter(panelEvents, ({type, target}) =>
getAttachEventType(modelFor(panelFor(target))) === type);
+// Styles should be always added as soon as possible, and doesn't makes them
+// depends on `contentScriptWhen`
+let start = filter(panelEvents, ({type}) => type === "document-element-inserted");
+
// Forward panel show / hide events to panel's own event listeners.
on(shows, "data", ({target}) => emit(panelFor(target), "show"));
on(hides, "data", ({target}) => emit(panelFor(target), "hide"));
-on(ready, "data", function({target}) {
- let worker = workerFor(panelFor(target));
- attach(worker, domPanel.getContentDocument(target).defaultView);
+on(ready, "data", ({target}) => {
+ let panel = panelFor(target);
+ let window = domPanel.getContentDocument(target).defaultView;
+
+ workerFor(panel).attach(window);
+});
+
+on(start, "data", ({target}) => {
+ let panel = panelFor(target);
+ let window = domPanel.getContentDocument(target).defaultView;
+
+ attach(styleFor(panel), window);
});
diff --git a/addon-sdk/source/lib/sdk/system.js b/addon-sdk/source/lib/sdk/system.js
index f97522e14fb..afef91bab89 100644
--- a/addon-sdk/source/lib/sdk/system.js
+++ b/addon-sdk/source/lib/sdk/system.js
@@ -109,17 +109,21 @@ exports.pathFor = function pathFor(id) {
*/
exports.platform = runtime.OS.toLowerCase();
+const [, architecture, compiler] = runtime.XPCOMABI ?
+ runtime.XPCOMABI.match(/^([^-]*)-(.*)$/) :
+ [, null, null];
+
/**
* What processor architecture you're running on:
* `'arm', 'ia32', or 'x64'`.
*/
-exports.architecture = runtime.XPCOMABI.split('_')[0];
+exports.architecture = architecture;
/**
* What compiler used for build:
* `'msvc', 'n32', 'gcc2', 'gcc3', 'sunc', 'ibmc'...`
*/
-exports.compiler = runtime.XPCOMABI.split('_')[1];
+exports.compiler = compiler;
/**
* The application's build ID/date, for example "2004051604".
diff --git a/addon-sdk/source/lib/sdk/system/events.js b/addon-sdk/source/lib/sdk/system/events.js
index 0e6ad8fa75c..9e2e826088b 100644
--- a/addon-sdk/source/lib/sdk/system/events.js
+++ b/addon-sdk/source/lib/sdk/system/events.js
@@ -8,12 +8,13 @@ module.metadata = {
'stability': 'unstable'
};
-const { Cc, Ci } = require('chrome');
+const { Cc, Ci, Cu } = require('chrome');
const { Unknown } = require('../platform/xpcom');
const { Class } = require('../core/heritage');
const { ns } = require('../core/namespace');
const { addObserver, removeObserver, notifyObservers } =
Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
+const unloadSubject = require('@loader/unload');
const Subject = Class({
extends: Unknown,
@@ -94,6 +95,10 @@ function on(type, listener, strong) {
let observer = Observer(listener);
observers[type] = observer;
addObserver(observer, type, weak);
+ // WeakRef gymnastics to remove all alive observers on unload
+ let ref = Cu.getWeakReference(observer);
+ weakRefs.set(observer, ref);
+ stillAlive.set(ref, type);
}
}
exports.on = on;
@@ -120,6 +125,31 @@ function off(type, listener) {
let observer = observers[type];
delete observers[type];
removeObserver(observer, type);
+ stillAlive.delete(weakRefs.get(observer));
}
}
exports.off = off;
+
+// must use WeakMap to keep reference to all the WeakRefs (!), see bug 986115
+let weakRefs = new WeakMap();
+
+// and we're out of beta, we're releasing on time!
+let stillAlive = new Map();
+
+on('sdk:loader:destroy', function onunload({ subject, data: reason }) {
+ // using logic from ./unload, to avoid a circular module reference
+ if (subject.wrappedJSObject === unloadSubject) {
+ off('sdk:loader:destroy', onunload);
+
+ // don't bother
+ if (reason === 'shutdown')
+ return;
+
+ stillAlive.forEach( (type, ref) => {
+ let observer = ref.get();
+ if (observer)
+ removeObserver(observer, type);
+ })
+ }
+ // a strong reference
+}, true);
diff --git a/addon-sdk/source/lib/sdk/test/loader.js b/addon-sdk/source/lib/sdk/test/loader.js
index 26c956d9e01..71c4d363216 100644
--- a/addon-sdk/source/lib/sdk/test/loader.js
+++ b/addon-sdk/source/lib/sdk/test/loader.js
@@ -62,9 +62,11 @@ exports.LoaderWithHookedConsole = function (module, callback) {
error: hook.bind("error"),
debug: hook.bind("debug"),
exception: hook.bind("exception"),
+ time: hook.bind("time"),
+ timeEnd: hook.bind("timeEnd"),
__exposedProps__: {
log: "rw", info: "rw", warn: "rw", error: "rw", debug: "rw",
- exception: "rw"
+ exception: "rw", time: "rw", timeEnd: "rw"
}
}
}),
@@ -105,9 +107,11 @@ exports.LoaderWithFilteredConsole = function (module, callback) {
error: hook.bind("error"),
debug: hook.bind("debug"),
exception: hook.bind("exception"),
+ time: hook.bind("time"),
+ timeEnd: hook.bind("timeEnd"),
__exposedProps__: {
log: "rw", info: "rw", warn: "rw", error: "rw", debug: "rw",
- exception: "rw"
+ exception: "rw", time: "rw", timeEnd: "rw"
}
}
});
diff --git a/addon-sdk/source/lib/sdk/ui/button/contract.js b/addon-sdk/source/lib/sdk/ui/button/contract.js
index fa09a7c93f3..b6cd5e3c1d9 100644
--- a/addon-sdk/source/lib/sdk/ui/button/contract.js
+++ b/addon-sdk/source/lib/sdk/ui/button/contract.js
@@ -8,6 +8,7 @@ const { isLocalURL } = require('../../url');
const { isNil, isObject, isString } = require('../../lang/type');
const { required, either, string, boolean, object } = require('../../deprecated/api-utils');
const { merge } = require('../../util/object');
+const { freeze } = Object;
function isIconSet(icons) {
return Object.keys(icons).
@@ -16,6 +17,7 @@ function isIconSet(icons) {
let iconSet = {
is: either(object, string),
+ map: v => isObject(v) ? freeze(merge({}, v)) : v,
ok: v => (isString(v) && isLocalURL(v)) || (isObject(v) && isIconSet(v)),
msg: 'The option "icon" must be a local URL or an object with ' +
'numeric keys / local URL values pair.'
diff --git a/addon-sdk/source/lib/sdk/ui/sidebar.js b/addon-sdk/source/lib/sdk/ui/sidebar.js
index ade6e1146de..763e984fa41 100644
--- a/addon-sdk/source/lib/sdk/ui/sidebar.js
+++ b/addon-sdk/source/lib/sdk/ui/sidebar.js
@@ -253,9 +253,11 @@ const Sidebar = Class({
remove(sidebars, this);
// stop tracking windows
- internals.tracker.unload();
- internals.tracker = null;
+ if (internals.tracker) {
+ internals.tracker.unload();
+ }
+ internals.tracker = null;
internals.windowNS = null;
views.delete(this);
diff --git a/addon-sdk/source/test/fixtures/pagemod-css-include-file.css b/addon-sdk/source/test/fixtures/css-include-file.css
similarity index 100%
rename from addon-sdk/source/test/fixtures/pagemod-css-include-file.css
rename to addon-sdk/source/test/fixtures/css-include-file.css
diff --git a/addon-sdk/source/test/test-content-worker.js b/addon-sdk/source/test/test-content-worker.js
index fd7d7f87590..dbb514b6af9 100644
--- a/addon-sdk/source/test/test-content-worker.js
+++ b/addon-sdk/source/test/test-content-worker.js
@@ -382,8 +382,8 @@ exports["test:ensure console.xxx works in cs"] = WorkerTest(
let calls = [];
function onMessage(type, msg) {
assert.equal(type, msg,
- "console.xxx(\"xxx\"), i.e. message is equal to the " +
- "console method name we are calling");
+ "console.xxx(\"xxx\"), i.e. message is equal to the " +
+ "console method name we are calling");
calls.push(msg);
}
@@ -391,19 +391,23 @@ exports["test:ensure console.xxx works in cs"] = WorkerTest(
let worker = loader.require("sdk/content/worker").Worker({
window: browser.contentWindow,
contentScript: "new " + function WorkerScope() {
+ console.time("time");
console.log("log");
console.info("info");
console.warn("warn");
console.error("error");
console.debug("debug");
console.exception("exception");
+ console.timeEnd("timeEnd");
self.postMessage();
},
onMessage: function() {
// Ensure that console methods are called in the same execution order
+ const EXPECTED_CALLS = ["time", "log", "info", "warn", "error",
+ "debug", "exception", "timeEnd"];
assert.equal(JSON.stringify(calls),
- JSON.stringify(["log", "info", "warn", "error", "debug", "exception"]),
- "console has been called successfully, in the expected order");
+ JSON.stringify(EXPECTED_CALLS),
+ "console methods have been called successfully, in expected order");
done();
}
});
diff --git a/addon-sdk/source/test/test-page-mod.js b/addon-sdk/source/test/test-page-mod.js
index 29b51e9ab78..af8e1ca00da 100644
--- a/addon-sdk/source/test/test-page-mod.js
+++ b/addon-sdk/source/test/test-page-mod.js
@@ -957,7 +957,7 @@ exports.testPageModCss = function(assert, done) {
'data:text/html;charset=utf-8,css test
', [{
include: ["*", "data:*"],
contentStyle: "div { height: 100px; }",
- contentStyleFile: data.url("pagemod-css-include-file.css")
+ contentStyleFile: data.url("css-include-file.css")
}],
function(win, done) {
let div = win.document.querySelector("div");
@@ -1531,4 +1531,32 @@ exports.testDetachOnUnload = function(assert, done) {
})
}
+exports.testSyntaxErrorInContentScript = function(assert, done) {
+ const url = "data:text/html;charset=utf-8,testSyntaxErrorInContentScript";
+ let hitError = null;
+ let attached = false;
+
+ testPageMod(assert, done, url, [{
+ include: url,
+ contentScript: 'console.log(23',
+
+ onAttach: function() {
+ attached = true;
+ },
+
+ onError: function(e) {
+ hitError = e;
+ }
+ }],
+
+ function(win, done) {
+ assert.ok(attached, "The worker was attached.");
+ assert.notStrictEqual(hitError, null, "The syntax error was reported.");
+ if (hitError)
+ assert.equal(hitError.name, "SyntaxError", "The error thrown should be a SyntaxError");
+ done();
+ }
+ );
+};
+
require('sdk/test').run(exports);
diff --git a/addon-sdk/source/test/test-panel.js b/addon-sdk/source/test/test-panel.js
index 6c2d21c88d5..479426060be 100644
--- a/addon-sdk/source/test/test-panel.js
+++ b/addon-sdk/source/test/test-panel.js
@@ -25,6 +25,8 @@ const { URL } = require('sdk/url');
const fixtures = require('./fixtures')
const SVG_URL = fixtures.url('mofo_logo.SVG');
+const CSS_URL = fixtures.url('css-include-file.css');
+
const Isolate = fn => '(' + fn + ')()';
function ignorePassingDOMNodeWarning(type, message) {
@@ -974,6 +976,88 @@ exports['test panel can be constructed without any arguments'] = function (asser
assert.ok(true, "Creating a panel with no arguments does not throw");
};
+exports['test panel CSS'] = function(assert, done) {
+ const loader = Loader(module);
+ const { Panel } = loader.require('sdk/panel');
+
+ const { getActiveView } = loader.require('sdk/view/core');
+
+ const getContentWindow = panel =>
+ getActiveView(panel).querySelector('iframe').contentWindow;
+
+ let panel = Panel({
+ contentURL: 'data:text/html;charset=utf-8,' +
+ 'css test
',
+ contentStyle: 'div { height: 100px; }',
+ contentStyleFile: CSS_URL,
+ onShow: () => {
+ ready(getContentWindow(panel)).then(({ document }) => {
+ let div = document.querySelector('div');
+
+ assert.equal(div.clientHeight, 100, 'Panel contentStyle worked');
+ assert.equal(div.offsetHeight, 120, 'Panel contentStyleFile worked');
+
+ loader.unload();
+ done();
+ }).then(null, assert.fail);
+ }
+ });
+
+ panel.show();
+};
+
+exports['test panel CSS list'] = function(assert, done) {
+ const loader = Loader(module);
+ const { Panel } = loader.require('sdk/panel');
+
+ const { getActiveView } = loader.require('sdk/view/core');
+
+ const getContentWindow = panel =>
+ getActiveView(panel).querySelector('iframe').contentWindow;
+
+ let panel = Panel({
+ contentURL: 'data:text/html;charset=utf-8,' +
+ 'css test
',
+ contentStyleFile: [
+ // Highlight evaluation order in this list
+ "data:text/css;charset=utf-8,div { border: 1px solid black; }",
+ "data:text/css;charset=utf-8,div { border: 10px solid black; }",
+ // Highlight evaluation order between contentStylesheet & contentStylesheetFile
+ "data:text/css;charset=utf-8s,div { height: 1000px; }",
+ // Highlight precedence between the author and user style sheet
+ "data:text/css;charset=utf-8,div { width: 200px; max-width: 640px!important}",
+ ],
+ contentStyle: [
+ "div { height: 10px; }",
+ "div { height: 100px; }"
+ ],
+ onShow: () => {
+ ready(getContentWindow(panel)).then(({ window, document }) => {
+ let div = document.querySelector('div');
+ let style = window.getComputedStyle(div);
+
+ assert.equal(div.clientHeight, 100,
+ 'Panel contentStyle list is evaluated after contentStyleFile');
+
+ assert.equal(div.offsetHeight, 120,
+ 'Panel contentStyleFile list works');
+
+ assert.equal(style.width, '320px',
+ 'add-on author/page author stylesheet precedence works');
+
+ assert.equal(style.maxWidth, '480px',
+ 'add-on author/page author stylesheet !important precedence works');
+
+ loader.unload();
+ done();
+ }).then(null, assert.fail);
+ }
+ });
+
+ panel.show();
+};
+
+
if (isWindowPBSupported) {
exports.testGetWindow = function(assert, done) {
let activeWindow = getMostRecentBrowserWindow();
diff --git a/addon-sdk/source/test/test-sandbox.js b/addon-sdk/source/test/test-sandbox.js
index 9f5ee4746d6..d7f2e5ac6e5 100644
--- a/addon-sdk/source/test/test-sandbox.js
+++ b/addon-sdk/source/test/test-sandbox.js
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const { sandbox, load, evaluate } = require('sdk/loader/sandbox');
+const { sandbox, load, evaluate, nuke } = require('sdk/loader/sandbox');
const xulApp = require("sdk/system/xul-app");
const fixturesURI = module.uri.split('test-sandbox.js')[0] + 'fixtures/';
@@ -137,4 +137,30 @@ exports['test metadata'] = function(assert) {
let self = require('sdk/self');
}
+exports['test nuke sandbox'] = function(assert) {
+
+ let fixture = sandbox('http://example.com');
+ fixture.foo = 'foo';
+
+ let ref = evaluate(fixture, 'let a = {bar: "bar"}; a');
+
+ nuke(fixture);
+
+ assert.ok(Cu.isDeadWrapper(fixture), 'sandbox should be dead');
+
+ assert.throws(
+ () => fixture.foo,
+ /can't access dead object/,
+ 'property of nuked sandbox should not be accessible'
+ );
+
+ assert.ok(Cu.isDeadWrapper(ref), 'ref to object from sandbox should be dead');
+
+ assert.throws(
+ () => ref.bar,
+ /can't access dead object/,
+ 'object from nuked sandbox should not be alive'
+ );
+}
+
require('test').run(exports);
diff --git a/addon-sdk/source/test/test-system-events.js b/addon-sdk/source/test/test-system-events.js
index 64aa5493f9d..1e66d1ae9d2 100644
--- a/addon-sdk/source/test/test-system-events.js
+++ b/addon-sdk/source/test/test-system-events.js
@@ -119,6 +119,30 @@ exports["test listeners are GC-ed"] = function(assert, done) {
});
};
+exports["test alive listeners are removed on unload"] = function(assert) {
+ let receivedFromWeak = [];
+ let receivedFromStrong = [];
+ let loader = Loader(module);
+ let events = loader.require('sdk/system/events');
+
+ let type = 'test-alive-listeners-are-removed';
+ const handler = (event) => receivedFromStrong.push(event);
+ const weakHandler = (event) => receivedFromWeak.push(event);
+
+ events.on(type, handler, true);
+ events.on(type, weakHandler);
+
+ events.emit(type, { data: 1 });
+ assert.equal(receivedFromStrong.length, 1, "strong listener invoked");
+ assert.equal(receivedFromWeak.length, 1, "weak listener invoked");
+
+ loader.unload();
+ events.emit(type, { data: 2 });
+
+ assert.equal(receivedFromWeak.length, 1, "weak listener was removed");
+ assert.equal(receivedFromStrong.length, 1, "strong listener was removed");
+};
+
exports["test handle nsIObserverService notifications"] = function(assert) {
let ios = Cc['@mozilla.org/network/io-service;1']
.getService(Ci.nsIIOService);
diff --git a/addon-sdk/source/test/test-system-runtime.js b/addon-sdk/source/test/test-system-runtime.js
index de47fcb133a..ed911bfdc6b 100644
--- a/addon-sdk/source/test/test-system-runtime.js
+++ b/addon-sdk/source/test/test-system-runtime.js
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-var runtime = require("sdk/system/runtime");
+const runtime = require("sdk/system/runtime");
exports["test system runtime"] = function(assert) {
assert.equal(typeof(runtime.inSafeMode), "boolean",
@@ -14,7 +14,7 @@ exports["test system runtime"] = function(assert) {
"runtime.processType is a number");
assert.equal(typeof(runtime.widgetToolkit), "string",
"runtime.widgetToolkit is string");
- var XPCOMABI = typeof(runtime.XPCOMABI);
+ const XPCOMABI = runtime.XPCOMABI;
assert.ok(XPCOMABI === null || typeof(XPCOMABI) === "string",
"runtime.XPCOMABI is string or null if not supported by platform");
};
diff --git a/addon-sdk/source/test/test-system.js b/addon-sdk/source/test/test-system.js
new file mode 100644
index 00000000000..0461d98d141
--- /dev/null
+++ b/addon-sdk/source/test/test-system.js
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const runtime = require("sdk/system/runtime");
+const system = require("sdk/system");
+
+exports["test system architecture and compiler"] = function(assert) {
+
+ if (system.architecture !== null) {
+ assert.equal(
+ runtime.XPCOMABI.indexOf(system.architecture), 0,
+ "system.architecture is starting substring of runtime.XPCOMABI"
+ );
+ }
+
+ if (system.compiler !== null) {
+ assert.equal(
+ runtime.XPCOMABI.indexOf(system.compiler),
+ runtime.XPCOMABI.length - system.compiler.length,
+ "system.compiler is trailing substring of runtime.XPCOMABI"
+ );
+ }
+
+ assert.ok(
+ system.architecture === null || typeof(system.architecture) === "string",
+ "system.architecture is string or null if not supported by platform"
+ );
+
+ assert.ok(
+ system.compiler === null || typeof(system.compiler) === "string",
+ "system.compiler is string or null if not supported by platform"
+ );
+};
+
+require("test").run(exports);
diff --git a/addon-sdk/source/test/test-ui-action-button.js b/addon-sdk/source/test/test-ui-action-button.js
index f6a766401f0..081fbb3fbfa 100644
--- a/addon-sdk/source/test/test-ui-action-button.js
+++ b/addon-sdk/source/test/test-ui-action-button.js
@@ -835,6 +835,44 @@ exports['test button state are snapshot'] = function(assert) {
loader.unload();
}
+exports['test button icon object is a snapshot'] = function(assert) {
+ let loader = Loader(module);
+ let { ActionButton } = loader.require('sdk/ui');
+
+ let icon = {
+ '16': './foo.png'
+ };
+
+ let button = ActionButton({
+ id: 'my-button-17',
+ label: 'my button',
+ icon: icon
+ });
+
+ assert.deepEqual(button.icon, icon,
+ 'button.icon has the same properties of the object set in the constructor');
+
+ assert.notEqual(button.icon, icon,
+ 'button.icon is not the same object of the object set in the constructor');
+
+ assert.throws(
+ () => button.icon[16] = './bar.png',
+ /16 is read-only/,
+ 'properties of button.icon are ready-only'
+ );
+
+ let newIcon = {'16': './bar.png'};
+ button.icon = newIcon;
+
+ assert.deepEqual(button.icon, newIcon,
+ 'button.icon has the same properties of the object set');
+
+ assert.notEqual(button.icon, newIcon,
+ 'button.icon is not the same object of the object set');
+
+ loader.unload();
+}
+
exports['test button after destroy'] = function(assert) {
let loader = Loader(module);
let { ActionButton } = loader.require('sdk/ui');
diff --git a/addon-sdk/source/test/test-ui-toggle-button.js b/addon-sdk/source/test/test-ui-toggle-button.js
index 2eb66b1b181..71a6170593b 100644
--- a/addon-sdk/source/test/test-ui-toggle-button.js
+++ b/addon-sdk/source/test/test-ui-toggle-button.js
@@ -844,6 +844,44 @@ exports['test button state are snapshot'] = function(assert) {
loader.unload();
}
+exports['test button icon object is a snapshot'] = function(assert) {
+ let loader = Loader(module);
+ let { ToggleButton } = loader.require('sdk/ui');
+
+ let icon = {
+ '16': './foo.png'
+ };
+
+ let button = ToggleButton({
+ id: 'my-button-17',
+ label: 'my button',
+ icon: icon
+ });
+
+ assert.deepEqual(button.icon, icon,
+ 'button.icon has the same properties of the object set in the constructor');
+
+ assert.notEqual(button.icon, icon,
+ 'button.icon is not the same object of the object set in the constructor');
+
+ assert.throws(
+ () => button.icon[16] = './bar.png',
+ /16 is read-only/,
+ 'properties of button.icon are ready-only'
+ );
+
+ let newIcon = {'16': './bar.png'};
+ button.icon = newIcon;
+
+ assert.deepEqual(button.icon, newIcon,
+ 'button.icon has the same properties of the object set');
+
+ assert.notEqual(button.icon, newIcon,
+ 'button.icon is not the same object of the object set');
+
+ loader.unload();
+}
+
exports['test button after destroy'] = function(assert) {
let loader = Loader(module);
let { ToggleButton } = loader.require('sdk/ui');
diff --git a/b2g/chrome/content/desktop.js b/b2g/chrome/content/desktop.js
index 66256982643..3e0d0234e54 100644
--- a/b2g/chrome/content/desktop.js
+++ b/b2g/chrome/content/desktop.js
@@ -52,6 +52,10 @@ function checkDebuggerPort() {
// DebuggerServer.openListener detects that it isn't a file path (string),
// and starts listening on the tcp port given here as command line argument.
+ if (!window.arguments) {
+ return;
+ }
+
// Get the command line arguments that were passed to the b2g client
let args = window.arguments[0].QueryInterface(Ci.nsICommandLine);
diff --git a/b2g/chrome/content/runapp.js b/b2g/chrome/content/runapp.js
index 59340763db5..6df206fb1cb 100644
--- a/b2g/chrome/content/runapp.js
+++ b/b2g/chrome/content/runapp.js
@@ -5,6 +5,10 @@
let runAppObj;
window.addEventListener('load', function() {
+ if (!window.arguments) {
+ return;
+ }
+
// Get the command line arguments that were passed to the b2g client
let args = window.arguments[0].QueryInterface(Ci.nsICommandLine);
let appname;
diff --git a/b2g/chrome/content/screen.js b/b2g/chrome/content/screen.js
index f20f6579764..1f5eb826673 100644
--- a/b2g/chrome/content/screen.js
+++ b/b2g/chrome/content/screen.js
@@ -57,12 +57,19 @@ window.addEventListener('ContentStart', function() {
};
// Get the command line arguments that were passed to the b2g client
- let args = window.arguments[0].QueryInterface(Ci.nsICommandLine);
- let screenarg;
+ let args;
+ try {
+ // On Firefox Mulet, we don't always have a command line argument
+ args = window.arguments[0].QueryInterface(Ci.nsICommandLine);
+ } catch(e) {}
+
+ let screenarg = null;
// Get the --screen argument from the command line
try {
- screenarg = args.handleFlagWithParam('screen', false);
+ if (args) {
+ screenarg = args.handleFlagWithParam('screen', false);
+ }
// If there isn't one, use the default screen
if (screenarg === null)
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 90a0aca1e3d..6cad5063ebb 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 194f6436ba7..a904da8d71e 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 0c9b7979fe0..b0dc35ad1fb 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 90a0aca1e3d..6cad5063ebb 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2182504f9fa..cb30e848d83 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e1f051e5e96..e725b098f49 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
- "revision": "a54e097e9e3384d885c0116d9c4ca15c1e1cd75e",
+ "revision": "c766bc0d49af19f18788ad8ed0542b82db81f1d8",
"repo_path": "/integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b8c37aae1e8..37c2ed9c8bc 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index be3db5be4d7..76eb1e7218e 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml
index d33d85aecaa..4f919d763cd 100644
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml
index 27858e072bd..7b8c00a8fc6 100644
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml
index 4da2cd2bd1d..4307d436530 100644
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index b18c39486fa..d0c0fb3b8ea 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 7a39d31c7f1..7407e9c1721 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -183,7 +183,6 @@
@BINPATH@/components/dom_notification.xpt
@BINPATH@/components/dom_html.xpt
@BINPATH@/components/dom_indexeddb.xpt
-@BINPATH@/components/dom_inputmethod.xpt
@BINPATH@/components/dom_offline.xpt
@BINPATH@/components/dom_payment.xpt
@BINPATH@/components/dom_json.xpt
@@ -457,6 +456,8 @@
@BINPATH@/components/nsPlacesDBFlush.js
@BINPATH@/components/nsPlacesAutoComplete.manifest
@BINPATH@/components/nsPlacesAutoComplete.js
+@BINPATH@/components/UnifiedComplete.manifest
+@BINPATH@/components/UnifiedComplete.js
@BINPATH@/components/nsPlacesExpiration.js
@BINPATH@/components/PlacesProtocolHandler.js
@BINPATH@/components/PlacesCategoriesStarter.js
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 52de7c0cd9c..09e7c030370 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -122,7 +122,6 @@ tabbrowser {
visibility: hidden;
}
-.tab-close-button,
.tab-background {
/* Explicitly set the visibility to override the value (collapsed)
* we inherit from #TabsToolbar[collapsed] upon opening a browser window. */
@@ -131,15 +130,28 @@ tabbrowser {
transition: visibility 0ms 25ms;
}
-.tab-close-button:not([fadein]):not([pinned]),
.tab-background:not([fadein]):not([pinned]) {
visibility: hidden;
/* Closing tabs are hidden without a delay. */
transition-delay: 0ms;
}
+.tab-close-button,
+.tab-label {
+ /* Explicitly set the visibility to override the value (collapsed)
+ * we inherit from #TabsToolbar[collapsed] upon opening a browser window. */
+ visibility: visible;
+ transition: opacity 70ms 230ms,
+ visibility 0ms 230ms;
+}
+
+.tab-close-button:not([fadein]):not([pinned]),
+.tab-label:not([fadein]):not([pinned]) {
+ visibility: collapse;
+ opacity: .6;
+}
+
.tab-throbber:not([fadein]):not([pinned]),
-.tab-label:not([fadein]):not([pinned]),
.tab-icon-image:not([fadein]):not([pinned]) {
display: none;
}
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index a91f8c1ee8c..87e7a01c86a 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -81,6 +81,10 @@
Components.classes["@mozilla.org/autocomplete/search;1?name=history"]
.getService(Components.interfaces.mozIPlacesAutoComplete);
+
+ Components.classes["@mozilla.org/autocomplete/search;1?name=unifiedcomplete"]
+ .getService(Components.interfaces.mozIPlacesAutoComplete);
+
document.getAnonymousElementByAttribute(this, "anonid", "tabbox");
@@ -744,8 +748,10 @@
}
let autocomplete = this.mTabBrowser._placesAutocomplete;
+ let unifiedComplete = this.mTabBrowser._unifiedComplete;
if (this.mBrowser.registeredOpenURI) {
autocomplete.unregisterOpenPage(this.mBrowser.registeredOpenURI);
+ unifiedComplete.unregisterOpenPage(this.mBrowser.registeredOpenURI);
delete this.mBrowser.registeredOpenURI;
}
// Tabs in private windows aren't registered as "Open" so
@@ -754,6 +760,7 @@
(!PrivateBrowsingUtils.isWindowPrivate(window) ||
PrivateBrowsingUtils.permanentPrivateBrowsing)) {
autocomplete.registerOpenPage(aLocation);
+ unifiedComplete.registerOpenPage(aLocation);
this.mBrowser.registeredOpenURI = aLocation;
}
}
@@ -1672,12 +1679,6 @@
// kick the animation off
t.setAttribute("fadein", "true");
-
- // This call to adjustTabstrip is redundant but needed so that
- // when opening a second tab, the first tab's close buttons
- // appears immediately rather than when the transition ends.
- if (this.tabs.length - this._removingTabs.length == 2)
- this.tabContainer.adjustTabstrip();
}.bind(this));
}
@@ -1863,13 +1864,6 @@
aTab.style.maxWidth = ""; // ensure that fade-out transition happens
aTab.removeAttribute("fadein");
- if (this.tabs.length - this._removingTabs.length == 1) {
- // The second tab just got closed and we will end up with a single
- // one. Remove the first tab's close button immediately (if needed)
- // rather than after the tabclose animation ends.
- this.tabContainer.adjustTabstrip();
- }
-
setTimeout(function (tab, tabbrowser) {
if (tab.parentNode &&
window.getComputedStyle(tab).maxWidth == "0.1px") {
@@ -1969,6 +1963,7 @@
if (browser.registeredOpenURI && !aTabWillBeMoved) {
this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI);
+ this._unifiedComplete.unregisterOpenPage(browser.registeredOpenURI);
delete browser.registeredOpenURI;
}
@@ -2295,6 +2290,7 @@
// If the current URI is registered as open remove it from the list.
if (aOurBrowser.registeredOpenURI) {
this._placesAutocomplete.unregisterOpenPage(aOurBrowser.registeredOpenURI);
+ this._unifiedComplete.unregisterOpenPage(aOurBrowser.registeredOpenURI);
delete aOurBrowser.registeredOpenURI;
}
@@ -3104,6 +3100,7 @@
let browser = this.getBrowserAtIndex(i);
if (browser.registeredOpenURI) {
this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI);
+ this._unifiedComplete.unregisterOpenPage(browser.registeredOpenURI);
delete browser.registeredOpenURI;
}
browser.webProgress.removeProgressListener(this.mTabFilters[i]);
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 1468efb592c..1208022789d 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -68,6 +68,12 @@
this.inputField.addEventListener("overflow", this, false);
this.inputField.addEventListener("underflow", this, false);
+ try {
+ if (this._prefs.getBoolPref("unifiedcomplete")) {
+ this.setAttribute("autocompletesearch", "unifiedcomplete");
+ }
+ } catch (ex) {}
+
const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
var textBox = document.getAnonymousElementByAttribute(this,
"anonid", "textbox-input-box");
@@ -599,6 +605,14 @@
case "trimURLs":
this._mayTrimURLs = this._prefs.getBoolPref(aData);
break;
+ case "unifiedcomplete":
+ let useUnifiedComplete = false;
+ try {
+ useUnifiedComplete = this._prefs.getBoolPref(aData);
+ } catch (ex) {}
+ this.setAttribute("autocompletesearch",
+ useUnifiedComplete ? "unifiedcomplete"
+ : "urlinline history");
}
}
]]>
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index b1b98af700e..4f4072b11ba 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -386,6 +386,13 @@ let CustomizableUIInternal = {
gPlacements.set(aName, placements);
}
gFuturePlacements.delete(aName);
+ let existingAreaNodes = gBuildAreas.get(aName);
+ if (existingAreaNodes) {
+ for (let areaNode of existingAreaNodes) {
+ this.notifyListeners("onAreaNodeUnregistered", aName, areaNode.customizationTarget,
+ CustomizableUI.REASON_AREA_UNREGISTERED);
+ }
+ }
gBuildAreas.delete(aName);
} finally {
this.endBatchUpdate(true);
@@ -458,6 +465,7 @@ let CustomizableUIInternal = {
if (gDirtyAreaCache.has(area)) {
this.buildArea(area, placements, aToolbar);
}
+ this.notifyListeners("onAreaNodeRegistered", area, aToolbar.customizationTarget);
aToolbar.setAttribute("currentset", placements.join(","));
} finally {
this.endBatchUpdate();
@@ -699,6 +707,8 @@ let CustomizableUIInternal = {
let placements = gPlacements.get(CustomizableUI.AREA_PANEL);
this.buildArea(CustomizableUI.AREA_PANEL, placements, aPanelContents);
+ this.notifyListeners("onAreaNodeRegistered", CustomizableUI.AREA_PANEL, aPanelContents);
+
for (let child of aPanelContents.children) {
if (child.localName != "toolbarbutton") {
if (child.localName == "toolbaritem") {
@@ -839,6 +849,8 @@ let CustomizableUIInternal = {
let areaProperties = gAreas.get(areaId);
for (let node of areaNodes) {
if (node.ownerDocument == document) {
+ this.notifyListeners("onAreaNodeUnregistered", areaId, node.customizationTarget,
+ CustomizableUI.REASON_WINDOW_CLOSED);
if (areaProperties.has("overflowable")) {
node.overflowable.uninit();
node.overflowable = null;
@@ -2502,6 +2514,17 @@ this.CustomizableUI = {
*/
get PANEL_COLUMN_COUNT() 3,
+ /**
+ * Constant indicating the reason the event was fired was a window closing
+ */
+ get REASON_WINDOW_CLOSED() "window-closed",
+ /**
+ * Constant indicating the reason the event was fired was an area being
+ * unregistered separately from window closing mechanics.
+ */
+ get REASON_AREA_UNREGISTERED() "area-unregistered",
+
+
/**
* An iteratable property of windows managed by CustomizableUI.
* Note that this can *only* be used as an iterator. ie:
@@ -2603,6 +2626,15 @@ this.CustomizableUI = {
* - onWindowClosed(aWindow)
* Fired when a window that has been managed by CustomizableUI has been
* closed.
+ * - onAreaNodeRegistered(aArea, aContainer)
+ * Fired after an area node is first built when it is registered. This
+ * is often when the window has opened, but in the case of add-ons,
+ * could fire when the node has just been registered with CustomizableUI
+ * after an add-on update or disable/enable sequence.
+ * - onAreaNodeUnregistered(aArea, aContainer, aReason)
+ * Fired when an area node is explicitly unregistered by an API caller,
+ * or by a window closing. The aReason parameter indicates which of
+ * these is the case.
*/
addListener: function(aListener) {
CustomizableUIInternal.addListener(aListener);
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 64bce142782..b61ac47ed1c 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -236,11 +236,7 @@ CustomizeMode.prototype = {
yield this._wrapToolbarItems();
this.populatePalette();
- this.visiblePalette.addEventListener("dragstart", this, true);
- this.visiblePalette.addEventListener("dragover", this, true);
- this.visiblePalette.addEventListener("dragexit", this, true);
- this.visiblePalette.addEventListener("drop", this, true);
- this.visiblePalette.addEventListener("dragend", this, true);
+ this._addDragHandlers(this.visiblePalette);
window.gNavToolbox.addEventListener("toolbarvisibilitychange", this);
@@ -402,11 +398,7 @@ CustomizeMode.prototype = {
window.gNavToolbox.removeEventListener("toolbarvisibilitychange", this);
DragPositionManager.stop();
- this.visiblePalette.removeEventListener("dragstart", this, true);
- this.visiblePalette.removeEventListener("dragover", this, true);
- this.visiblePalette.removeEventListener("dragexit", this, true);
- this.visiblePalette.removeEventListener("drop", this, true);
- this.visiblePalette.removeEventListener("dragend", this, true);
+ this._removeDragHandlers(this.visiblePalette);
yield this._unwrapToolbarItems();
@@ -900,11 +892,7 @@ CustomizeMode.prototype = {
this.areas = [];
for (let area of CustomizableUI.areas) {
let target = CustomizableUI.getCustomizeTargetForArea(area, window);
- target.addEventListener("dragstart", this, true);
- target.addEventListener("dragover", this, true);
- target.addEventListener("dragexit", this, true);
- target.addEventListener("drop", this, true);
- target.addEventListener("dragend", this, true);
+ this._addDragHandlers(target);
for (let child of target.children) {
if (this.isCustomizableItem(child)) {
yield this.deferredWrapToolbarItem(child, CustomizableUI.getPlaceForItem(child));
@@ -915,6 +903,14 @@ CustomizeMode.prototype = {
}.bind(this)).then(null, ERROR);
},
+ _addDragHandlers: function(aTarget) {
+ aTarget.addEventListener("dragstart", this, true);
+ aTarget.addEventListener("dragover", this, true);
+ aTarget.addEventListener("dragexit", this, true);
+ aTarget.addEventListener("drop", this, true);
+ aTarget.addEventListener("dragend", this, true);
+ },
+
_wrapItemsInArea: function(target) {
for (let child of target.children) {
if (this.isCustomizableItem(child)) {
@@ -923,6 +919,14 @@ CustomizeMode.prototype = {
}
},
+ _removeDragHandlers: function(aTarget) {
+ aTarget.removeEventListener("dragstart", this, true);
+ aTarget.removeEventListener("dragover", this, true);
+ aTarget.removeEventListener("dragexit", this, true);
+ aTarget.removeEventListener("drop", this, true);
+ aTarget.removeEventListener("dragend", this, true);
+ },
+
_unwrapItemsInArea: function(target) {
for (let toolbarItem of target.children) {
if (this.isWrappedToolbarItem(toolbarItem)) {
@@ -939,11 +943,7 @@ CustomizeMode.prototype = {
yield this.deferredUnwrapToolbarItem(toolbarItem);
}
}
- target.removeEventListener("dragstart", this, true);
- target.removeEventListener("dragover", this, true);
- target.removeEventListener("dragexit", this, true);
- target.removeEventListener("drop", this, true);
- target.removeEventListener("dragend", this, true);
+ this._removeDragHandlers(target);
}
}.bind(this)).then(null, ERROR);
},
@@ -1118,6 +1118,25 @@ CustomizeMode.prototype = {
}
},
+ onAreaNodeRegistered: function(aArea, aContainer) {
+ if (aContainer.ownerDocument == this.document) {
+ this._wrapItemsInArea(aContainer);
+ this._addDragHandlers(aContainer);
+ DragPositionManager.add(this.window, aArea, aContainer);
+ this.areas.push(aContainer);
+ }
+ },
+
+ onAreaNodeUnregistered: function(aArea, aContainer, aReason) {
+ if (aContainer.ownerDocument == this.document && aReason == CustomizableUI.REASON_AREA_UNREGISTERED) {
+ this._unwrapItemsInArea(aContainer);
+ this._removeDragHandlers(aContainer);
+ DragPositionManager.remove(this.window, aArea, aContainer);
+ let index = this.areas.indexOf(aContainer);
+ this.areas.splice(index, 1);
+ }
+ },
+
_onUIChange: function() {
this._changed = true;
if (!this.resetting) {
diff --git a/browser/components/customizableui/src/DragPositionManager.jsm b/browser/components/customizableui/src/DragPositionManager.jsm
index 01e34d3ac5d..d2ac98c4519 100644
--- a/browser/components/customizableui/src/DragPositionManager.jsm
+++ b/browser/components/customizableui/src/DragPositionManager.jsm
@@ -393,6 +393,22 @@ let DragPositionManager = {
}
},
+ add: function(aWindow, aArea, aContainer) {
+ if (CustomizableUI.getAreaType(aArea) != "toolbar") {
+ return;
+ }
+
+ gManagers.set(aContainer, new AreaPositionManager(aContainer));
+ },
+
+ remove: function(aWindow, aArea, aContainer) {
+ if (CustomizableUI.getAreaType(aArea) != "toolbar") {
+ return;
+ }
+
+ gManagers.delete(aContainer);
+ },
+
stop: function() {
gManagers.clear();
},
diff --git a/browser/components/customizableui/test/browser.ini b/browser/components/customizableui/test/browser.ini
index d4c28e79516..e7ae2d498e9 100644
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -104,5 +104,6 @@ skip-if = os == "linux"
[browser_987492_window_api.js]
[browser_992747_toggle_noncustomizable_toolbar.js]
[browser_993322_widget_notoolbar.js]
+[browser_995164_registerArea_during_customize_mode.js]
[browser_bootstrapped_custom_toolbar.js]
[browser_panel_toggle.js]
diff --git a/browser/components/customizableui/test/browser_993322_widget_notoolbar.js b/browser/components/customizableui/test/browser_993322_widget_notoolbar.js
index b40e296840f..9264eb78a43 100644
--- a/browser/components/customizableui/test/browser_993322_widget_notoolbar.js
+++ b/browser/components/customizableui/test/browser_993322_widget_notoolbar.js
@@ -31,4 +31,6 @@ add_task(function*() {
CustomizableUI.destroyWidget(BUTTONID);
CustomizableUI.unregisterArea(TOOLBARID, true);
+ toolbar.remove();
+ gAddedToolbars.clear();
});
diff --git a/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js b/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js
new file mode 100644
index 00000000000..f10f8fd17ea
--- /dev/null
+++ b/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js
@@ -0,0 +1,113 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const TOOLBARID = "test-toolbar-added-during-customize-mode";
+
+add_task(function*() {
+ yield startCustomizing();
+ let toolbar = createToolbarWithPlacements(TOOLBARID, []);
+ CustomizableUI.addWidgetToArea("sync-button", TOOLBARID);
+ let syncButton = document.getElementById("sync-button");
+ ok(syncButton, "Sync button should exist.");
+ is(syncButton.parentNode.localName, "toolbarpaletteitem", "Sync button's parent node should be a wrapper.");
+
+ simulateItemDrag(syncButton, gNavToolbox.palette);
+ ok(!CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved to the palette");
+ ok(gNavToolbox.palette.querySelector("#sync-button"), "Sync button really is in palette.");
+
+ simulateItemDrag(syncButton, toolbar);
+ ok(CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved out of palette");
+ is(CustomizableUI.getPlacementOfWidget("sync-button").area, TOOLBARID, "Button's back on toolbar");
+ ok(toolbar.querySelector("#sync-button"), "Sync button really is on toolbar.");
+
+ yield endCustomizing();
+ isnot(syncButton.parentNode.localName, "toolbarpaletteitem", "Sync button's parent node should not be a wrapper outside customize mode.");
+ yield startCustomizing();
+
+ is(syncButton.parentNode.localName, "toolbarpaletteitem", "Sync button's parent node should be a wrapper back in customize mode.");
+
+ simulateItemDrag(syncButton, gNavToolbox.palette);
+ ok(!CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved to the palette");
+ ok(gNavToolbox.palette.querySelector("#sync-button"), "Sync button really is in palette.");
+
+ ok(!CustomizableUI.inDefaultState, "Not in default state while toolbar is not collapsed yet.");
+ setToolbarVisibility(toolbar, false);
+ ok(CustomizableUI.inDefaultState, "In default state while toolbar is collapsed.");
+
+ setToolbarVisibility(toolbar, true);
+
+ info("Check that removing the area registration from within customize mode works");
+ CustomizableUI.unregisterArea(TOOLBARID);
+ ok(CustomizableUI.inDefaultState, "Now that the toolbar is no longer registered, should be in default state.");
+ ok(!(new Set(gCustomizeMode.areas)).has(toolbar), "Toolbar shouldn't be known to customize mode.");
+
+ CustomizableUI.registerArea(TOOLBARID, {legacy: true, defaultPlacements: []});
+ CustomizableUI.registerToolbarNode(toolbar, []);
+ ok(!CustomizableUI.inDefaultState, "Now that the toolbar is registered again, should no longer be in default state.");
+ ok((new Set(gCustomizeMode.areas)).has(toolbar), "Toolbar should be known to customize mode again.");
+
+ simulateItemDrag(syncButton, toolbar);
+ ok(CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved out of palette");
+ is(CustomizableUI.getPlacementOfWidget("sync-button").area, TOOLBARID, "Button's back on toolbar");
+ ok(toolbar.querySelector("#sync-button"), "Sync button really is on toolbar.");
+
+ let otherWin = yield openAndLoadWindow({}, true);
+ let otherTB = otherWin.document.createElementNS(kNSXUL, "toolbar");
+ otherTB.id = TOOLBARID;
+ otherTB.setAttribute("customizable", "true");
+ otherWin.gNavToolbox.appendChild(otherTB);
+ ok(otherTB.querySelector("#sync-button"), "Sync button is on other toolbar, too.");
+
+ simulateItemDrag(syncButton, gNavToolbox.palette);
+ ok(!CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved to the palette");
+ ok(gNavToolbox.palette.querySelector("#sync-button"), "Sync button really is in palette.");
+ ok(!otherTB.querySelector("#sync-button"), "Sync button is in palette in other window, too.");
+
+ simulateItemDrag(syncButton, toolbar);
+ ok(CustomizableUI.getPlacementOfWidget("sync-button"), "Button moved out of palette");
+ is(CustomizableUI.getPlacementOfWidget("sync-button").area, TOOLBARID, "Button's back on toolbar");
+ ok(toolbar.querySelector("#sync-button"), "Sync button really is on toolbar.");
+ ok(otherTB.querySelector("#sync-button"), "Sync button is on other toolbar, too.");
+
+ let wasInformedCorrectlyOfAreaDisappearing = false;
+ let listener = {
+ onAreaNodeUnregistered: function(aArea, aNode, aReason) {
+ if (aArea == TOOLBARID) {
+ is(aNode, otherTB, "Should be informed about other toolbar");
+ is(aReason, CustomizableUI.REASON_WINDOW_CLOSED, "Reason should be correct.");
+ wasInformedCorrectlyOfAreaDisappearing = (aReason === CustomizableUI.REASON_WINDOW_CLOSED);
+ }
+ }
+ };
+ CustomizableUI.addListener(listener);
+ yield promiseWindowClosed(otherWin);
+
+ ok(wasInformedCorrectlyOfAreaDisappearing, "Should be told about window closing.");
+ CustomizableUI.removeListener(listener);
+ // Closing the other window should not be counted against this window's customize mode:
+ is(syncButton.parentNode.localName, "toolbarpaletteitem", "Sync button's parent node should still be a wrapper.");
+ isnot(gCustomizeMode.areas.indexOf(toolbar), -1, "Toolbar should still be a customizable area for this customize mode instance.");
+
+ yield gCustomizeMode.reset();
+
+ yield endCustomizing();
+
+ wasInformedCorrectlyOfAreaDisappearing = false;
+ listener = {
+ onAreaNodeUnregistered: function(aArea, aNode, aReason) {
+ if (aArea == TOOLBARID) {
+ is(aNode, toolbar, "Should be informed about this window's toolbar");
+ is(aReason, CustomizableUI.REASON_AREA_UNREGISTERED, "Reason for final removal should be correct.");
+ wasInformedCorrectlyOfAreaDisappearing = (aReason === CustomizableUI.REASON_AREA_UNREGISTERED);
+ }
+ },
+ }
+ CustomizableUI.addListener(listener);
+ removeCustomToolbars();
+ ok(wasInformedCorrectlyOfAreaDisappearing, "Should be told about area being unregistered.");
+ CustomizableUI.removeListener(listener);
+ ok(CustomizableUI.inDefaultState, "Should be fine after exiting customize mode.");
+});
diff --git a/browser/components/sessionstore/test/browser.ini b/browser/components/sessionstore/test/browser.ini
index 9668f1c1a8d..2d2e125b67e 100644
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -145,6 +145,8 @@ skip-if = true
[browser_590268.js]
[browser_590563.js]
[browser_595601-restore_hidden.js]
+[browser_597071.js]
+skip-if = true # Needs to be rewritten as Marionette test, bug 995916
[browser_599909.js]
[browser_600545.js]
[browser_601955.js]
@@ -184,8 +186,6 @@ skip-if = true
skip-if = true
# Disabled on OS X:
-[browser_597071.js]
-skip-if = os == "mac" || e10s
[browser_625016.js]
skip-if = os == "mac" || e10s
diff --git a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
index 23de133268c..f077a893611 100644
--- a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
+++ b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const stateBackup = ss.getBrowserState();
+const stateBackup = JSON.parse(ss.getBrowserState());
const testState = {
windows: [{
tabs: [
@@ -76,8 +76,7 @@ function runNextTest() {
});
}
else {
- ss.setBrowserState(stateBackup);
- finish();
+ waitForBrowserState(stateBackup, finish);
}
}
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 292e9e9b429..be8962d4e87 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -203,7 +203,6 @@
@BINPATH@/components/dom_notification.xpt
@BINPATH@/components/dom_html.xpt
@BINPATH@/components/dom_indexeddb.xpt
-@BINPATH@/components/dom_inputmethod.xpt
@BINPATH@/components/dom_offline.xpt
@BINPATH@/components/dom_json.xpt
@BINPATH@/components/dom_power.xpt
@@ -430,6 +429,8 @@
@BINPATH@/components/nsTaggingService.js
@BINPATH@/components/nsPlacesAutoComplete.manifest
@BINPATH@/components/nsPlacesAutoComplete.js
+@BINPATH@/components/UnifiedComplete.manifest
+@BINPATH@/components/UnifiedComplete.js
@BINPATH@/components/nsPlacesExpiration.js
@BINPATH@/browser/components/PlacesProtocolHandler.js
@BINPATH@/components/PlacesCategoriesStarter.js
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index d486b5e0f6a..e904475801b 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -88,7 +88,7 @@
margin-top: @windowButtonMarginTop@;
}
-#main-window[customizing] > #titlebar {
+#main-window[customize-entered] > #titlebar {
-moz-appearance: none;
}
@@ -2847,6 +2847,16 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
padding: 6px 0 4px;
}
+/* Background tabs:
+ *
+ * Decrease the height of the hoverable region of background tabs whenever the tabs are at the top
+ * of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by
+ * the titlebar. We don't need this in fullscreen since window dragging is not an issue there.
+ */
+#main-window[tabsintitlebar]:not([inFullscreen]) .tab-background-middle:not([selected=true]) {
+ clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);
+}
+
/**
* Tab Drag and Drop
*/
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 57ac7d9f901..4e9ad8e94e1 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -226,20 +226,6 @@
/* End selected tab */
-/* Background tabs */
-
-/* Decrease the height of the hoverable region of background tabs whenever the tabs are at the top
- of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by
- the titlebar. We don't need this in fullscreen since window dragging is not an issue there. */
-%ifdef XP_MACOSX
-#main-window[tabsintitlebar][sizemode="maximized"] .tab-background-middle:not([selected=true]),
-%endif
-#main-window[tabsintitlebar]:not([sizemode="maximized"]):not([inFullscreen]) #toolbar-menubar:-moz-any([autohide="true"][inactive], :not([autohide])) + #TabsToolbar .tab-background-middle:not([selected=true]) {
- clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);
-}
-
-/* End background tabs */
-
/* new tab button border and gradient on hover */
.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]),
.tabs-newtab-button:hover {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 4d562962cc1..08fff4b5c1d 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1902,6 +1902,16 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
outline: 1px dotted;
}
+/* Background tabs:
+ *
+ * Decrease the height of the hoverable region of background tabs whenever the tabs are at the top
+ * of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by
+ * the titlebar. We don't need this in fullscreen since window dragging is not an issue there.
+ */
+#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar .tab-background-middle:not([selected=true]) {
+ clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);
+}
+
/* Tab DnD indicator */
.tab-drop-indicator {
list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
diff --git a/dom/bluetooth/BluetoothCommon.h b/dom/bluetooth/BluetoothCommon.h
index 94a75c97b50..e0aa8f5f751 100644
--- a/dom/bluetooth/BluetoothCommon.h
+++ b/dom/bluetooth/BluetoothCommon.h
@@ -57,6 +57,25 @@ extern bool gBluetoothDebugFlag;
#define BT_WARNING(msg, ...) printf("%s: " msg, __FUNCTION__, ##__VA_ARGS__))
#endif
+/**
+ * Wrap literal name and value into a BluetoothNamedValue
+ * and append it to the array.
+ */
+#define BT_APPEND_NAMED_VALUE(array, name, value) \
+ array.AppendElement(BluetoothNamedValue(NS_LITERAL_STRING(name), value))
+
+/**
+ * Ensure success of system message broadcast with void return.
+ */
+#define BT_ENSURE_TRUE_VOID_BROADCAST_SYSMSG(type, parameters) \
+ do { \
+ if (!BroadcastSystemMessage(type, parameters)) { \
+ BT_WARNING("Failed to broadcast [%s]", \
+ NS_ConvertUTF16toUTF8(type).get()); \
+ return; \
+ } \
+ } while(0)
+
#define BEGIN_BLUETOOTH_NAMESPACE \
namespace mozilla { namespace dom { namespace bluetooth {
#define END_BLUETOOTH_NAMESPACE \
diff --git a/dom/bluetooth/BluetoothHidManager.cpp b/dom/bluetooth/BluetoothHidManager.cpp
index f81f3da51f8..5c8a5c7ecd7 100644
--- a/dom/bluetooth/BluetoothHidManager.cpp
+++ b/dom/bluetooth/BluetoothHidManager.cpp
@@ -241,18 +241,10 @@ BluetoothHidManager::NotifyStatusChanged()
NS_NAMED_LITERAL_STRING(type, BLUETOOTH_HID_STATUS_CHANGED_ID);
InfallibleTArray