{mozL10n.get("context_inroom_label")}
{URLDescription}
-
{location}
+
{locationData.hostname}
{this.props.roomData.roomDescription ?
{this.props.roomData.roomDescription}
:
null}
diff --git a/browser/components/loop/content/shared/.eslintrc b/browser/components/loop/content/shared/.eslintrc
deleted file mode 100644
index 19cce829002..00000000000
--- a/browser/components/loop/content/shared/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "ecmaFeatures": {
- // Turn off top-level items needed for the jsm files, but not wanted
- // for shared code as we can't support them.
- "blockBindings": false,
- "arrowFunctions": false,
- "destructuring": false,
- "forOf": true,
- "generators": false,
- "spread": false,
- "restParams": false,
- "objectLiteralShorthandMethods": false
- }
-}
diff --git a/browser/components/loop/content/shared/js/otSdkDriver.js b/browser/components/loop/content/shared/js/otSdkDriver.js
index f6c52a36551..67d10316db6 100644
--- a/browser/components/loop/content/shared/js/otSdkDriver.js
+++ b/browser/components/loop/content/shared/js/otSdkDriver.js
@@ -789,7 +789,7 @@ loop.OTSdkDriver = (function() {
bucket = buckets.MORE_THAN_5M;
}
- this.mozLoop.telemetryAddValue("LOOP_TWO_WAY_MEDIA_CONN_LENGTH", bucket);
+ this.mozLoop.telemetryAddValue("LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1", bucket);
this._setTwoWayMediaStartTime(this.CONNECTION_START_TIME_ALREADY_NOTED);
this._connectionLengthNotedCalls++;
@@ -857,7 +857,7 @@ loop.OTSdkDriver = (function() {
return;
}
- this.mozLoop.telemetryAddValue("LOOP_SHARING_STATE_CHANGE", bucket);
+ this.mozLoop.telemetryAddValue("LOOP_SHARING_STATE_CHANGE_1", bucket);
}
};
diff --git a/browser/components/loop/content/shared/js/utils.js b/browser/components/loop/content/shared/js/utils.js
index 3c0bbd0343c..e0a1d904966 100644
--- a/browser/components/loop/content/shared/js/utils.js
+++ b/browser/components/loop/content/shared/js/utils.js
@@ -271,6 +271,33 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
};
}
+ /**
+ * Formats a url for display purposes. This includes converting the
+ * domain to punycode, and then decoding the url.
+ *
+ * @param {String} url The url to format.
+ * @return {Object} An object containing the hostname and full location.
+ */
+ function formatURL(url) {
+ // We're using new URL to pass this through the browser's ACE/punycode
+ // processing system. If the browser considers a url to need to be
+ // punycode encoded for it to be displayed, then new URL will do that for
+ // us. This saves us needing our own punycode library.
+ var urlObject;
+ try {
+ urlObject = new URL(url);
+ } catch (ex) {
+ console.error("Error occurred whilst parsing URL:", ex);
+ return null;
+ }
+
+ // Finally, ensure we look good.
+ return {
+ hostname: urlObject.hostname,
+ location: decodeURI(urlObject.href)
+ };
+ }
+
/**
* Generates and opens a mailto: url with call URL information prefilled.
* Note: This only works for Desktop.
@@ -536,6 +563,7 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
ROOM_INFO_FAILURES: ROOM_INFO_FAILURES,
composeCallUrlEmail: composeCallUrlEmail,
formatDate: formatDate,
+ formatURL: formatURL,
getBoolPreference: getBoolPreference,
getOS: getOS,
getOSVersion: getOSVersion,
diff --git a/browser/components/loop/modules/.eslintrc b/browser/components/loop/modules/.eslintrc
new file mode 100644
index 00000000000..bd58bc5876d
--- /dev/null
+++ b/browser/components/loop/modules/.eslintrc
@@ -0,0 +1,17 @@
+{
+ "ecmaFeatures": {
+ "arrowFunctions": true,
+ "blockBindings": true,
+ "destructuring": true,
+ "generators": true,
+ "restParams": true,
+ "spread": true,
+ "objectLiteralShorthandMethods": true,
+ },
+ "rules": {
+ "generator-star-spacing": [2, "after"],
+ // We should fix the errors and enable this (set to 2)
+ "no-var": 0,
+ "strict": [2, "global"]
+ }
+}
diff --git a/browser/components/loop/CardDavImporter.jsm b/browser/components/loop/modules/CardDavImporter.jsm
similarity index 100%
rename from browser/components/loop/CardDavImporter.jsm
rename to browser/components/loop/modules/CardDavImporter.jsm
diff --git a/browser/components/loop/GoogleImporter.jsm b/browser/components/loop/modules/GoogleImporter.jsm
similarity index 100%
rename from browser/components/loop/GoogleImporter.jsm
rename to browser/components/loop/modules/GoogleImporter.jsm
diff --git a/browser/components/loop/LoopCalls.jsm b/browser/components/loop/modules/LoopCalls.jsm
similarity index 100%
rename from browser/components/loop/LoopCalls.jsm
rename to browser/components/loop/modules/LoopCalls.jsm
diff --git a/browser/components/loop/LoopContacts.jsm b/browser/components/loop/modules/LoopContacts.jsm
similarity index 100%
rename from browser/components/loop/LoopContacts.jsm
rename to browser/components/loop/modules/LoopContacts.jsm
diff --git a/browser/components/loop/LoopRooms.jsm b/browser/components/loop/modules/LoopRooms.jsm
similarity index 100%
rename from browser/components/loop/LoopRooms.jsm
rename to browser/components/loop/modules/LoopRooms.jsm
diff --git a/browser/components/loop/LoopStorage.jsm b/browser/components/loop/modules/LoopStorage.jsm
similarity index 100%
rename from browser/components/loop/LoopStorage.jsm
rename to browser/components/loop/modules/LoopStorage.jsm
diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/modules/MozLoopAPI.jsm
similarity index 100%
rename from browser/components/loop/MozLoopAPI.jsm
rename to browser/components/loop/modules/MozLoopAPI.jsm
diff --git a/browser/components/loop/MozLoopPushHandler.jsm b/browser/components/loop/modules/MozLoopPushHandler.jsm
similarity index 100%
rename from browser/components/loop/MozLoopPushHandler.jsm
rename to browser/components/loop/modules/MozLoopPushHandler.jsm
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/modules/MozLoopService.jsm
similarity index 100%
rename from browser/components/loop/MozLoopService.jsm
rename to browser/components/loop/modules/MozLoopService.jsm
diff --git a/browser/components/loop/MozLoopWorker.js b/browser/components/loop/modules/MozLoopWorker.js
similarity index 100%
rename from browser/components/loop/MozLoopWorker.js
rename to browser/components/loop/modules/MozLoopWorker.js
diff --git a/browser/components/loop/moz.build b/browser/components/loop/moz.build
index 5ed65838c6b..a2cbc2469d8 100644
--- a/browser/components/loop/moz.build
+++ b/browser/components/loop/moz.build
@@ -13,18 +13,18 @@ BROWSER_CHROME_MANIFESTS += [
]
EXTRA_JS_MODULES.loop += [
- 'CardDavImporter.jsm',
'content/shared/js/crypto.js',
'content/shared/js/utils.js',
- 'GoogleImporter.jsm',
- 'LoopCalls.jsm',
- 'LoopContacts.jsm',
- 'LoopRooms.jsm',
- 'LoopStorage.jsm',
- 'MozLoopAPI.jsm',
- 'MozLoopPushHandler.jsm',
- 'MozLoopService.jsm',
- 'MozLoopWorker.js',
+ 'modules/CardDavImporter.jsm',
+ 'modules/GoogleImporter.jsm',
+ 'modules/LoopCalls.jsm',
+ 'modules/LoopContacts.jsm',
+ 'modules/LoopRooms.jsm',
+ 'modules/LoopStorage.jsm',
+ 'modules/MozLoopAPI.jsm',
+ 'modules/MozLoopPushHandler.jsm',
+ 'modules/MozLoopService.jsm',
+ 'modules/MozLoopWorker.js',
]
with Files('**'):
diff --git a/browser/components/loop/standalone/.eslintrc b/browser/components/loop/standalone/.eslintrc
deleted file mode 100644
index 19cce829002..00000000000
--- a/browser/components/loop/standalone/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "ecmaFeatures": {
- // Turn off top-level items needed for the jsm files, but not wanted
- // for shared code as we can't support them.
- "blockBindings": false,
- "arrowFunctions": false,
- "destructuring": false,
- "forOf": true,
- "generators": false,
- "spread": false,
- "restParams": false,
- "objectLiteralShorthandMethods": false
- }
-}
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.js b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
index 56dd6b59752..de4e7522407 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -16,6 +16,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
var ROOM_STATES = loop.store.ROOM_STATES;
var sharedActions = loop.shared.actions;
var sharedMixins = loop.shared.mixins;
+ var sharedUtils = loop.shared.utils;
var sharedViews = loop.shared.views;
var StandaloneRoomInfoArea = React.createClass({displayName: "StandaloneRoomInfoArea",
@@ -248,7 +249,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
return null;
}
- var location = this.props.roomContextUrl.location;
+ var locationInfo = sharedUtils.formatURL(this.props.roomContextUrl.location);
+ if (!locationInfo) {
+ return null;
+ }
var cx = React.addons.classSet;
@@ -262,9 +266,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
React.createElement("img", {src: this.props.roomContextUrl.thumbnail}),
React.createElement("div", {className: "standalone-context-url-description-wrapper"},
this.props.roomContextUrl.description,
- React.createElement("br", null), React.createElement("a", {href: location,
+ React.createElement("br", null), React.createElement("a", {href: locationInfo.location,
onClick: this.recordClick,
- target: "_blank"}, location)
+ target: "_blank",
+ title: locationInfo.location}, locationInfo.hostname)
)
)
);
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
index 70169a2187f..cf2c779af28 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -16,6 +16,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
var ROOM_STATES = loop.store.ROOM_STATES;
var sharedActions = loop.shared.actions;
var sharedMixins = loop.shared.mixins;
+ var sharedUtils = loop.shared.utils;
var sharedViews = loop.shared.views;
var StandaloneRoomInfoArea = React.createClass({
@@ -248,7 +249,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
return null;
}
- var location = this.props.roomContextUrl.location;
+ var locationInfo = sharedUtils.formatURL(this.props.roomContextUrl.location);
+ if (!locationInfo) {
+ return null;
+ }
var cx = React.addons.classSet;
@@ -262,9 +266,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
{this.props.roomContextUrl.description}
-
{location}
+ target="_blank"
+ title={locationInfo.location}>{locationInfo.hostname}
);
diff --git a/browser/components/loop/standalone/package.json b/browser/components/loop/standalone/package.json
index d3e3c23e0ee..b7214f8c5a3 100644
--- a/browser/components/loop/standalone/package.json
+++ b/browser/components/loop/standalone/package.json
@@ -12,8 +12,8 @@
},
"dependencies": {},
"devDependencies": {
- "eslint": "0.18.x",
- "eslint-plugin-react": "2.0.x",
+ "eslint": "0.20.x",
+ "eslint-plugin-react": "2.2.x",
"express": "3.x"
},
"scripts": {
diff --git a/browser/components/loop/test/.eslintrc b/browser/components/loop/test/.eslintrc
new file mode 100644
index 00000000000..7de540fc5d4
--- /dev/null
+++ b/browser/components/loop/test/.eslintrc
@@ -0,0 +1,7 @@
+{
+ "rules": {
+ // This is useful for some of the tests, e.g.
+ // expect(new Foo()).to.Throw(/error/)
+ "no-new": 0
+ }
+}
diff --git a/browser/components/loop/test/desktop-local/roomViews_test.js b/browser/components/loop/test/desktop-local/roomViews_test.js
index a3f9b1dd725..5de6359ba94 100644
--- a/browser/components/loop/test/desktop-local/roomViews_test.js
+++ b/browser/components/loop/test/desktop-local/roomViews_test.js
@@ -242,6 +242,23 @@ describe("loop.roomViews", function () {
expect(view.getDOMNode().querySelector(".room-context")).to.not.eql(null);
});
+
+ it("should format the context url for display", function() {
+ sandbox.stub(sharedUtils, "formatURL").returns({
+ location: "location",
+ hostname: "hostname"
+ });
+
+ view = mountTestComponent({
+ showContext: true,
+ roomData: {
+ roomContextUrls: [fakeContextURL]
+ }
+ });
+
+ expect(view.getDOMNode().querySelector(".room-context-url").textContent)
+ .eql("hostname");
+ });
});
});
diff --git a/browser/components/loop/test/mochitest/.eslintrc b/browser/components/loop/test/mochitest/.eslintrc
new file mode 100644
index 00000000000..bd58bc5876d
--- /dev/null
+++ b/browser/components/loop/test/mochitest/.eslintrc
@@ -0,0 +1,17 @@
+{
+ "ecmaFeatures": {
+ "arrowFunctions": true,
+ "blockBindings": true,
+ "destructuring": true,
+ "generators": true,
+ "restParams": true,
+ "spread": true,
+ "objectLiteralShorthandMethods": true,
+ },
+ "rules": {
+ "generator-star-spacing": [2, "after"],
+ // We should fix the errors and enable this (set to 2)
+ "no-var": 0,
+ "strict": [2, "global"]
+ }
+}
diff --git a/browser/components/loop/test/mochitest/browser_CardDavImporter.js b/browser/components/loop/test/mochitest/browser_CardDavImporter.js
index e92962fdfd4..c614d45e7e9 100644
--- a/browser/components/loop/test/mochitest/browser_CardDavImporter.js
+++ b/browser/components/loop/test/mochitest/browser_CardDavImporter.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
const {CardDavImporter} = Cu.import("resource:///modules/loop/CardDavImporter.jsm", {});
const kAuth = {
diff --git a/browser/components/loop/test/mochitest/browser_GoogleImporter.js b/browser/components/loop/test/mochitest/browser_GoogleImporter.js
index 0acbd0a81c3..d344bdcc43e 100644
--- a/browser/components/loop/test/mochitest/browser_GoogleImporter.js
+++ b/browser/components/loop/test/mochitest/browser_GoogleImporter.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
const {GoogleImporter} = Cu.import("resource:///modules/loop/GoogleImporter.jsm", {});
let importer = new GoogleImporter();
diff --git a/browser/components/loop/test/mochitest/browser_LoopContacts.js b/browser/components/loop/test/mochitest/browser_LoopContacts.js
index 0f5dcec8273..10196a9430b 100644
--- a/browser/components/loop/test/mochitest/browser_LoopContacts.js
+++ b/browser/components/loop/test/mochitest/browser_LoopContacts.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
const {LoopContacts} = Cu.import("resource:///modules/loop/LoopContacts.jsm", {});
const {LoopStorage} = Cu.import("resource:///modules/loop/LoopStorage.jsm", {});
@@ -221,8 +223,13 @@ add_task(function* () {
Assert.ok(!err, "There shouldn't be an error");
Assert.equal(result.length, toRetrieve.length, "Result list should be the same " +
"size as the list of items to retrieve");
+
+ function resultFilter(c) {
+ return c._guid == this._guid;
+ }
+
for (let contact of toRetrieve) {
- let found = result.filter(c => c._guid == contact._guid);
+ let found = result.filter(resultFilter.bind(contact));
Assert.ok(found.length, "Contact " + contact._guid + " should be in the list");
compareContacts(found[0], contact);
}
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js b/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
index caa9b7879d1..848cacf4682 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
@@ -6,6 +6,8 @@
* effects - rather than just testing MozLoopAPI alone.
*/
+"use strict";
+
Components.utils.import("resource://gre/modules/Promise.jsm", this);
add_task(loadLoopPanel);
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js b/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js
index a167cc2ebb7..fd7428ff634 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js
@@ -6,6 +6,8 @@
* effects - rather than just testing MozLoopAPI alone.
*/
+"use strict";
+
Components.utils.import("resource://gre/modules/Promise.jsm", this);
add_task(loadLoopPanel);
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js b/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js
index 31aa6182062..87b76cb6973 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js
@@ -1,21 +1,23 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * This is an integration test from navigator.mozLoop through to the end
- * effects - rather than just testing MozLoopAPI alone.
- */
-
-Components.utils.import("resource://gre/modules/Promise.jsm", this);
-
-add_task(loadLoopPanel);
-
-add_task(function* test_mozLoop_pluralStrings() {
- Assert.ok(gMozLoopAPI, "mozLoop should exist");
-
- var strings = JSON.parse(gMozLoopAPI.getStrings("feedback_window_will_close_in2"));
- Assert.equal(gMozLoopAPI.getPluralForm(0, strings.textContent),
- "This window will close in {{countdown}} seconds");
- Assert.equal(gMozLoopAPI.getPluralForm(1, strings.textContent),
- "This window will close in {{countdown}} second");
-});
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This is an integration test from navigator.mozLoop through to the end
+ * effects - rather than just testing MozLoopAPI alone.
+ */
+
+"use strict";
+
+Components.utils.import("resource://gre/modules/Promise.jsm", this);
+
+add_task(loadLoopPanel);
+
+add_task(function* test_mozLoop_pluralStrings() {
+ Assert.ok(gMozLoopAPI, "mozLoop should exist");
+
+ var strings = JSON.parse(gMozLoopAPI.getStrings("feedback_window_will_close_in2"));
+ Assert.equal(gMozLoopAPI.getPluralForm(0, strings.textContent),
+ "This window will close in {{countdown}} seconds");
+ Assert.equal(gMozLoopAPI.getPluralForm(1, strings.textContent),
+ "This window will close in {{countdown}} second");
+});
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js b/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js
index c3c3d52c24f..e5b690dc7df 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js
@@ -6,6 +6,8 @@
* effects - rather than just testing MozLoopAPI alone.
*/
+"use strict";
+
Components.utils.import("resource://gre/modules/Promise.jsm", this);
add_task(loadLoopPanel);
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js b/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
index 7f7de1177ce..20c3ef0ddaf 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
@@ -6,6 +6,8 @@
* effects - rather than just testing MozLoopAPI alone.
*/
+"use strict";
+
Cu.import("resource://gre/modules/Promise.jsm");
const {SocialService} = Cu.import("resource://gre/modules/SocialService.jsm", {});
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
index 071cc11a32c..14493b76172 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
@@ -4,6 +4,9 @@
/*
* This file contains tests for the mozLoop telemetry API.
*/
+
+"use strict";
+
Components.utils.import("resource://gre/modules/Promise.jsm", this);
add_task(loadLoopPanel);
@@ -23,7 +26,7 @@ add_task(function* test_initialize() {
* Tests that enumerated bucket histograms exist and can be updated.
*/
add_task(function* test_mozLoop_telemetryAdd_buckets() {
- let histogramId = "LOOP_TWO_WAY_MEDIA_CONN_LENGTH";
+ let histogramId = "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1";
let histogram = Services.telemetry.getHistogramById(histogramId);
let CONN_LENGTH = gMozLoopAPI.TWO_WAY_MEDIA_CONN_LENGTH;
@@ -49,7 +52,7 @@ add_task(function* test_mozLoop_telemetryAdd_buckets() {
});
add_task(function* test_mozLoop_telemetryAdd_sharing_buckets() {
- let histogramId = "LOOP_SHARING_STATE_CHANGE";
+ let histogramId = "LOOP_SHARING_STATE_CHANGE_1";
let histogram = Services.telemetry.getHistogramById(histogramId);
const SHARING_STATES = gMozLoopAPI.SHARING_STATE_CHANGE;
diff --git a/browser/components/loop/test/mochitest/head.js b/browser/components/loop/test/mochitest/head.js
index e13029c3b37..7364c61d0cd 100644
--- a/browser/components/loop/test/mochitest/head.js
+++ b/browser/components/loop/test/mochitest/head.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
const HAWK_TOKEN_LENGTH = 64;
const {
LOOP_SESSION_TYPE,
@@ -123,8 +125,8 @@ function loadLoopPanel(aOverrideOptions = {}) {
let loopPanel = document.getElementById("loop-notification-panel");
loopPanel.setAttribute("animate", "false");
- // Now get the actual API.
- yield promiseGetMozLoopAPI();
+ // Now get the actual API loaded into gMozLoopAPI.
+ return promiseGetMozLoopAPI();
}
function promiseOAuthParamsSetup(baseURL, params) {
@@ -319,7 +321,7 @@ const mockDb = {
callback(null, details);
},
remove: function(guid, callback) {
- if (!guid in this._store) {
+ if (!(guid in this._store)) {
callback(new Error("Could not find _guid '" + guid + "' in database"));
return;
}
diff --git a/browser/components/loop/test/shared/otSdkDriver_test.js b/browser/components/loop/test/shared/otSdkDriver_test.js
index 5e2392606e9..4cfd4a8e9f3 100644
--- a/browser/components/loop/test/shared/otSdkDriver_test.js
+++ b/browser/components/loop/test/shared/otSdkDriver_test.js
@@ -473,7 +473,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWith(mozLoop.telemetryAddValue,
- "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+ "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.SHORTER_THAN_10S);
});
@@ -485,7 +485,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWith(mozLoop.telemetryAddValue,
- "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+ "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.BETWEEN_10S_AND_30S);
});
@@ -497,7 +497,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWith(mozLoop.telemetryAddValue,
- "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+ "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.BETWEEN_30S_AND_5M);
});
@@ -508,7 +508,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWith(mozLoop.telemetryAddValue,
- "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+ "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.MORE_THAN_5M);
});
@@ -530,7 +530,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
- "LOOP_SHARING_STATE_CHANGE",
+ "LOOP_SHARING_STATE_CHANGE_1",
mozLoop.SHARING_STATE_CHANGE.WINDOW_ENABLED);
});
@@ -539,7 +539,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
- "LOOP_SHARING_STATE_CHANGE",
+ "LOOP_SHARING_STATE_CHANGE_1",
mozLoop.SHARING_STATE_CHANGE.BROWSER_ENABLED);
});
@@ -548,7 +548,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
- "LOOP_SHARING_STATE_CHANGE",
+ "LOOP_SHARING_STATE_CHANGE_1",
mozLoop.SHARING_STATE_CHANGE.WINDOW_DISABLED);
});
@@ -557,7 +557,7 @@ describe("loop.OTSdkDriver", function () {
sinon.assert.calledOnce(mozLoop.telemetryAddValue);
sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
- "LOOP_SHARING_STATE_CHANGE",
+ "LOOP_SHARING_STATE_CHANGE_1",
mozLoop.SHARING_STATE_CHANGE.BROWSER_DISABLED);
});
});
diff --git a/browser/components/loop/test/shared/utils_test.js b/browser/components/loop/test/shared/utils_test.js
index 3412e117582..b40abccd1f1 100644
--- a/browser/components/loop/test/shared/utils_test.js
+++ b/browser/components/loop/test/shared/utils_test.js
@@ -145,6 +145,31 @@ describe("loop.shared.utils", function() {
});
});
+ describe("#formatURL", function() {
+ it("should decode encoded URIs", function() {
+ expect(sharedUtils.formatURL("http://invalid.com/?a=Foo%20Bar"))
+ .eql({
+ location: "http://invalid.com/?a=Foo Bar",
+ hostname: "invalid.com"
+ });
+ });
+
+ it("should change some idn urls to ascii encoded", function() {
+ // Note, this is based on the browser's list of what does/doesn't get
+ // altered for punycode, so if the list changes this could change in the
+ // future.
+ expect(sharedUtils.formatURL("http://\u0261oogle.com/"))
+ .eql({
+ location: "http://xn--oogle-qmc.com/",
+ hostname: "xn--oogle-qmc.com"
+ });
+ });
+
+ it("should return null if it the url is not valid", function() {
+ expect(sharedUtils.formatURL("hinvalid//url")).eql(null);
+ });
+ });
+
describe("#composeCallUrlEmail", function() {
var composeEmail;
diff --git a/browser/components/loop/test/standalone/standaloneRoomViews_test.js b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
index 37019b9a267..5222452387b 100644
--- a/browser/components/loop/test/standalone/standaloneRoomViews_test.js
+++ b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
@@ -13,6 +13,7 @@ describe("loop.standaloneRoomViews", function() {
var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
var ROOM_INFO_FAILURES = loop.shared.utils.ROOM_INFO_FAILURES;
var sharedActions = loop.shared.actions;
+ var sharedUtils = loop.shared.utils;
var sandbox, dispatcher, activeRoomStore, feedbackStore, dispatch;
@@ -96,6 +97,26 @@ describe("loop.standaloneRoomViews", function() {
expect(view.getDOMNode().querySelector(".standalone-context-url")).not.eql(null);
});
+ it("should format the url for display", function() {
+ sandbox.stub(sharedUtils, "formatURL").returns({
+ location: "location",
+ hostname: "hostname"
+ });
+
+ var view = mountTestComponent({
+ roomName: "Mike's room",
+ roomContextUrls: [{
+ description: "Mark's super page",
+ location: "http://invalid.com",
+ thumbnail: "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+ }]
+ });
+
+ expect(view.getDOMNode()
+ .querySelector(".standalone-context-url-description-wrapper > a").textContent)
+ .eql("hostname");
+ });
+
it("should not display context information if no urls are supplied", function() {
var view = mountTestComponent({
roomName: "Mike's room"
diff --git a/browser/components/loop/test/xpcshell/.eslintrc b/browser/components/loop/test/xpcshell/.eslintrc
new file mode 100644
index 00000000000..bd58bc5876d
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/.eslintrc
@@ -0,0 +1,17 @@
+{
+ "ecmaFeatures": {
+ "arrowFunctions": true,
+ "blockBindings": true,
+ "destructuring": true,
+ "generators": true,
+ "restParams": true,
+ "spread": true,
+ "objectLiteralShorthandMethods": true,
+ },
+ "rules": {
+ "generator-star-spacing": [2, "after"],
+ // We should fix the errors and enable this (set to 2)
+ "no-var": 0,
+ "strict": [2, "global"]
+ }
+}
diff --git a/browser/components/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
index 59e90bb29b3..57c55f0777c 100644
--- a/browser/components/loop/test/xpcshell/head.js
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/browser/components/loop/test/xpcshell/test_looppush_initialize.js b/browser/components/loop/test/xpcshell/test_looppush_initialize.js
index 065f4092135..63fd5a80cc7 100644
--- a/browser/components/loop/test/xpcshell/test_looppush_initialize.js
+++ b/browser/components/loop/test/xpcshell/test_looppush_initialize.js
@@ -1,222 +1,223 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-{
- let dummyCallback = () => {};
- let mockWebSocket = new MockWebSocketChannel();
- let pushServerRequestCount = 0;
- add_test(function test_initalize_offline() {
- Services.io.offline = true;
- do_check_false(MozLoopPushHandler.initialize());
- Services.io.offline = false;
- run_next_test();
- });
+"use strict";
- add_test(function test_initalize_missing_chanid() {
- Assert.throws(() => MozLoopPushHandler.register(null, dummyCallback, dummyCallback));
- run_next_test();
- });
+let dummyCallback = () => {};
+let mockWebSocket = new MockWebSocketChannel();
+let pushServerRequestCount = 0;
- add_test(function test_initalize_missing_regcallback() {
- Assert.throws(() => MozLoopPushHandler.register("chan-1", null, dummyCallback));
- run_next_test();
- });
+add_test(function test_initalize_offline() {
+ Services.io.offline = true;
+ do_check_false(MozLoopPushHandler.initialize());
+ Services.io.offline = false;
+ run_next_test();
+});
- add_test(function test_initalize_missing_notifycallback() {
- Assert.throws(() => MozLoopPushHandler.register("chan-1", dummyCallback, null));
- run_next_test();
- });
+add_test(function test_initalize_missing_chanid() {
+ Assert.throws(() => MozLoopPushHandler.register(null, dummyCallback, dummyCallback));
+ run_next_test();
+});
- add_test(function test_initalize_websocket() {
- do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
- MozLoopPushHandler.register(
- "chan-1",
- function(err, url, id) {
- Assert.equal(err, null, "err should be null to indicate success");
- Assert.equal(url, kEndPointUrl, "Should return push server application URL");
- Assert.equal(id, "chan-1", "Should have channel id = chan-1");
- Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
- "Should have the url from preferences");
- Assert.equal(mockWebSocket.origin, kServerPushUrl,
- "Should have the origin url from preferences");
- Assert.equal(mockWebSocket.protocol, "push-notification",
- "Should have the protocol set to push-notifications");
- mockWebSocket.notify(15);
- },
- function(version, id) {
- Assert.equal(version, 15, "Should have version number 15");
- Assert.equal(id, "chan-1", "Should have channel id = chan-1");
- run_next_test();
- });
- });
+add_test(function test_initalize_missing_regcallback() {
+ Assert.throws(() => MozLoopPushHandler.register("chan-1", null, dummyCallback));
+ run_next_test();
+});
- add_test(function test_register_twice_same_channel() {
- MozLoopPushHandler.register(
- "chan-2",
- function(err, url, id) {
- Assert.equal(err, null, "Should return null for success");
- Assert.equal(url, kEndPointUrl, "Should return push server application URL");
- Assert.equal(id, "chan-2", "Should have channel id = chan-2");
- Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
- "Should have the url from preferences");
- Assert.equal(mockWebSocket.origin, kServerPushUrl,
- "Should have the origin url from preferences");
- Assert.equal(mockWebSocket.protocol, "push-notification",
- "Should have the protocol set to push-notifications");
+add_test(function test_initalize_missing_notifycallback() {
+ Assert.throws(() => MozLoopPushHandler.register("chan-1", dummyCallback, null));
+ run_next_test();
+});
- // Register again for the same channel
- MozLoopPushHandler.register(
- "chan-2",
- function(err, url, id) {
- Assert.equal(err, null, "Should return null for success");
- Assert.equal(id, "chan-2", "Should have channel id = chan-2");
- run_next_test();
- },
- dummyCallback
- );
- },
- dummyCallback
- );
- });
-
- // Test that the PushHander will re-connect after the near-end disconnect.
- // The uaID is cleared to force re-registration of all notification channels.
- add_test(function test_reconnect_websocket() {
- MozLoopPushHandler.uaID = undefined;
- mockWebSocket.stop();
- // Previously registered onRegistration callbacks will fire and be checked (see above).
- });
-
- // Test that the PushHander will re-connect after the far-end disconnect.
- // The uaID is cleared to force re-regsitration of all notification channels.
- add_test(function test_reopen_websocket() {
- MozLoopPushHandler.uaID = undefined;
- MozLoopPushHandler.registeredChannels = {}; //Do this to force a new registration callback.
- mockWebSocket.serverClose();
- // Previously registered onRegistration callbacks will fire and be checked (see above).
- });
-
- // Force a re-registration cycle and have the PushServer return a 500.
- // A retry should occur and the registration then complete.
- add_test(function test_retry_registration() {
- MozLoopPushHandler.uaID = undefined;
- mockWebSocket.initRegStatus = 500;
- mockWebSocket.stop();
- });
-
- add_test(function test_reconnect_no_registration() {
- let regCnt = 0;
- MozLoopPushHandler.shutdown();
- MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
- MozLoopPushHandler.register(
- "test-chan",
- function(err, url, id) {
- Assert.equal(++regCnt, 1, "onRegistered should only be called once");
- Assert.equal(err, null, "err should be null to indicate success");
- Assert.equal(url, kEndPointUrl, "Should return push server application URL");
- Assert.equal(id, "test-chan", "Should have channel id = test-chan");
- mockWebSocket.stop();
- setTimeout(run_next_test(), 0);
- },
- dummyCallback
- );
- });
-
- add_test(function test_ping_websocket() {
- let pingReceived = false,
- socketClosed = false;
- mockWebSocket.defaultMsgHandler = (msg) => {
- pingReceived = true;
- // Do not send a ping response.
- }
- mockWebSocket.close = () => {
- socketClosed = true;
- }
-
- MozLoopPushHandler.shutdown();
- MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
- MozLoopPushHandler.register(
- "test-chan",
- function(err, url) {
- Assert.equal(err, null, "err should be null to indicate success");
- waitForCondition(() => pingReceived).then(() => {
- waitForCondition(() => socketClosed).then(() => {
- run_next_test();
- }, () => {
- do_throw("should have closed the websocket");
- });
- }, () => {
- do_throw("should have sent ping");
- });
- },
- dummyCallback
- );
- });
-
- add_test(function test_retry_pushurl() {
- MozLoopPushHandler.shutdown();
- loopServer.registerPathHandler("/push-server-config", (request, response) => {
- // The PushHandler should retry the request for the push-server-config for
- // each of these cases without throwing an error.
- let n = 0;
- switch (++pushServerRequestCount) {
- case ++n:
- // Non-200 response
- response.setStatusLine(null, 500, "Retry");
- response.processAsync();
- response.finish();
- break;
- case ++n:
- // missing parameter
- response.setStatusLine(null, 200, "OK");
- response.write(JSON.stringify({pushServerURI: null}));
- response.processAsync();
- response.finish();
- break;
- case ++n:
- // json parse error
- response.setStatusLine(null, 200, "OK");
- response.processAsync();
- response.finish();
- break;
- case ++n:
- response.setStatusLine(null, 200, "OK");
- response.write(JSON.stringify({pushServerURI: kServerPushUrl}));
- response.processAsync();
- response.finish();
-
- run_next_test();
- break;
- }
+add_test(function test_initalize_websocket() {
+ do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
+ MozLoopPushHandler.register(
+ "chan-1",
+ function(err, url, id) {
+ Assert.equal(err, null, "err should be null to indicate success");
+ Assert.equal(url, kEndPointUrl, "Should return push server application URL");
+ Assert.equal(id, "chan-1", "Should have channel id = chan-1");
+ Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
+ "Should have the url from preferences");
+ Assert.equal(mockWebSocket.origin, kServerPushUrl,
+ "Should have the origin url from preferences");
+ Assert.equal(mockWebSocket.protocol, "push-notification",
+ "Should have the protocol set to push-notifications");
+ mockWebSocket.notify(15);
+ },
+ function(version, id) {
+ Assert.equal(version, 15, "Should have version number 15");
+ Assert.equal(id, "chan-1", "Should have channel id = chan-1");
+ run_next_test();
});
+});
- do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
- });
+add_test(function test_register_twice_same_channel() {
+ MozLoopPushHandler.register(
+ "chan-2",
+ function(err, url, id) {
+ Assert.equal(err, null, "Should return null for success");
+ Assert.equal(url, kEndPointUrl, "Should return push server application URL");
+ Assert.equal(id, "chan-2", "Should have channel id = chan-2");
+ Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
+ "Should have the url from preferences");
+ Assert.equal(mockWebSocket.origin, kServerPushUrl,
+ "Should have the origin url from preferences");
+ Assert.equal(mockWebSocket.protocol, "push-notification",
+ "Should have the protocol set to push-notifications");
- function run_test() {
- setupFakeLoopServer();
+ // Register again for the same channel
+ MozLoopPushHandler.register(
+ "chan-2",
+ function(err, url, id) {
+ Assert.equal(err, null, "Should return null for success");
+ Assert.equal(id, "chan-2", "Should have channel id = chan-2");
+ run_next_test();
+ },
+ dummyCallback
+ );
+ },
+ dummyCallback
+ );
+});
- loopServer.registerPathHandler("/push-server-config", (request, response) => {
+// Test that the PushHander will re-connect after the near-end disconnect.
+// The uaID is cleared to force re-registration of all notification channels.
+add_test(function test_reconnect_websocket() {
+ MozLoopPushHandler.uaID = undefined;
+ mockWebSocket.stop();
+ // Previously registered onRegistration callbacks will fire and be checked (see above).
+});
+
+// Test that the PushHander will re-connect after the far-end disconnect.
+// The uaID is cleared to force re-regsitration of all notification channels.
+add_test(function test_reopen_websocket() {
+ MozLoopPushHandler.uaID = undefined;
+ MozLoopPushHandler.registeredChannels = {}; //Do this to force a new registration callback.
+ mockWebSocket.serverClose();
+ // Previously registered onRegistration callbacks will fire and be checked (see above).
+});
+
+// Force a re-registration cycle and have the PushServer return a 500.
+// A retry should occur and the registration then complete.
+add_test(function test_retry_registration() {
+ MozLoopPushHandler.uaID = undefined;
+ mockWebSocket.initRegStatus = 500;
+ mockWebSocket.stop();
+});
+
+add_test(function test_reconnect_no_registration() {
+ let regCnt = 0;
+ MozLoopPushHandler.shutdown();
+ MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
+ MozLoopPushHandler.register(
+ "test-chan",
+ function(err, url, id) {
+ Assert.equal(++regCnt, 1, "onRegistered should only be called once");
+ Assert.equal(err, null, "err should be null to indicate success");
+ Assert.equal(url, kEndPointUrl, "Should return push server application URL");
+ Assert.equal(id, "test-chan", "Should have channel id = test-chan");
+ mockWebSocket.stop();
+ setTimeout(run_next_test(), 0);
+ },
+ dummyCallback
+ );
+});
+
+add_test(function test_ping_websocket() {
+ let pingReceived = false,
+ socketClosed = false;
+ mockWebSocket.defaultMsgHandler = (msg) => {
+ pingReceived = true;
+ // Do not send a ping response.
+ }
+ mockWebSocket.close = () => {
+ socketClosed = true;
+ }
+
+ MozLoopPushHandler.shutdown();
+ MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
+ MozLoopPushHandler.register(
+ "test-chan",
+ function(err, url) {
+ Assert.equal(err, null, "err should be null to indicate success");
+ waitForCondition(() => pingReceived).then(() => {
+ waitForCondition(() => socketClosed).then(() => {
+ run_next_test();
+ }, () => {
+ do_throw("should have closed the websocket");
+ });
+ }, () => {
+ do_throw("should have sent ping");
+ });
+ },
+ dummyCallback
+ );
+});
+
+add_test(function test_retry_pushurl() {
+ MozLoopPushHandler.shutdown();
+ loopServer.registerPathHandler("/push-server-config", (request, response) => {
+ // The PushHandler should retry the request for the push-server-config for
+ // each of these cases without throwing an error.
+ let n = 0;
+ switch (++pushServerRequestCount) {
+ case ++n:
+ // Non-200 response
+ response.setStatusLine(null, 500, "Retry");
+ response.processAsync();
+ response.finish();
+ break;
+ case ++n:
+ // missing parameter
+ response.setStatusLine(null, 200, "OK");
+ response.write(JSON.stringify({pushServerURI: null}));
+ response.processAsync();
+ response.finish();
+ break;
+ case ++n:
+ // json parse error
+ response.setStatusLine(null, 200, "OK");
+ response.processAsync();
+ response.finish();
+ break;
+ case ++n:
response.setStatusLine(null, 200, "OK");
response.write(JSON.stringify({pushServerURI: kServerPushUrl}));
response.processAsync();
response.finish();
- });
- Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
- Services.prefs.setIntPref("loop.retry_delay.start", 10); // 10 ms
- Services.prefs.setIntPref("loop.retry_delay.limit", 20); // 20 ms
- Services.prefs.setIntPref("loop.ping.interval", 50); // 50 ms
- Services.prefs.setIntPref("loop.ping.timeout", 20); // 20 ms
+ run_next_test();
+ break;
+ }
+ });
- do_register_cleanup(function() {
- Services.prefs.clearUserPref("services.push.serverULR");
- Services.prefs.clearUserPref("loop.retry_delay.start");
- Services.prefs.clearUserPref("loop.retry_delay.limit");
- Services.prefs.clearUserPref("loop.ping.interval");
- Services.prefs.clearUserPref("loop.ping.timeout");
- });
+ do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
+});
- run_next_test();
- };
-}
+function run_test() {
+ setupFakeLoopServer();
+
+ loopServer.registerPathHandler("/push-server-config", (request, response) => {
+ response.setStatusLine(null, 200, "OK");
+ response.write(JSON.stringify({pushServerURI: kServerPushUrl}));
+ response.processAsync();
+ response.finish();
+ });
+
+ Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
+ Services.prefs.setIntPref("loop.retry_delay.start", 10); // 10 ms
+ Services.prefs.setIntPref("loop.retry_delay.limit", 20); // 20 ms
+ Services.prefs.setIntPref("loop.ping.interval", 50); // 50 ms
+ Services.prefs.setIntPref("loop.ping.timeout", 20); // 20 ms
+
+ do_register_cleanup(function() {
+ Services.prefs.clearUserPref("services.push.serverULR");
+ Services.prefs.clearUserPref("loop.retry_delay.start");
+ Services.prefs.clearUserPref("loop.retry_delay.limit");
+ Services.prefs.clearUserPref("loop.ping.interval");
+ Services.prefs.clearUserPref("loop.ping.timeout");
+ });
+
+ run_next_test();
+};
diff --git a/browser/components/loop/test/xpcshell/test_looprooms.js b/browser/components/loop/test/xpcshell/test_looprooms.js
index 5ab2d6c69a9..8d8fe383a91 100644
--- a/browser/components/loop/test/xpcshell/test_looprooms.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms.js
@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
Cu.import("resource://services-common/utils.js");
Cu.import("resource:///modules/loop/LoopRooms.jsm");
Cu.import("resource:///modules/Chat.jsm");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_busy.js b/browser/components/loop/test/xpcshell/test_loopservice_busy.js
index 7766081eacf..835b98b2338 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_busy.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_busy.js
@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
const { LoopCallsInternal } = Cu.import("resource:///modules/loop/LoopCalls.jsm", {});
XPCOMUtils.defineLazyModuleGetter(this, "Chat",
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_directcall.js b/browser/components/loop/test/xpcshell/test_loopservice_directcall.js
index e94a2ace591..e2e33cced50 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_directcall.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_directcall.js
@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
XPCOMUtils.defineLazyModuleGetter(this, "Chat",
"resource:///modules/Chat.jsm");
let openChatOrig = Chat.open;
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
index 93bca0ffc0c..44c79740fb4 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
XPCOMUtils.defineLazyModuleGetter(this, "Chat",
"resource:///modules/Chat.jsm");
let openChatOrig = Chat.open;
@@ -41,7 +43,7 @@ add_test(function test_do_not_disturb_disabled_should_open_chat_window() {
mockPushHandler.notify(1, MozLoopService.channelIDs.callsFxA);
- waitForCondition(function() opened).then(() => {
+ waitForCondition(() => opened).then(() => {
run_next_test();
}, () => {
do_throw("should have opened a chat window");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js b/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
index 775b3cf4755..20edf68c5b8 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
@@ -2,6 +2,8 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
/* global Services, Assert */
+"use strict";
+
const kGuestKeyPref = "loop.key";
const kFxAKeyPref = "loop.key.fxa";
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
index e82244af97e..37a6fd5d688 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
@@ -1,13 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
let startTimerCalled = false;
/**
* Tests that registration doesn't happen when the expiry time is
* not set.
*/
-add_task(function test_initialize_no_expiry() {
+add_task(function* test_initialize_no_expiry() {
startTimerCalled = false;
let initializedPromise = yield MozLoopService.initialize();
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_locales.js b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
index b23da701904..f3ca1daea67 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_locales.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
function test_locale() {
// Set the pref to something controlled.
Services.prefs.setCharPref("general.useragent.locale", "ab-CD");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js b/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
index 380739e8e0d..4e71dfd5b7c 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
@@ -2,6 +2,8 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
/*global XPCOMUtils, Services, Assert */
+"use strict";
+
var fakeCharPrefName = "color";
var fakeBoolPrefName = "boolean";
var fakePrefValue = "green";
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_notification.js b/browser/components/loop/test/xpcshell/test_loopservice_notification.js
index 81b9fd6146a..2e64b652247 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_notification.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_notification.js
@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
XPCOMUtils.defineLazyModuleGetter(this, "Chat",
"resource:///modules/Chat.jsm");
@@ -20,7 +22,7 @@ add_test(function test_openChatWindow_on_notification() {
mockPushHandler.notify(1, MozLoopService.channelIDs.callsFxA);
- waitForCondition(function() opened).then(() => {
+ waitForCondition(() => opened).then(() => {
do_check_true(opened, "should open a chat window");
do_check_eq(Services.prefs.getCharPref("loop.seenToS"), "seen",
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
index ddc68148730..ae3d4b68b73 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
Cu.import("resource://services-common/utils.js");
/**
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js b/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
index c568428dd3b..fb3a18d8adc 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
Cu.import("resource://gre/modules/Task.jsm");
Cu.import("resource://services-common/utils.js");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_restart.js b/browser/components/loop/test/xpcshell/test_loopservice_restart.js
index cc0b16c8d35..b93ed02c8fc 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_restart.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_restart.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
const FAKE_FXA_TOKEN_DATA = JSON.stringify({
"token_type": "bearer",
"access_token": "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1752",
@@ -20,7 +22,7 @@ const LOOP_INITIAL_DELAY_PREF = "loop.initialDelay";
* This file is to test restart+reauth.
*/
-add_task(function test_initialize_with_no_guest_rooms_and_no_auth_token() {
+add_task(function* test_initialize_with_no_guest_rooms_and_no_auth_token() {
// Set time to be 2 seconds in the past.
var nowSeconds = Date.now() / 1000;
Services.prefs.setBoolPref(LOOP_CREATED_ROOM_PREF, false);
@@ -34,7 +36,7 @@ add_task(function test_initialize_with_no_guest_rooms_and_no_auth_token() {
});
});
-add_task(function test_initialize_with_created_room_and_no_auth_token() {
+add_task(function* test_initialize_with_created_room_and_no_auth_token() {
Services.prefs.setBoolPref(LOOP_CREATED_ROOM_PREF, true);
Services.prefs.clearUserPref(LOOP_FXA_TOKEN_PREF);
@@ -50,7 +52,7 @@ add_task(function test_initialize_with_created_room_and_no_auth_token() {
});
});
-add_task(function test_initialize_with_invalid_fxa_token() {
+add_task(function* test_initialize_with_invalid_fxa_token() {
Services.prefs.setCharPref(LOOP_FXA_PROFILE_PREF, FAKE_FXA_PROFILE);
Services.prefs.setCharPref(LOOP_FXA_TOKEN_PREF, FAKE_FXA_TOKEN_DATA);
@@ -83,7 +85,7 @@ add_task(function test_initialize_with_invalid_fxa_token() {
});
});
-add_task(function test_initialize_with_fxa_token() {
+add_task(function* test_initialize_with_fxa_token() {
Services.prefs.setCharPref(LOOP_FXA_PROFILE_PREF, FAKE_FXA_PROFILE);
Services.prefs.setCharPref(LOOP_FXA_TOKEN_PREF, FAKE_FXA_TOKEN_DATA);
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js b/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
index d78fc3b24ae..5346557de37 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
const LOOP_HAWK_PREF = "loop.hawk-session-token";
const fakeSessionToken1 = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1751";
const fakeSessionToken2 = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750";
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_save.js b/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
index f4ba80c4d4b..7ea74ae04ec 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
/**
* Test that things behave reasonably when a reasonable Hawk-Session-Token
* header is returned with the registration response.
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_send.js b/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
index 3c7d5497414..b3727064b95 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
add_test(function test_registration_uses_hawk_session_token() {
Services.prefs.setCharPref("loop.hawk-session-token",
"1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
index 59f193e5a44..7374c85ffb7 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
@@ -1,6 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
// XXX should report error if Hawk-Session-Token is lexically invalid
// (not a string of 64 hex digits) to help resist other possible injection
// attacks. For now, however, we're just checking if it's the right length.
diff --git a/browser/components/places/content/editBookmarkOverlay.js b/browser/components/places/content/editBookmarkOverlay.js
index fbc31241c22..0dc8a69083a 100644
--- a/browser/components/places/content/editBookmarkOverlay.js
+++ b/browser/components/places/content/editBookmarkOverlay.js
@@ -1004,12 +1004,14 @@ let gEditItemOverlay = {
aLastModified, aItemType) {
if (aProperty == "tags" && this._paneInfo.visibleRows.has("tagsRow"))
this._onTagsChange(aItemId);
- else if (this._paneInfo.isItem && aProperty == "title")
- this._onItemTitleChange(aItemId, aValue);
- else (!this._paneInfo.isItem || this._paneInfo.itemId != aItemId)
+ else if (!this._paneInfo.isItem || this._paneInfo.itemId != aItemId)
return;
switch (aProperty) {
+ case "title":
+ if (this._paneInfo.isItem)
+ this._onItemTitleChange(aItemId, aValue);
+ break;
case "uri":
let newURI = NetUtil.newURI(aValue);
if (!newURI.equals(this._paneInfo.uri)) {
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 3ffc81a74c2..e5807605064 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -1468,6 +1468,12 @@ this.UITour = {
showInfoPanel.bind(this, this._correctAnchor(aAnchor.node)));
},
+ isInfoOnTarget(aChromeWindow, aTargetName) {
+ let document = aChromeWindow.document;
+ let tooltip = document.getElementById("UITourTooltip");
+ return tooltip.getAttribute("targetName") == aTargetName && tooltip.state != "closed";
+ },
+
hideInfo: function(aWindow) {
let document = aWindow.document;
diff --git a/browser/devtools/performance/modules/graphs.js b/browser/devtools/performance/modules/graphs.js
index fa23b22c206..a71b2f13f59 100644
--- a/browser/devtools/performance/modules/graphs.js
+++ b/browser/devtools/performance/modules/graphs.js
@@ -26,6 +26,9 @@ loader.lazyRequireGetter(this, "MarkersOverview",
loader.lazyRequireGetter(this, "EventEmitter",
"devtools/toolkit/event-emitter");
+// TODO get rid of retro mode in bug 1160313
+loader.lazyRequireGetter(this, "Services");
+
/**
* For line graphs
*/
@@ -165,6 +168,24 @@ const GRAPH_DEFINITIONS = {
}
};
+// TODO get rid of retro mode in bug 1160313
+const GRAPH_DEFINITIONS_RETRO = {
+ memory: {
+ constructor: MemoryGraph,
+ selector: "#memory-overview",
+ },
+ framerate: {
+ constructor: FramerateGraph,
+ selector: "#time-framerate",
+ needsBlueprints: true,
+ primaryLink: true
+ },
+ timeline: {
+ constructor: TimelineGraph,
+ selector: "#markers-overview",
+ }
+};
+
/**
* A controller for orchestrating the performance's tool overview graphs. Constructs,
* syncs, toggles displays and defines the memory, framerate and timeline view.
@@ -177,7 +198,9 @@ const GRAPH_DEFINITIONS = {
function GraphsController ({ definition, root, getBlueprint, getTheme }) {
this._graphs = {};
this._enabled = new Set();
- this._definition = definition || GRAPH_DEFINITIONS;
+ // TODO get rid of retro mode in bug 1160313
+ let RETRO_MODE = Services.prefs.getBoolPref("devtools.performance.ui.retro-mode");
+ this._definition = definition || (RETRO_MODE ? GRAPH_DEFINITIONS_RETRO : GRAPH_DEFINITIONS);
this._root = root;
this._getBlueprint = getBlueprint;
this._getTheme = getTheme;
diff --git a/browser/devtools/performance/performance-controller.js b/browser/devtools/performance/performance-controller.js
index b3a6629e661..3a5e8864e57 100644
--- a/browser/devtools/performance/performance-controller.js
+++ b/browser/devtools/performance/performance-controller.js
@@ -284,11 +284,16 @@ let PerformanceController = {
* when the front has started to record.
*/
startRecording: Task.async(function *() {
+ // Store retro-mode here so we can easily list true/false
+ // values for reverting.
+ // TODO bug 1160313
+ let superMode = !this.getOption("retro-mode");
+
let options = {
- withMarkers: true,
- withMemory: this.getOption("enable-memory"),
+ withMarkers: superMode ? true : false,
+ withMemory: superMode ? this.getOption("enable-memory") : false,
withTicks: this.getOption("enable-framerate"),
- withAllocations: this.getOption("enable-memory"),
+ withAllocations: superMode ? this.getOption("enable-memory") : false,
allocationsSampleProbability: this.getPref("memory-sample-probability"),
allocationsMaxLogLength: this.getPref("memory-max-log-length"),
bufferSize: this.getPref("profiler-buffer-size"),
diff --git a/browser/devtools/performance/test/browser.ini b/browser/devtools/performance/test/browser.ini
index e090b38a27e..b9b27f2c0fc 100644
--- a/browser/devtools/performance/test/browser.ini
+++ b/browser/devtools/performance/test/browser.ini
@@ -122,5 +122,10 @@ support-files =
[browser_profiler_tree-view-06.js]
[browser_profiler_tree-view-07.js]
[browser_profiler_tree-view-08.js]
-[browser_timeline_blueprint.js]
-[browser_timeline_filters.js]
+[browser_timeline-blueprint.js]
+[browser_timeline-filters.js]
+[browser_timeline-waterfall-background.js]
+[browser_timeline-waterfall-generic.js]
+[browser_timeline-waterfall-sidebar.js]
+# remove in bug 1160313
+[browser_retro-test.js]
diff --git a/browser/devtools/performance/test/browser_retro-test.js b/browser/devtools/performance/test/browser_retro-test.js
new file mode 100644
index 00000000000..ad8265eca4f
--- /dev/null
+++ b/browser/devtools/performance/test/browser_retro-test.js
@@ -0,0 +1,49 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that only js-calltree view is on, default, and many things are hidden
+ * when in retro mode.
+ */
+const HIDDEN_OPTIONS = ["option-enable-memory", "option-invert-flame-graph", "option-show-jit-optimizations", "option-flatten-tree-recursion"];
+
+Services.prefs.setBoolPref("devtools.performance.ui.retro-mode", true);
+
+function spawnTest () {
+ let { panel } = yield initPerformance(SIMPLE_URL);
+ let { EVENTS, DetailsView, PerformanceController, $, $$, JsCallTreeView } = panel.panelWin;
+
+ yield startRecording(panel);
+ yield stopRecording(panel);
+
+ let model = PerformanceController.getCurrentRecording();
+
+ ok(model.getMemory().length === 0, "model did not record memory.");
+ ok(model.getTicks().length !== 0, "model did get ticks.");
+ ok(model.getAllocations().sites.length === 0, "model did get allocation data.");
+ ok(model.getAllocations().timestamps.length === 0, "model did get allocation data.");
+ ok(model.getAllocations().frames.length === 0, "model did get allocation data.");
+ ok(model.getAllocations().counts.length === 0, "model did get allocation data.");
+
+ ok(DetailsView.isViewSelected(JsCallTreeView),
+ "The jscalltree view is selected by default");
+
+ for (let option of $$("#performance-options-menupopup > menuitem")) {
+ if (HIDDEN_OPTIONS.indexOf(option.id) !== -1) {
+ ok(option.hidden === true, `${option.id} should be hidden.`);
+ } else {
+ ok(option.hidden === false, `${option.id} should be visible.`);
+ }
+ }
+
+ for (let viewbutton of $$("#performance-toolbar-controls-detail-views > toolbarbutton")) {
+ ok (viewbutton.hidden === true, `${viewbutton.id} should be hidden.`);
+ }
+
+ ok($("#markers-overview").hidden, "markers overview should be hidden.");
+ ok($("#memory-overview").hidden, "memory overview should be hidden.");
+ ok(!$("#time-framerate").hidden, "framerate should be shown.");
+
+ yield teardown(panel);
+ finish();
+}
diff --git a/browser/devtools/performance/test/browser_timeline_blueprint.js b/browser/devtools/performance/test/browser_timeline-blueprint.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline_blueprint.js
rename to browser/devtools/performance/test/browser_timeline-blueprint.js
diff --git a/browser/devtools/performance/test/browser_timeline_filters.js b/browser/devtools/performance/test/browser_timeline-filters.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline_filters.js
rename to browser/devtools/performance/test/browser_timeline-filters.js
diff --git a/browser/devtools/performance/test/browser_timeline-waterfall-background.js b/browser/devtools/performance/test/browser_timeline-waterfall-background.js
new file mode 100644
index 00000000000..f0f29b2c686
--- /dev/null
+++ b/browser/devtools/performance/test/browser_timeline-waterfall-background.js
@@ -0,0 +1,53 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests if the waterfall background is a 1px high canvas stretching across
+ * the container bounds.
+ */
+
+function spawnTest () {
+ let { target, panel } = yield initPerformance(SIMPLE_URL);
+ let { $, EVENTS, PerformanceController, OverviewView, DetailsView, WaterfallView } = panel.panelWin;
+
+ yield startRecording(panel);
+ ok(true, "Recording has started.");
+
+ let updated = 0;
+ OverviewView.on(EVENTS.OVERVIEW_RENDERED, () => updated++);
+
+ ok((yield waitUntil(() => updated > 0)),
+ "The overview graphs were updated a bunch of times.");
+ ok((yield waitUntil(() => PerformanceController.getCurrentRecording().getMarkers().length > 0)),
+ "There are some markers available.");
+
+ let rendered = Promise.all([
+ DetailsView.selectView("waterfall"),
+ once(WaterfallView, EVENTS.WATERFALL_RENDERED)
+ ]);
+ yield stopRecording(panel);
+ ok(true, "Recording has ended.");
+ yield rendered;
+
+ // Test the waterfall background.
+
+ let parentWidth = $("#waterfall-view").getBoundingClientRect().width;
+ let sidebarWidth = $(".waterfall-sidebar").getBoundingClientRect().width;
+ let detailsWidth = $("#waterfall-details").getBoundingClientRect().width;
+ let waterfallWidth = WaterfallView.waterfall._waterfallWidth;
+ is(waterfallWidth, parentWidth - sidebarWidth - detailsWidth,
+ "The waterfall width is correct.")
+
+ ok(WaterfallView.waterfall._canvas,
+ "A canvas should be created after the recording ended.");
+ ok(WaterfallView.waterfall._ctx,
+ "A 2d context should be created after the recording ended.");
+
+ is(WaterfallView.waterfall._canvas.width, waterfallWidth,
+ "The canvas width is correct.");
+ is(WaterfallView.waterfall._canvas.height, 1,
+ "The canvas height is correct.");
+
+ yield teardown(panel);
+ finish();
+}
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-generic.js b/browser/devtools/performance/test/browser_timeline-waterfall-generic.js
similarity index 82%
rename from browser/devtools/timeline/test/browser_timeline_waterfall-generic.js
rename to browser/devtools/performance/test/browser_timeline-waterfall-generic.js
index ceff2bd1f42..c279be915e0 100644
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-generic.js
+++ b/browser/devtools/performance/test/browser_timeline-waterfall-generic.js
@@ -5,22 +5,22 @@
* Tests if the waterfall is properly built after finishing a recording.
*/
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, $$, EVENTS, TimelineController } = panel.panelWin;
+function spawnTest () {
+ let { target, panel } = yield initPerformance(SIMPLE_URL);
+ let { $, $$, EVENTS, PerformanceController, OverviewView, WaterfallView } = panel.panelWin;
- yield TimelineController.toggleRecording();
+ yield startRecording(panel);
ok(true, "Recording has started.");
let updated = 0;
- panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
+ OverviewView.on(EVENTS.OVERVIEW_RENDERED, () => updated++);
ok((yield waitUntil(() => updated > 0)),
"The overview graphs were updated a bunch of times.");
- ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
+ ok((yield waitUntil(() => PerformanceController.getCurrentRecording().getMarkers().length > 0)),
"There are some markers available.");
- yield TimelineController.toggleRecording();
+ yield stopRecording(panel);
ok(true, "Recording has ended.");
// Test the header container.
@@ -62,4 +62,6 @@ add_task(function*() {
"Some marker waterfall nodes should have been created.");
ok($$(".waterfall-marker-item:not(spacer) > .waterfall-marker-bar").length,
"Some marker color bars should have been created inside the waterfall.");
-});
+ yield teardown(panel);
+ finish();
+}
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js b/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
similarity index 67%
rename from browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js
rename to browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
index 0c556498291..ee608b17953 100644
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js
+++ b/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
@@ -5,35 +5,34 @@
* Tests if the sidebar is properly updated when a marker is selected.
*/
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, $$, EVENTS, TimelineController, TimelineView, TIMELINE_BLUEPRINT} = panel.panelWin;
- let { L10N } = devtools.require("devtools/shared/timeline/global");
+function spawnTest () {
+ let { target, panel } = yield initPerformance(SIMPLE_URL);
+ let { $, $$, EVENTS, PerformanceController, OverviewView } = panel.panelWin;
+ let { L10N, TIMELINE_BLUEPRINT } = devtools.require("devtools/shared/timeline/global");
- yield TimelineController.toggleRecording();
+ yield startRecording(panel);
ok(true, "Recording has started.");
yield waitUntil(() => {
// Wait until we get 3 different markers.
- let markers = TimelineController.getMarkers();
+ let markers = PerformanceController.getCurrentRecording().getMarkers();
return markers.some(m => m.name == "Styles") &&
markers.some(m => m.name == "Reflow") &&
markers.some(m => m.name == "Paint");
});
- yield TimelineController.toggleRecording();
+ yield stopRecording(panel);
ok(true, "Recording has ended.");
// Select everything
- TimelineView.markersOverview.setSelection({ start: 0, end: TimelineView.markersOverview.width })
-
+ OverviewView.graphs.get("timeline").setSelection({ start: 0, end: OverviewView.graphs.get("timeline").width })
let bars = $$(".waterfall-marker-item:not(spacer) > .waterfall-marker-bar");
- let markers = TimelineController.getMarkers();
+ let markers = PerformanceController.getCurrentRecording().getMarkers();
ok(bars.length > 2, "got at least 3 markers");
- let sidebar = $("#timeline-waterfall-details");
+ let sidebar = $("#waterfall-details");
for (let i = 0; i < bars.length; i++) {
let bar = bars[i];
bar.click();
@@ -41,7 +40,7 @@ add_task(function*() {
let name = TIMELINE_BLUEPRINT[m.name].label;
- is($("#timeline-waterfall-details .marker-details-type").getAttribute("value"), name,
+ is($("#waterfall-details .marker-details-type").getAttribute("value"), name,
"sidebar title matches markers name");
let printedStartTime = $(".marker-details-start .marker-details-labelvalue").getAttribute("value");
@@ -55,4 +54,6 @@ add_task(function*() {
is(toMs(m.end), printedEndTime, "sidebar end time is valid");
is(toMs(m.end - m.start), printedDuration, "sidebar duration is valid");
}
-});
+ yield teardown(panel);
+ finish();
+}
diff --git a/browser/devtools/performance/test/head.js b/browser/devtools/performance/test/head.js
index b255c6a6238..871d2b126b8 100644
--- a/browser/devtools/performance/test/head.js
+++ b/browser/devtools/performance/test/head.js
@@ -56,6 +56,7 @@ let DEFAULT_PREFS = [
"devtools.performance.memory.max-log-length",
"devtools.performance.profiler.buffer-size",
"devtools.performance.profiler.sample-frequency-khz",
+ "devtools.performance.ui.retro-mode",
].reduce((prefs, pref) => {
prefs[pref] = Preferences.get(pref);
return prefs;
@@ -67,6 +68,10 @@ Services.prefs.setBoolPref("devtools.performance.enabled", true);
// be affected by this pref.
Services.prefs.setBoolPref("devtools.debugger.log", false);
+// Disable retro mode.
+// TODO bug 1160313
+Services.prefs.setBoolPref("devtools.performance.ui.retro-mode", false);
+
/**
* Call manually in tests that use frame script utils after initializing
* the tool. Must be called after initializing so we can detect
diff --git a/browser/devtools/performance/views/details-abstract-subview.js b/browser/devtools/performance/views/details-abstract-subview.js
index c9aeb5609e0..5309eade24b 100644
--- a/browser/devtools/performance/views/details-abstract-subview.js
+++ b/browser/devtools/performance/views/details-abstract-subview.js
@@ -71,6 +71,12 @@ let DetailsSubview = {
*/
observedPrefs: [],
+ /**
+ * Flag specifying if this view should update while the overview selection
+ * area is actively being dragged by the mouse.
+ */
+ shouldUpdateWhileMouseIsActive: false,
+
/**
* Called when recording stops or is selected.
*/
@@ -90,7 +96,14 @@ let DetailsSubview = {
*/
_onOverviewRangeChange: function (_, interval) {
if (DetailsView.isViewSelected(this)) {
- let debounced = () => this.render(interval);
+ let debounced = () => {
+ if (!this.shouldUpdateWhileMouseIsActive && OverviewView.isMouseActive) {
+ // Don't render yet, while the selection is still being dragged.
+ setNamedTimeout("range-change-debounce", this.rangeChangeDebounceTime, debounced);
+ } else {
+ this.render(interval);
+ }
+ };
setNamedTimeout("range-change-debounce", this.rangeChangeDebounceTime, debounced);
} else {
this.shouldUpdateWhenShown = true;
diff --git a/browser/devtools/performance/views/details-js-call-tree.js b/browser/devtools/performance/views/details-js-call-tree.js
index fdef5e63be2..dad25b55d47 100644
--- a/browser/devtools/performance/views/details-js-call-tree.js
+++ b/browser/devtools/performance/views/details-js-call-tree.js
@@ -13,7 +13,7 @@ let JsCallTreeView = Heritage.extend(DetailsSubview, {
"show-platform-data"
],
- rangeChangeDebounceTime: 50, // ms
+ rangeChangeDebounceTime: 75, // ms
/**
* Sets up the view with event binding.
diff --git a/browser/devtools/performance/views/details-js-flamegraph.js b/browser/devtools/performance/views/details-js-flamegraph.js
index 8c1a7dca408..46efe2d72d2 100644
--- a/browser/devtools/performance/views/details-js-flamegraph.js
+++ b/browser/devtools/performance/views/details-js-flamegraph.js
@@ -9,6 +9,8 @@
*/
let JsFlameGraphView = Heritage.extend(DetailsSubview, {
+ shouldUpdateWhileMouseIsActive: true,
+
rerenderPrefs: [
"invert-flame-graph",
"flatten-tree-recursion",
diff --git a/browser/devtools/performance/views/details-memory-flamegraph.js b/browser/devtools/performance/views/details-memory-flamegraph.js
index 66190126463..9cc7ecd7a21 100644
--- a/browser/devtools/performance/views/details-memory-flamegraph.js
+++ b/browser/devtools/performance/views/details-memory-flamegraph.js
@@ -9,6 +9,8 @@
*/
let MemoryFlameGraphView = Heritage.extend(DetailsSubview, {
+ shouldUpdateWhileMouseIsActive: true,
+
rerenderPrefs: [
"invert-flame-graph",
"flatten-tree-recursion",
diff --git a/browser/devtools/performance/views/details-waterfall.js b/browser/devtools/performance/views/details-waterfall.js
index 21261315f09..07a3163439b 100644
--- a/browser/devtools/performance/views/details-waterfall.js
+++ b/browser/devtools/performance/views/details-waterfall.js
@@ -16,7 +16,7 @@ let WaterfallView = Heritage.extend(DetailsSubview, {
"hidden-markers"
],
- rangeChangeDebounceTime: 10, // ms
+ rangeChangeDebounceTime: 75, // ms
/**
* Sets up the view with event binding.
@@ -74,6 +74,11 @@ let WaterfallView = Heritage.extend(DetailsSubview, {
*/
_onMarkerSelected: function (event, marker) {
let recording = PerformanceController.getCurrentRecording();
+ // Race condition in tests due to lazy rendering of markers in the
+ // waterfall? intermittent bug 1157523
+ if (!recording) {
+ return;
+ }
let frames = recording.getFrames();
if (event === "selected") {
diff --git a/browser/devtools/performance/views/details.js b/browser/devtools/performance/views/details.js
index 0ce182594a5..35c13534031 100644
--- a/browser/devtools/performance/views/details.js
+++ b/browser/devtools/performance/views/details.js
@@ -94,9 +94,12 @@ let DetailsView = {
let invalidCurrentView = false;
for (let [name, { view }] of Iterator(this.components)) {
- let isSupported = this._isViewSupported(name, false);
+ // TODO bug 1160313 get rid of retro mode checks.
+ let isRetro = PerformanceController.getOption("retro-mode");
+ let isSupported = isRetro ? name === "js-calltree" : this._isViewSupported(name, false);
- $(`toolbarbutton[data-view=${name}]`).hidden = !isSupported;
+ // TODO bug 1160313 hide all view buttons, but let js-calltree still be "supported"
+ $(`toolbarbutton[data-view=${name}]`).hidden = isRetro ? true : !isSupported;
// If the view is currently selected and not supported, go back to the
// default view.
diff --git a/browser/devtools/performance/views/overview.js b/browser/devtools/performance/views/overview.js
index 2425d9cede2..31d236b3ffb 100644
--- a/browser/devtools/performance/views/overview.js
+++ b/browser/devtools/performance/views/overview.js
@@ -92,6 +92,16 @@ let OverviewView = {
yield this.graphs.destroy();
}),
+ /**
+ * Returns true if any of the overview graphs have mouse dragging active,
+ * false otherwise.
+ */
+ get isMouseActive() {
+ return (this.markersOverview && this.markersOverview.isMouseActive) ||
+ (this.memoryOverview && this.memoryOverview.isMouseActive) ||
+ (this.framerateGraph && this.framerateGraph.isMouseActive);
+ },
+
/**
* Disabled in the event we're using a Timeline mock, so we'll have no
* timeline, ticks or memory data to show, so just block rendering and hide
diff --git a/browser/devtools/performance/views/toolbar.js b/browser/devtools/performance/views/toolbar.js
index 4df132297bb..05770b89d5d 100644
--- a/browser/devtools/performance/views/toolbar.js
+++ b/browser/devtools/performance/views/toolbar.js
@@ -21,6 +21,19 @@ let ToolbarView = {
menupopup: $("#performance-options-menupopup")
});
+ // TODO bug 1160313 get rid of retro mode checks
+ // hide option buttons here, and any other buttons in the toolbar
+ // (details.js takes care of view buttons)
+ if (PerformanceController.getOption("retro-mode")) {
+ let RETRO_ELEMENTS = [
+ "#option-flatten-tree-recursion", "#option-enable-memory", "#option-invert-flame-graph",
+ "#option-show-jit-optimizations", "#filter-button"
+ ];
+ for (let selector of RETRO_ELEMENTS) {
+ $(selector).hidden = true;
+ }
+ }
+
yield this.optionsView.initialize();
this.optionsView.on("pref-changed", this._onPrefChanged);
diff --git a/browser/devtools/shared/widgets/Graphs.jsm b/browser/devtools/shared/widgets/Graphs.jsm
index 043783cf322..67d815d8094 100644
--- a/browser/devtools/shared/widgets/Graphs.jsm
+++ b/browser/devtools/shared/widgets/Graphs.jsm
@@ -220,6 +220,14 @@ AbstractCanvasGraph.prototype = {
return this._height;
},
+ /**
+ * Return true if the mouse is actively messing with the selection, false
+ * otherwise.
+ */
+ get isMouseActive() {
+ return this._isMouseActive;
+ },
+
/**
* Returns a promise resolved once this graph is ready to receive data.
*/
diff --git a/browser/devtools/timeline/test/browser.ini b/browser/devtools/timeline/test/browser.ini
deleted file mode 100644
index 58197c04db7..00000000000
--- a/browser/devtools/timeline/test/browser.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[DEFAULT]
-tags = devtools
-subsuite = devtools
-support-files =
- doc_simple-test.html
- head.js
-
-[browser_timeline_aaa_run_first_leaktest.js]
-[browser_timeline_overview-initial-selection-01.js]
-[browser_timeline_overview-initial-selection-02.js]
-[browser_timeline_overview-update.js]
-[browser_timeline_overview-theme.js]
-[browser_timeline_panels.js]
-[browser_timeline_recording-without-memory.js]
-[browser_timeline_recording.js]
-[browser_timeline_waterfall-background.js]
-[browser_timeline_waterfall-generic.js]
-[browser_timeline_waterfall-styles.js]
-[browser_timeline_waterfall-sidebar.js]
diff --git a/browser/devtools/timeline/test/browser_timeline_aaa_run_first_leaktest.js b/browser/devtools/timeline/test/browser_timeline_aaa_run_first_leaktest.js
deleted file mode 100644
index 33ecca92027..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_aaa_run_first_leaktest.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline leaks on initialization and sudden destruction.
- * You can also use this initialization format as a template for other tests.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-
- ok(target, "Should have a target available.");
- ok(panel, "Should have a panel available.");
-
- ok(panel.panelWin.gToolbox, "Should have a toolbox reference on the panel window.");
- ok(panel.panelWin.gTarget, "Should have a target reference on the panel window.");
- ok(panel.panelWin.gFront, "Should have a front reference on the panel window.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js b/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js
deleted file mode 100644
index c29c056985a..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the overview has an initial selection when recording has finished
- * and there is data available.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
- let { OVERVIEW_INITIAL_SELECTION_RATIO: selectionRatio } = panel.panelWin;
-
- $("#memory-checkbox").checked = true;
- yield TimelineController.updateMemoryRecording();
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has started.");
-
- let updated = 0;
- panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
- ok((yield waitUntil(() => updated > 10)),
- "The overview graph was updated a bunch of times.");
- ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
- "There are some markers available.");
- ok((yield waitUntil(() => TimelineController.getMemory().length > 0)),
- "There are some memory measurements available now.");
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has ended.");
-
- let interval = TimelineController.getInterval();
- let markers = TimelineController.getMarkers();
- let selection = TimelineView.markersOverview.getSelection();
-
- is((selection.start) | 0,
- (markers[0].start * TimelineView.markersOverview.dataScaleX) | 0,
- "The initial selection start is correct.");
-
- is((selection.end - selection.start) | 0,
- (selectionRatio * TimelineView.markersOverview.width) | 0,
- "The initial selection end is correct.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-02.js b/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-02.js
deleted file mode 100644
index 8a7675c0f49..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-02.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the overview has no initial selection when recording has finished
- * and there is no data available.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
- let { OVERVIEW_INITIAL_SELECTION_RATIO: selectionRatio } = panel.panelWin;
-
- $("#memory-checkbox").checked = true;
- yield TimelineController.updateMemoryRecording();
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has started.");
-
- yield TimelineController._stopRecordingAndDiscardData();
- ok(true, "Recording has ended.");
-
- let markers = TimelineController.getMarkers();
- let memory = TimelineController.getMemory();
- let selection = TimelineView.markersOverview.getSelection();
-
- is(markers.length, 0,
- "There are no markers available.");
- is(memory.length, 0,
- "There are no memory measurements available.");
- is(selection.start, null,
- "The initial selection start is correct.");
- is(selection.end, null,
- "The initial selection end is correct.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-theme.js b/browser/devtools/timeline/test/browser_timeline_overview-theme.js
deleted file mode 100644
index 4a45bef6a59..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-theme.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the markers and memory overviews render with the correct
- * theme on load, and rerenders when changed.
- */
-
-const LIGHT_BG = "#fcfcfc";
-const DARK_BG = "#14171a";
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel("about:blank");
- let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
- $("#memory-checkbox").checked = true;
-
- setTheme("dark");
-
- yield TimelineController.updateMemoryRecording();
- is(TimelineView.markersOverview.backgroundColor, DARK_BG,
- "correct theme on load for markers.");
- is(TimelineView.memoryOverview.backgroundColor, DARK_BG,
- "correct theme on load for memory.");
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has started.");
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has ended.");
-
- let refreshed = Promise.all([
- once(TimelineView.markersOverview, "refresh"),
- once(TimelineView.memoryOverview, "refresh"),
- ]);
-
- setTheme("light");
- yield refreshed;
-
- ok(true, "Both memory and markers were rerendered after theme change.");
- is(TimelineView.markersOverview.backgroundColor, LIGHT_BG,
- "correct theme on after toggle for markers.");
- is(TimelineView.memoryOverview.backgroundColor, LIGHT_BG,
- "correct theme on after toggle for memory.");
-
- refreshed = Promise.all([
- once(TimelineView.markersOverview, "refresh"),
- once(TimelineView.memoryOverview, "refresh"),
- ]);
-
- setTheme("dark");
- yield refreshed;
-
- ok(true, "Both memory and markers were rerendered after theme change.");
- is(TimelineView.markersOverview.backgroundColor, DARK_BG,
- "correct theme on after toggle for markers once more.");
- is(TimelineView.memoryOverview.backgroundColor, DARK_BG,
- "correct theme on after toggle for memory once more.");
-
- refreshed = Promise.all([
- once(TimelineView.markersOverview, "refresh"),
- once(TimelineView.memoryOverview, "refresh"),
- ]);
-
- // Set theme back to light
- setTheme("light");
- yield refreshed;
-});
-
-/**
- * Mimics selecting the theme selector in the toolbox;
- * sets the preference and emits an event on gDevTools to trigger
- * the themeing.
- */
-function setTheme (newTheme) {
- let oldTheme = Services.prefs.getCharPref("devtools.theme");
- info("Setting `devtools.theme` to \"" + newTheme + "\"");
- Services.prefs.setCharPref("devtools.theme", newTheme);
- gDevTools.emit("pref-changed", {
- pref: "devtools.theme",
- newValue: newTheme,
- oldValue: oldTheme
- });
-}
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-update.js b/browser/devtools/timeline/test/browser_timeline_overview-update.js
deleted file mode 100644
index 130f7db11c6..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-update.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the markers and memory overviews are continuously updated.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel("about:blank");
- let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
- $("#memory-checkbox").checked = true;
- yield TimelineController.updateMemoryRecording();
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has started.");
-
- ok("selectionEnabled" in TimelineView.markersOverview,
- "The selection should not be enabled for the markers overview (1).");
- is(TimelineView.markersOverview.selectionEnabled, false,
- "The selection should not be enabled for the markers overview (2).");
- is(TimelineView.markersOverview.hasSelection(), false,
- "The markers overview shouldn't have a selection before recording.");
-
- ok("selectionEnabled" in TimelineView.memoryOverview,
- "The selection should not be enabled for the memory overview (1).");
- is(TimelineView.memoryOverview.selectionEnabled, false,
- "The selection should not be enabled for the memory overview (2).");
- is(TimelineView.memoryOverview.hasSelection(), false,
- "The memory overview shouldn't have a selection before recording.");
-
- let updated = 0;
- panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
- ok((yield waitUntil(() => updated > 10)),
- "The overviews were updated a bunch of times.");
- ok((yield waitUntil(() => TimelineController.getMemory().length > 10)),
- "There are some memory measurements available now.");
-
- ok("selectionEnabled" in TimelineView.markersOverview,
- "The selection should still not be enabled for the markers overview (3).");
- is(TimelineView.markersOverview.selectionEnabled, false,
- "The selection should still not be enabled for the markers overview (4).");
- is(TimelineView.markersOverview.hasSelection(), false,
- "The markers overview should not have a selection while recording.");
-
- ok("selectionEnabled" in TimelineView.memoryOverview,
- "The selection should still not be enabled for the memory overview (3).");
- is(TimelineView.memoryOverview.selectionEnabled, false,
- "The selection should still not be enabled for the memory overview (4).");
- is(TimelineView.memoryOverview.hasSelection(), false,
- "The memory overview should not have a selection while recording.");
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has ended.");
-
- // TODO: Re-enable this assertion as part of bug 1120830
- // is(TimelineController.getMarkers().length, 0,
- // "There are no markers available.");
- isnot(TimelineController.getMemory().length, 0,
- "There are some memory measurements available.");
-
- is(TimelineView.markersOverview.selectionEnabled, true,
- "The selection should now be enabled for the markers overview.");
- // TODO: Re-enable this assertion as part of bug 1120830
- // is(TimelineView.markersOverview.hasSelection(), false,
- // "The markers overview should not have a selection after recording.");
-
- is(TimelineView.memoryOverview.selectionEnabled, true,
- "The selection should now be enabled for the memory overview.");
- // TODO: Re-enable this assertion as part of bug 1120830
- // is(TimelineView.memoryOverview.hasSelection(), false,
- // "The memory overview should not have a selection after recording.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_panels.js b/browser/devtools/timeline/test/browser_timeline_panels.js
deleted file mode 100644
index f7f0de0865c..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_panels.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline panels are correctly shown and hidden when
- * recording starts and stops.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, EVENTS } = panel.panelWin;
-
- is($("#record-button").hasAttribute("checked"), false,
- "The record button should not be checked yet.");
- is($("#timeline-pane").selectedPanel, $("#empty-notice"),
- "An empty notice is initially displayed instead of the waterfall view.");
-
- let whenRecStarted = panel.panelWin.once(EVENTS.RECORDING_STARTED);
- EventUtils.synthesizeMouseAtCenter($("#record-button"), {}, panel.panelWin);
- yield whenRecStarted;
-
- ok(true, "Recording has started.");
-
- is($("#record-button").getAttribute("checked"), "true",
- "The record button should be checked now.");
- is($("#timeline-pane").selectedPanel, $("#recording-notice"),
- "A recording notice is now displayed instead of the waterfall view.");
-
- let whenRecEnded = panel.panelWin.once(EVENTS.RECORDING_ENDED);
- EventUtils.synthesizeMouseAtCenter($("#record-button"), {}, panel.panelWin);
- yield whenRecEnded;
-
- ok(true, "Recording has ended.");
-
- is($("#record-button").hasAttribute("checked"), false,
- "The record button should be unchecked again.");
- is($("#timeline-pane").selectedPanel, $("#timeline-waterfall-container"),
- "A waterfall view is now displayed.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_recording-without-memory.js b/browser/devtools/timeline/test/browser_timeline_recording-without-memory.js
deleted file mode 100644
index 5b8b0e0ea26..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_recording-without-memory.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline actor isn't unnecessarily asked to record memory.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has started.");
-
- let updated = 0;
- panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
- ok((yield waitUntil(() => updated > 10)),
- "The overview graph was updated a bunch of times.");
- ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
- "There are some markers available.");
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has ended.");
-
- let markers = TimelineController.getMarkers();
- let memory = TimelineController.getMemory();
-
- isnot(markers.length, 0,
- "There are some markers available.");
- is(memory.length, 0,
- "There are no memory measurements available.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_recording.js b/browser/devtools/timeline/test/browser_timeline_recording.js
deleted file mode 100644
index 3cc977ff8f2..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_recording.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline can properly start and stop a recording.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, gFront, TimelineController } = panel.panelWin;
-
- $("#memory-checkbox").checked = true;
- yield TimelineController.updateMemoryRecording();
-
- is((yield gFront.isRecording()), false,
- "The timeline actor should not be recording when the tool starts.");
- is(TimelineController.getMarkers().length, 0,
- "There should be no markers available when the tool starts.");
- is(TimelineController.getMemory().length, 0,
- "There should be no memory measurements available when the tool starts.");
-
- yield TimelineController.toggleRecording();
-
- is((yield gFront.isRecording()), true,
- "The timeline actor should be recording now.");
- ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
- "There are some markers available now.");
- ok((yield waitUntil(() => TimelineController.getMemory().length > 0)),
- "There are some memory measurements available now.");
-
- info("Interval: " + TimelineController.getInterval().toSource());
- info("Markers: " + TimelineController.getMarkers().toSource());
- info("Memory: " + TimelineController.getMemory().toSource());
-
- ok("startTime" in TimelineController.getInterval(),
- "A `startTime` field was set on the recording data.");
- ok("endTime" in TimelineController.getInterval(),
- "An `endTime` field was set on the recording data.");
-
- ok(TimelineController.getInterval().endTime >
- TimelineController.getInterval().startTime,
- "Some time has passed since the recording started.");
-
- yield TimelineController.toggleRecording();
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-background.js b/browser/devtools/timeline/test/browser_timeline_waterfall-background.js
deleted file mode 100644
index 47c1cfba170..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-background.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the waterfall background is a 1px high canvas stretching across
- * the container bounds.
- */
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has started.");
-
- let updated = 0;
- panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
- ok((yield waitUntil(() => updated > 0)),
- "The overview graphs were updated a bunch of times.");
- ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
- "There are some markers available.");
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has ended.");
-
- // Test the waterfall background.
-
- let parentWidth = $("#timeline-waterfall").getBoundingClientRect().width;
- let waterfallWidth = TimelineView.waterfall._waterfallWidth;
- let sidebarWidth = 150; // px
- is(waterfallWidth, parentWidth - sidebarWidth,
- "The waterfall width is correct.")
-
- ok(TimelineView.waterfall._canvas,
- "A canvas should be created after the recording ended.");
- ok(TimelineView.waterfall._ctx,
- "A 2d context should be created after the recording ended.");
-
- is(TimelineView.waterfall._canvas.width, waterfallWidth,
- "The canvas width is correct.");
- is(TimelineView.waterfall._canvas.height, 1,
- "The canvas height is correct.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js b/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js
deleted file mode 100644
index 35ab9ae7f6a..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the waterfall is properly built after making a selection
- * and the child nodes are styled correctly.
- */
-
-var gRGB_TO_HSL = {
- "rgb(193, 132, 214)": "hsl(285,50%,68%)",
- "rgb(152, 61, 183)": "hsl(285,50%,48%)",
- "rgb(161, 223, 138)": "hsl(104,57%,71%)",
- "rgb(96, 201, 58)": "hsl(104,57%,51%)",
- "rgb(240, 195, 111)": "hsl(39,82%,69%)",
- "rgb(227, 155, 22)": "hsl(39,82%,49%)",
- "rgb(204, 204, 204)": "hsl(0,0%,80%)",
- "rgb(153, 153, 153)": "hsl(0,0%,60%)",
-};
-
-add_task(function*() {
- let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
- let { TIMELINE_BLUEPRINT } = devtools.require("devtools/shared/timeline/global");
- let { $, $$, EVENTS, TimelineController } = panel.panelWin;
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has started.");
-
- let updated = 0;
- panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
- ok((yield waitUntil(() => updated > 0)),
- "The overview graphs were updated a bunch of times.");
- ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
- "There are some markers available.");
-
- yield TimelineController.toggleRecording();
- ok(true, "Recording has ended.");
-
- // Test the table sidebars.
-
- for (let sidebar of [
- ...$$(".timeline-header-sidebar"),
- ...$$(".timeline-marker-sidebar")
- ]) {
- is(sidebar.getAttribute("width"), "150",
- "The table's sidebar width is correct.");
- }
-
- // Test the table ticks.
-
- for (let tick of $$(".timeline-header-tick")) {
- ok(tick.getAttribute("value").match(/^\d+ ms$/),
- "The table's timeline ticks appear to have correct labels.");
- ok(tick.style.transform.match(/^translateX\(.*px\)$/),
- "The table's timeline ticks appear to have proper translations.");
- }
-
- // Test the marker bullets.
-
- for (let bullet of $$(".timeline-marker-bullet")) {
- let type = bullet.getAttribute("type");
-
- ok(type in TIMELINE_BLUEPRINT,
- "The bullet type is present in the timeline blueprint.");
- is(gRGB_TO_HSL[bullet.style.backgroundColor], TIMELINE_BLUEPRINT[type].fill,
- "The bullet's background color is correct.");
- is(gRGB_TO_HSL[bullet.style.borderColor], TIMELINE_BLUEPRINT[type].stroke,
- "The bullet's border color is correct.");
- }
-
- // Test the marker bars.
-
- for (let bar of $$(".timeline-marker-bar")) {
- let type = bar.getAttribute("type");
-
- ok(type in TIMELINE_BLUEPRINT,
- "The bar type is present in the timeline blueprint.");
- is(gRGB_TO_HSL[bar.style.backgroundColor], TIMELINE_BLUEPRINT[type].fill,
- "The bar's background color is correct.");
- is(gRGB_TO_HSL[bar.style.borderColor], TIMELINE_BLUEPRINT[type].stroke,
- "The bar's border color is correct.");
-
- ok(bar.getAttribute("width") > 0,
- "The bar appears to have a proper width.");
- ok(bar.style.transform.match(/^translateX\(.*px\)$/),
- "The bar appears to have proper translations.");
- }
-});
diff --git a/browser/devtools/timeline/test/doc_simple-test.html b/browser/devtools/timeline/test/doc_simple-test.html
deleted file mode 100644
index d038c46a7b5..00000000000
--- a/browser/devtools/timeline/test/doc_simple-test.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
Timeline test page
-
-
-
-
-
-
-
diff --git a/browser/devtools/timeline/test/head.js b/browser/devtools/timeline/test/head.js
deleted file mode 100644
index 74b185aa361..00000000000
--- a/browser/devtools/timeline/test/head.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
-
-let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
-
-// Disable logging for all the tests. Both the debugger server and frontend will
-// be affected by this pref.
-let gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
-Services.prefs.setBoolPref("devtools.debugger.log", false);
-
-// Enable the tool while testing.
-let gToolEnabled = Services.prefs.getBoolPref("devtools.timeline.enabled");
-Services.prefs.setBoolPref("devtools.timeline.enabled", true);
-
-let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
-let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
-let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-
-let TargetFactory = devtools.TargetFactory;
-let Toolbox = devtools.Toolbox;
-
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/timeline/test/";
-const SIMPLE_URL = EXAMPLE_URL + "doc_simple-test.html";
-
-// All tests are asynchronous.
-waitForExplicitFinish();
-
-registerCleanupFunction(() => {
- info("finish() was called, cleaning up...");
- Services.prefs.setBoolPref("devtools.debugger.log", gEnableLogging);
- Services.prefs.setBoolPref("devtools.timeline.enabled", gToolEnabled);
-});
-
-// Close the toolbox and all opened tabs automatically.
-registerCleanupFunction(function*() {
- let target = TargetFactory.forTab(gBrowser.selectedTab);
- yield gDevTools.closeToolbox(target);
-
- while (gBrowser.tabs.length > 1) {
- gBrowser.removeCurrentTab();
- }
-});
-
-function addTab(url) {
- info("Adding tab: " + url);
-
- let deferred = promise.defer();
- let tab = gBrowser.selectedTab = gBrowser.addTab(url);
- let linkedBrowser = tab.linkedBrowser;
-
- linkedBrowser.addEventListener("load", function onLoad() {
- linkedBrowser.removeEventListener("load", onLoad, true);
- info("Tab added and finished loading: " + url);
- deferred.resolve(tab);
- }, true);
-
- return deferred.promise;
-}
-
-/**
- * Spawns a new tab and starts up a toolbox with the timeline panel
- * automatically selected.
- *
- * Must be used within a task.
- *
- * @param string url
- * The location of the new tab to spawn.
- * @return object
- * A promise resolved once the timeline is initialized, with the
- * {target, panel} instances.
- */
-function* initTimelinePanel(url) {
- info("Initializing a timeline pane.");
-
- let tab = yield addTab(url);
- let target = TargetFactory.forTab(tab);
-
- yield target.makeRemote();
-
- let toolbox = yield gDevTools.showToolbox(target, "timeline");
- let panel = toolbox.getCurrentPanel();
- return { target, panel };
-}
-
-/**
- * Waits until a predicate returns true.
- *
- * @param function predicate
- * Invoked once in a while until it returns true.
- * @param number interval [optional]
- * How often the predicate is invoked, in milliseconds.
- */
-function waitUntil(predicate, interval = 10) {
- if (predicate()) {
- return promise.resolve(true);
- }
- let deferred = promise.defer();
- setTimeout(function() {
- waitUntil(predicate).then(() => deferred.resolve(true));
- }, interval);
- return deferred.promise;
-
-}
-
-/**
- * Wait until next tick.
- */
-function nextTick() {
- let def = promise.defer();
- executeSoon(() => def.resolve())
- return def.promise;
-}
-
-/**
- * Wait for eventName on target.
- * @param {Object} target An observable object that either supports on/off or
- * addEventListener/removeEventListener
- * @param {String} eventName
- * @param {Boolean} useCapture Optional, for addEventListener/removeEventListener
- * @return A promise that resolves when the event has been handled
- */
-function once(target, eventName, useCapture=false) {
- info("Waiting for event: '" + eventName + "' on " + target + ".");
-
- let deferred = promise.defer();
-
- for (let [add, remove] of [
- ["addEventListener", "removeEventListener"],
- ["addListener", "removeListener"],
- ["on", "off"]
- ]) {
- if ((add in target) && (remove in target)) {
- target[add](eventName, function onEvent(...aArgs) {
- info("Got event: '" + eventName + "' on " + target + ".");
- target[remove](eventName, onEvent, useCapture);
- deferred.resolve.apply(deferred, aArgs);
- }, useCapture);
- break;
- }
- }
-
- return deferred.promise;
-}
diff --git a/browser/devtools/webide/modules/simulator-process.js b/browser/devtools/webide/modules/simulator-process.js
index e0445f7bbe4..1b20137b535 100644
--- a/browser/devtools/webide/modules/simulator-process.js
+++ b/browser/devtools/webide/modules/simulator-process.js
@@ -71,9 +71,11 @@ SimulatorProcess.prototype = {
let environment;
if (OS.indexOf("linux") > -1) {
environment = ["TMPDIR=" + Services.dirsvc.get("TmpD", Ci.nsIFile).path];
- if ("DISPLAY" in Environment) {
- environment.push("DISPLAY=" + Environment.DISPLAY);
- }
+ ["DISPLAY", "XAUTHORITY"].forEach(key => {
+ if (key in Environment) {
+ environment.push(key + "=" + Environment[key]);
+ }
+ });
}
// Spawn a B2G instance.
diff --git a/browser/docs/DirectoryLinksProvider.rst b/browser/docs/DirectoryLinksProvider.rst
new file mode 100644
index 00000000000..ec02779ad66
--- /dev/null
+++ b/browser/docs/DirectoryLinksProvider.rst
@@ -0,0 +1,248 @@
+=============================================
+Directory Links Architecture and Data Formats
+=============================================
+
+Directory links are enhancements to the new tab experience that combine content
+Firefox already knows about from user browsing with external content. There are
+3 kinds of links:
+
+- directory links fill in additional tiles on the new tab page if there would
+ have been empty tiles because the user has a clean profile or cleared history
+- suggested links are shown if certain triggering criteria matches the user's
+ browsing behavior, i.e., if the user has a top site that matches one of
+ several possible sites. E.g., only show a sports suggestion if the user has a
+ sport site as a top site
+- enhanced links replace a matching user's visible history tile from the same
+ site but only the visual aspects: title, image, and rollover image
+
+To power the above features, DirectoryLinksProvider module downloads, at most
+once per 24 hours, the directory source links as JSON with enough data for
+Firefox to determine what should be shown or not. This module also handles
+reporting back data about the tiles via asynchronous pings that don't return
+data from the server.
+
+For the directory source and ping endpoints, the default preference values point
+to Mozilla key-pinned servers with encryption. No cookies are set by the servers
+but not enforced by Firefox.
+
+- default directory source endpoint:
+ https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%
+- default directory ping endpoint: https://tiles.services.mozilla.com/v3/links/
+
+
+Preferences
+===========
+
+There are two main preferences that control downloading links and reporting
+metrics.
+
+``browser.newtabpage.directory.source``
+---------------------------------------
+
+This endpoint tells Firefox where to download directory source file as a GET
+request. It should return JSON of the appropriate format containing the relevant
+links data. The value can be a data URI, e.g., an empty JSON object effectively
+turns off remote downloading: ``data:text/plain,{}``
+
+The preference value will have %LOCALE% and %CHANNEL% replaced by the
+appropriate values for the build of Firefox, e.g.,
+
+- directory source endpoint:
+ https://tiles.services.mozilla.com/v3/links/fetch/en-US/release
+
+``browser.newtabpage.directory.ping``
+-------------------------------------
+
+This endpoint tells Firefox where to report Tiles metrics as a POST request. The
+data is sent as a JSON blob. Setting it to empty effectively turns off reporting
+of Tiles data.
+
+A path segment will be appended to the endpoint of "view" or "click" depending
+on the type of ping, e.g.,
+
+- ``view`` ping endpoint: https://tiles.services.mozilla.com/v3/links/view
+- ``click`` ping endpoint: https://tiles.services.mozilla.com/v3/links/click
+
+
+Data Flow
+=========
+
+When Firefox starts, it checks for a cached directory source file. If one
+exists, it checks for its timestamp to determine if a new file should be
+downloaded.
+
+If a directory source file needs to be downloaded, a GET request is made then
+cacheed and unpacked the JSON into the different types of links. Various checks
+filter out invalid links, e.g., those with http-hosted images or those that
+don't fit the allowed suggestions.
+
+When a new tab page is built, DirectoryLinksProvider module provides additional
+link data that is combined with history link data to determine which links can
+be displayed or not.
+
+When a new tab page is shown, a ``view`` ping is sent with relevant tiles data.
+Similarly, when the user clicks on various parts of tiles (to load the page,
+pin, block, etc.), a ``click`` ping is sent with similar data. Both of these can
+trigger downloading of fresh directory source links if 24 hours have elapsed
+since last download.
+
+Users can turn off the ping with in-new-tab-page controls.
+
+As the new tab page is rendered, any images for tiles are downloaded if not
+already cached. The default servers hosting the images are Mozilla CDN that
+don't use cookies: https://tiles.cdn.mozilla.net/
+
+
+Source JSON Format
+==================
+
+Firefox expects links data in a JSON object with top level keys each providing
+an array of tile objects. The keys correspond to the different types of links:
+``directory``, ``suggested``, and ``enhanced``.
+
+Example
+-------
+
+Below is an example directory source file::
+
+ {
+ "directory": [
+ {
+ "bgColor": "",
+ "directoryId": 498,
+ "enhancedImageURI": "https://tiles.cdn.mozilla.net/images/d11ba0b3095bb19d8092cd29be9cbb9e197671ea.28088.png",
+ "imageURI": "https://tiles.cdn.mozilla.net/images/1332a68badf11e3f7f69bf7364e79c0a7e2753bc.5316.png",
+ "title": "Mozilla Community",
+ "type": "affiliate",
+ "url": "http://contribute.mozilla.org/"
+ }
+ ],
+ "enhanced": [
+ {
+ "bgColor": "",
+ "directoryId": 776,
+ "enhancedImageURI": "https://tiles.cdn.mozilla.net/images/44a14fc405cebc299ead86514dff0e3735c8cf65.10814.png",
+ "imageURI": "https://tiles.cdn.mozilla.net/images/20e24aa2219ec7542cc8cf0fd79f0c81e16ebeac.11859.png",
+ "title": "TurboTax",
+ "type": "sponsored",
+ "url": "https://turbotax.intuit.com/"
+ }
+ ],
+ "suggested": [
+ {
+ "bgColor": "#cae1f4",
+ "directoryId": 702,
+ "frecent_sites": [
+ "addons.mozilla.org",
+ "air.mozilla.org",
+ "blog.mozilla.org",
+ "bugzilla.mozilla.org",
+ "developer.mozilla.org",
+ "etherpad.mozilla.org",
+ "hacks.mozilla.org",
+ "hg.mozilla.org",
+ "mozilla.org",
+ "planet.mozilla.org",
+ "quality.mozilla.org",
+ "support.mozilla.org",
+ "treeherder.mozilla.org",
+ "wiki.mozilla.org"
+ ],
+ "imageURI": "https://tiles.cdn.mozilla.net/images/9ee2b265678f2775de2e4bf680df600b502e6038.3875.png",
+ "title": "Thanks for testing!",
+ "type": "affiliate",
+ "url": "https://www.mozilla.com/firefox/tiles"
+ }
+ ]
+ }
+
+Link Object
+-----------
+
+Each link object has various values that Firefox uses to display a tile:
+
+- ``url`` - string url for the page to be loaded when the tile is clicked. Only
+ https and http URLs are allowed.
+- ``title`` - string that appears below the tile.
+- ``type`` - string relationship of the link to Mozilla. Expected values:
+ affiliate, organic, sponsored.
+- ``imageURI`` - string url for the tile image to show. Only https and data URIs
+ are allowed.
+- ``enhancedImageURI`` - string url for the image to be shown before the user
+ hovers. Only https and data URIs are allowed.
+- ``bgColor`` - string css color for additional fill background color.
+- ``directoryId`` - id of the tile to be used during ping reporting
+
+Suggested Link Object Extras
+----------------------------
+
+A suggested link has additional values:
+
+- ``frecent_sites`` - array of strings of the sites that can trigger showing a
+ Suggested Tile if the user has the site in one of the top 100 most-frecent
+ pages. Only preapproved array of strings that are hardcoded into the
+ DirectoryLinksProvider module are allowed.
+
+The preapproved arrays follow a policy for determining what topic grouping is
+allowed as well as the composition of a grouping. The topics are broad
+uncontroversial categories, e.g., Mobile Phone, News, Technology, Video Game,
+Web Development. There are at least 5 sites within a grouping, and as many
+popular sites relevant to the topic are included to avoid having one site be
+clearly dominant. These requirements provide some deniability of which site
+actually triggered a suggestion during ping reporting, so it's more difficult to
+determine if a user has gone to a specific site.
+
+
+Ping JSON Format
+================
+
+Firefox reports back an action and the state of tiles on the new tab page based
+on the user opening a new tab or clicking a tile. The top level keys of the
+ping:
+
+- ``locale`` - string locale of the Firefox build
+- ``tiles`` - array of tiles ping objects
+
+An additional key at the top level indicates which action triggered the ping.
+The value associated to the action key is the 0-based index into the tiles array
+of which tile triggered the action. Valid actions: block, click, pin, sponsored,
+sponsored_link, unpin, view. E.g., if the second tile is being clicked, the ping
+will have ``"click": 1``
+
+Example
+-------
+
+Below is an example ``click`` ping with 3 tiles: a pinned suggested tile
+followed by a history tile and a directory tile. The first tile is being
+blocked::
+
+ {
+ "locale": "en-US",
+ "tiles": [
+ {
+ "id": 702,
+ "pin": 1,
+ },
+ {},
+ {
+ "id": 498,
+ }
+ ],
+ "block": 0
+ }
+
+Tiles Ping Object
+-----------------
+
+Each tile of the new tab page is reported back as part of the ping with some or
+none of the following optional values:
+
+- ``id`` - id that was provided as part of the downloaded link object (for all
+ types of links: directory, suggested, enhanced); not present if the tile was
+ created from user behavior, e.g., visiting pages
+- ``pinned`` - 1 if the tile is pinned; not present otherwise
+- ``pos`` - integer position if the tile is not in the natural order, e.g., a
+ pinned tile after an empty slot; not present otherwise
+- ``score`` - integer truncated score based on the tile's frecency; not present
+ if 0
+- ``url`` - empty string if it's an enhanced tile; not present otherwise
diff --git a/browser/docs/index.rst b/browser/docs/index.rst
index 67fc69c8dc3..ad745b8feab 100644
--- a/browser/docs/index.rst
+++ b/browser/docs/index.rst
@@ -7,4 +7,5 @@ This is the nascent documentation of the Firefox front-end code.
.. toctree::
:maxdepth: 1
+ DirectoryLinksProvider
UITelemetry
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index e6fa1dd8d99..0402a8122d1 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -108,7 +108,7 @@ valid_email_text_description=Please enter a valid email address
## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the
## panel.
add_or_import_contact_title=Add or Import Contact
-import_contacts_button=Import
+import_contacts_button2=Import from Google
importing_contacts_progress_button=Importing…
import_contacts_failure_message=Some contacts could not be imported. Please try again.
## LOCALIZATION NOTE(import_contacts_success_message): Success notification message
@@ -127,9 +127,9 @@ import_failed_description_simple=Sorry, contact import failed
import_failed_description_some=Some contacts could not be imported
import_failed_support_button=Help
-## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
+## LOCALIZATION NOTE(remove_contact_menu_button2): Displayed in the contact list in
## a pop-up menu next to the contact's name.
-remove_contact_menu_button=Remove Contact
+remove_contact_menu_button2=Remove Contact…
## LOCALIZATION NOTE(confirm_delete_contact_alert): This is an alert that is displayed
## to confirm deletion of a contact.
confirm_delete_contact_alert=Are you sure you want to delete this contact?
diff --git a/browser/modules/DirectoryLinksProvider.jsm b/browser/modules/DirectoryLinksProvider.jsm
index ff4c491c95f..5d2519d635a 100644
--- a/browser/modules/DirectoryLinksProvider.jsm
+++ b/browser/modules/DirectoryLinksProvider.jsm
@@ -50,6 +50,34 @@ const PREF_DIRECTORY_PING = "browser.newtabpage.directory.ping";
// The preference that tells if newtab is enhanced
const PREF_NEWTAB_ENHANCED = "browser.newtabpage.enhanced";
+// Only allow explicitly approved frecent sites with display name
+const ALLOWED_FRECENT_SITES = new Map([
+ [ 'airdroid.com,android-developers.blogspot.com,android.com,androidandme.com,androidapplications.com,androidapps.com,androidauthority.com,androidcentral.com,androidcommunity.com,androidfilehost.com,androidforums.com,androidguys.com,androidheadlines.com,androidpit.com,androidpolice.com,androidspin.com,androidtapp.com,androinica.com,droid-life.com,droidforums.net,droidviews.com,droidxforums.com,forum.xda-developers.com,phandroid.com,play.google.com,shopandroid.com,talkandroid.com,theandroidsoul.com,thedroidguy.com,videodroid.org',
+ 'Technology' ],
+ [ 'assurancewireless.com,att.com,attsavings.com,boostmobile.com,budgetmobile.com,consumercellular.com,credomobile.com,gosmartmobile.com,h2owirelessnow.com,lycamobile.com,lycamobile.us,metropcs.com,myfamilymobile.com,polarmobile.com,qlinkwireless.com,republicwireless.com,sprint.com,straighttalk.com,t-mobile.com,tracfonewireless.com,verizonwireless.com,virginmobile.com,virginmobile.com.au,virginmobileusa.com,vodafone.co.uk,vodafone.com,vzwshop.com',
+ 'Mobile Phone' ],
+ [ 'addons.mozilla.org,air.mozilla.org,blog.mozilla.org,bugzilla.mozilla.org,developer.mozilla.org,etherpad.mozilla.org,forums.mozillazine.org,hacks.mozilla.org,hg.mozilla.org,mozilla.org,planet.mozilla.org,quality.mozilla.org,support.mozilla.org,treeherder.mozilla.org,wiki.mozilla.org',
+ 'Mozilla' ],
+ [ '3dprint.com,4sysops.com,access-programmers.co.uk,accountingweb.com,addictivetips.com,adweek.com,afterdawn.com,akihabaranews.com,anandtech.com,appsrumors.com,arstechnica.com,belkin.com,besttechinfo.com,betanews.com,bgr.com,botcrawl.com,breakingmuscle.com,canonrumors.com,cheap-phones.com,chip.de,chip.eu,cio.com,citeworld.com,cleanpcremove.com,cnet.com,commentcamarche.net,computer.org,computerhope.com,computershopper.com,computerweekly.com,contextures.com,coolest-gadgets.com,crn.com,csoonline.com,daniweb.com,data.com,datacenterknowledge.com,ddj.com,devicemag.com,digitaltrends.com,dottech.org,dpreview.com,dslreports.com,edugeek.net,eetimes.com,engadget.com,epic.com,eurekalert.org,eweek.com,experts-exchange.com,extremetech.com,fosshub.com,freesoftwaremagazine.com,funkyspacemonkey.com,futuremark.com,gadgetreview.com,ghacks.net,gizmodo.co.uk,gizmodo.com,globalsecurity.org,greenbot.com,gunup.com,guru3d.com,head-fi.org,hexus.net,hothardware.com,howtoforge.com,idg.com.au,idigitaltimes.com,idownloadblog.com,ihackmyi.com,ilounge.com,infomine.com,informationweek.com,intellireview.com,intomobile.com,iphonehacks.com,ismashphone.com,isource.com,it168.com,itechpost.com,itpro.co.uk,itworld.com,jailbreaknation.com,kioskea.net,laptoping.com,laptopmag.com,lightreading.com,livescience.com,malwaretips.com,mediaroom.com,mobilemag.com,modmyi.com,modmymobile.com,mophie.com,mozillazine.org,neoseeker.com,neowin.net,newscientist.com,newsoxy.com,nextadvisor.com,notebookcheck.com,notebookreview.com,nvidia.com,nwc.com,orafaq.com,osdir.com,osxdaily.com,our-hometown.com,pcadvisor.co.uk,pchome.net,pcmag.com,pconline.com.cn,pcpop.com,pcpro.co.uk,pcreview.co.uk,pcrisk.com,pcwelt.de,phonerebel.com,phonescoop.com,physorg.com,pocket-lint.com,post-theory.com,prnewswire.co.uk,prnewswire.com,programming4.us,quickpwn.com,readwrite.com,redmondpie.com,redorbit.com,reviewed.com,safer-networking.org,sciencedaily.com,sciencenews.org,scientificamerican.com,scientificblogging.com,sciverse.com,servicerow.com,sinfuliphone.com,singularityhub.com,slashdot.org,slashgear.com,softonic.com,softonic.com.br,softonic.fr,sophos.com,space.com,sparkfun.com,speedguide.net,stuff.tv,techdailynews.net,techdirt.com,techeblog.com,techhive.com,techie-buzz.com,technewsworld.com,techniqueworld.com,technobuffalo.com,technologyreview.com,technologytell.com,techpowerup.com,techpp.com,techrepublic.com,techshout.com,techweb.com,techworld.com,techworld.com.au,techworldtweets.com,telecomfile.com,tgdaily.com,theinquirer.net,thenextweb.com,theregister.co.uk,thermofisher.com,theverge.com,thewindowsclub.com,tomsguide.com,tomshardware.com,tomsitpro.com,toptenreviews.com,trustedreviews.com,tuaw.com,tweaktown.com,ubergizmo.com,unwiredview.com,venturebeat.com,wccftech.com,webmonkey.com,webpronews.com,windows7codecs.com,windowscentral.com,windowsitpro.com,windowstechies.com,winsupersite.com,wired.co.uk,wired.com,wp-themes.com,xda-developers.com,xml.com,zdnet.com,zmescience.com,zol.com.cn',
+ 'Technology' ],
+ [ '9to5mac.com,appadvice.com,apple.com,appleinsider.com,appleturns.com,appsafari.com,cultofmac.com,everymac.com,insanelymac.com,iphoneunlockspot.com,isource.com,itunes.apple.com,lowendmac.com,mac-forums.com,macdailynews.com,macenstein.com,macgasm.net,macintouch.com,maclife.com,macnews.com,macnn.com,macobserver.com,macosx.com,macpaw.com,macrumors.com,macsales.com,macstories.net,macupdate.com,macuser.co.uk,macworld.co.uk,macworld.com,maxiapple.com,spymac.com,theapplelounge.com',
+ 'Technology' ],
+ [ 'alistapart.com,answers.microsoft.com,backpack.openbadges.org,blog.chromium.org,caniuse.com,codefirefox.com,codepen.io,css-tricks.com,css3generator.com,cssdeck.com,csswizardry.com,devdocs.io,docs.angularjs.org,ghacks.net,github.com,html5demos.com,html5rocks.com,html5test.com,iojs.org,khanacademy.org,l10n.mozilla.org,learn.jquery.com,marketplace.firefox.com,mozilla-hispano.org,mozillians.org,news.ycombinator.com,npmjs.com,packagecontrol.io,quirksmode.org,readwrite.com,reps.mozilla.org,smashingmagazine.com,stackoverflow.com,status.modern.ie,teamtreehouse.com,tutorialspoint.com,udacity.com,validator.w3.org,w3.org,w3cschool.cc,w3schools.com,whatcanidoformozilla.org',
+ 'Web Development' ],
+ [ 'classroom.google.com,codecademy.com,elearning.ut.ac.id,khanacademy.org,learn.jquery.com,teamtreehouse.com,tutorialspoint.com,udacity.com,w3cschool.cc,w3schools.com',
+ 'Web Education' ],
+ [ 'abebooks.co.uk,abebooks.com,alibris.com,allaboutcircuits.com,allyoucanbooks.com,answersingenesis.org,artnet.com,audiobooks.com,barnesandnoble.com,barnesandnobleinc.com,bartleby.com,betterworldbooks.com,biggerbooks.com,bncollege.com,bookbyte.com,bookdepository.com,bookfinder.com,bookrenter.com,booksamillion.com,booksite.com,boundless.com,brookstone.com,btol.com,calibre-ebook.com,campusbookrentals.com,casadellibro.com,cbomc.com,cengagebrain.com,chapters.indigo.ca,christianbook.com,ciscopress.com,coursesmart.com,cqpress.com,crafterschoice.com,crossings.com,cshlp.org,deseretbook.com,directtextbook.com,discountmags.com,doubledaybookclub.com,doubledaylargeprint.com,doverpublications.com,ebooks.com,ecampus.com,fellabooks.net,fictionwise.com,flatworldknowledge.com,grolier.com,harpercollins.com,hayhouse.com,historybookclub.com,hpb.com,hpbmarketplace.com,interweave.com,iseeme.com,katiekazoo.com,knetbooks.com,learnoutloud.com,librarything.com,literaryguild.com,lulu.com,lww.com,macmillan.com,magazines.com,mbsdirect.net,militarybookclub.com,mypearsonstore.com,mysteryguild.com,netplaces.com,noble.com,novelguide.com,onespirit.com,oxfordjournals.org,paperbackswap.com,papy.co.jp,peachpit.com,penguin.com,penguingroup.com,pimsleur.com,powells.com,qpb.com,quepublishing.com,reviews.com,rhapsodybookclub.com,rodalestore.com,royalsocietypublishing.org,sagepub.com,scrubsmag.com,sfbc.com,simonandschuster.com,simonandschuster.net,simpletruths.com,teach12.net,textbooks.com,textbookx.com,thegoodcook.com,thriftbooks.com,tlsbooks.com,toshibabookplace.com,tumblebooks.com,urbookdownload.com,valorebooks.com,valuemags.com,wwnorton.com,zoobooks.com',
+ 'Literature' ],
+ [ 'aceshowbiz.com,aintitcoolnews.com,askkissy.com,askmen.com,atraf.co.il,audioboom.com,beamly.com,blippitt.com,bollywoodlife.com,bossip.com,buzzlamp.com,celebdirtylaundry.com,celebfocus.com,celebitchy.com,celebrity-gossip.net,celebrityabout.com,celebwild.com,chisms.net,concertboom.com,crushable.com,cultbox.co.uk,dailyentertainmentnews.com,dayscafe.com,deadline.com,deathandtaxesmag.com,diaryofahollywoodstreetking.com,digitalspy.com,egotastic.com,empirenews.net,enelbrasero.com,everydaycelebs.com,ew.com,extratv.com,facade.com,fanaru.com,fhm.com,geektyrant.com,glamourpage.com,heatworld.com,hlntv.com,hollyscoop.com,hollywoodreporter.com,hollywoodtuna.com,hypable.com,infotransfer.net,insideedition.com,interaksyon.com,jezebel.com,justjared.com,justjaredjr.com,komando.com,koreaboo.com,maxgo.com,maxim.com,maxviral.com,mediatakeout.com,mosthappy.com,moviestalk.com,my.ology.com,ngoisao.net,nofilmschool.com,nolocreo.com,octane.tv,ouchpress.com,people.com,peopleenespanol.com,perezhilton.com,pinkisthenewblog.com,platotv.tv,playbill.com,playbillvault.com,playgroundmag.net,popeater.com,popnhop.com,popsugar.co.uk,popsugar.com,purepeople.com,radaronline.com,rantchic.com,reshareworthy.com,rinkworks.com,ripbird.com,sara-freder.com,screenjunkies.com,soapcentral.com,soapoperadigest.com,sobadsogood.com,splitsider.com,starcasm.net,starpulse.com,straightfromthea.com,stupidcelebrities.net,stupiddope.com,tbn.org,theawesomedaily.com,theawl.com,thefrisky.com,thefw.com,theresacaputo.com,thezooom.com,tvnotas.com.mx,twanatells.com,vanswarpedtour.com,vietgiaitri.com,viral.buzz,vulture.com,wakavision.com,worthytales.net,wwtdd.com,younghollywood.com',
+ 'Entertainment News' ],
+ [ '247wallst.com,4-traders.com,advfn.com,agweb.com,allbusiness.com,barchart.com,barrons.com,beckershospitalreview.com,benzinga.com,bizjournals.com,bizsugar.com,bloomberg.com,bloomberglaw.com,business-standard.com,businessinsider.com,businessinsider.com.au,businesspundit.com,businessweek.com,businesswire.com,cboe.com,cheatsheet.com,chicagobusiness.com,cjonline.com,cnbc.com,cnnmoney.com,cqrcengage.com,dailyfinance.com,dailyfx.com,dealbreaker.com,djindexes.com,dowjones.com,easierstreetdaily.com,economist.com,economyandmarkets.com,economywatch.com,edweek.org,eleconomista.es,entrepreneur.com,etfdailynews.com,etfdb.com,ewallstreeter.com,fastcolabs.com,fastcompany.com,financeformulas.net,financialpost.com,flife.de,forbes.com,forexpros.com,fortune.com,foxbusiness.com,ft.com,ftpress.com,fx-exchange.com,hbr.org,howdofinance.com,ibtimes.com,inc.com,investopedia.com,investors.com,investorwords.com,journalofaccountancy.com,kiplinger.com,lendingandcredit.net,lfb.org,mainstreet.com,markettraders.com,marketwatch.com,maxkeiser.com,minyanville.com,ml.com,moneycontrol.com,moneymappress.com,moneynews.com,moneysavingexpert.com,morningstar.com,mortgagenewsdaily.com,motleyfool.com,mt.co.kr,nber.org,nyse.com,oilprice.com,pewsocialtrends.org,principal.com,qz.com,rantfinance.com,realclearmarkets.com,recode.net,reuters.ca,reuters.co.in,reuters.co.uk,reuters.com,rttnews.com,seekingalpha.com,smallbiztrends.com,streetinsider.com,thecheapinvestor.com,theeconomiccollapseblog.com,themoneyconverter.com,thestreet.com,tickertech.com,tradingeconomics.com,updown.com,valuewalk.com,wikinvest.com,wsj.com,zacks.com',
+ 'Financial News' ],
+ [ '10tv.com,8newsnow.com,9news.com,abc.net.au,abc7.com,abc7chicago.com,abcnews.go.com,aclu.org,activistpost.com,ajc.com,al.com,alan.com,alarab.net,aljazeera.com,americanthinker.com,app.com,aristeguinoticias.com,azcentral.com,baltimoresun.com,becomingminimalist.com,beforeitsnews.com,bigstory.ap.org,blackamericaweb.com,bloomberg.com,bloombergview.com,boston.com,bostonherald.com,breitbart.com,buffalonews.com,c-span.org,canada.com,cbs46.com,cbsnews.com,chicagotribune.com,chron.com,citizensvoice.com,citylab.com,cleveland.com,cnn.com,coed.com,countercurrentnews.com,courant.com,ctvnews.ca,dailyherald.com,dailynews.com,dallasnews.com,delawareonline.com,democratandchronicle.com,democraticunderground.com,democrats.org,denverpost.com,desmoinesregister.com,dispatch.com,elcomercio.pe,english.aljazeera.net,examiner.com,farsnews.com,firstcoastnews.com,firstpost.com,firsttoknow.com,foreignpolicy.com,foxnews.com,freebeacon.com,freep.com,fresnobee.com,gazette.com,global.nytimes.com,heraldtribune.com,hindustantimes.com,hngn.com,humanevents.com,huzlers.com,indiatimes.com,indystar.com,irishtimes.com,jacksonville.com,jpost.com,jsonline.com,kansascity.com,kctv5.com,kentucky.com,kickerdaily.com,king5.com,kmov.com,knoxnews.com,kpho.com,kvue.com,kwqc.com,kxan.com,lainformacion.com,latimes.com,ldnews.com,lex18.com,linternaute.com,livemint.com,lostateminor.com,m24.ru,macleans.ca,manchestereveningnews.co.uk,marinecorpstimes.com,masslive.com,mavikocaeli.com.tr,mcall.com,medium.com,mentalfloss.com,mercurynews.com,metro.us,miamiherald.com,militarytimes.com,mk.ru,mlive.com,mondotimes.com,montrealgazette.com,msnbc.com,msnewsnow.com,mynews13.com,mysanantonio.com,mysuncoast.com,nbclosangeles.com,nbcnewyork.com,nbcphiladelphia.com,ndtv.com,newindianexpress.com,news.cincinnati.com,news.google.com,news.msn.com,news.yahoo.com,news10.net,news8000.com,newsday.com,newsdaymarketing.net,newsen.com,newsmax.com,newsobserver.com,newsok.com,newsru.ua,newstatesman.com,newszoom.com,nj.com,nola.com,northjersey.com,nouvelobs.com,npr.org,nwfdailynews.com,nwitimes.com,nydailynews.com,nytimes.com,observer.com,ocregister.com,okcfox.com,omaha.com,onenewspage.com,ontheissues.org,oregonlive.com,orlandosentinel.com,palmbeachpost.com,pe.com,pennlive.com,philly.com,pilotonline.com,polar.com,post-gazette.com,postandcourier.com,presstelegram.com,presstv.ir,propublica.org,providencejournal.com,realclearpolitics.com,recorderonline.com,reporterdock.com,reporterherald.com,respublica.al,reuters.com,rg.ru,roanoke.com,sacbee.com,scmp.com,scnow.com,sdpnoticias.com,seattletimes.com,semana.com,sfgate.com,sharepowered.com,sinembargo.mx,slate.com,sltrib.com,sotomayortv.com,sourcewatch.org,spectator.co.uk,squaremirror.com,star-telegram.com,staradvertiser.com,startribune.com,statesman.com,stltoday.com,streetwise.co,stuff.co.nz,success.com,suffolknewsherald.com,sun-sentinel.com,sunnewsnetwork.ca,suntimes.com,supernewschannel.com,surenews.com,svoboda.org,syracuse.com,tampabay.com,tbd.com,telegram.com,telegraph.co.uk,tennessean.com,the-open-mind.com,theadvocate.com,theage.com.au,theatlantic.com,thebarefootwriter.com,theblaze.com,thecalifornian.com,thedailysheeple.com,thefix.com,theintelligencer.net,thelocal.com,thenational.ae,thenewstribune.com,theparisreview.org,thereporter.com,therepublic.com,thestar.com,thetelegram.com,thetimes.co.uk,theuspatriot.com,time.com,timescall.com,timesdispatch.com,timesleaderonline.com,timesofisrael.com,toledoblade.com,toprightnews.com,townhall.com,tpnn.com,trendolizer.com,triblive.com,tribune.com.pk,tricities.com,troymessenger.com,trueactivist.com,truthandaction.org,tsn.ua,tulsaworld.com,twincities.com,upi.com,usatoday.com,utsandiego.com,vagazette.com,viralwomen.com,vitalworldnews.com,voasomali.com,vox.com,washingtonexaminer.com,washingtonpost.com,watchdog.org,wave3.com,wavy.com,wbay.com,wbtw.com,wcpo.com,wctrib.com,wdtn.com,weeklystandard.com,westernjournalism.com,wfsb.com,wgrz.com,whas11.com,winonadailynews.com,wishtv.com,wistv.com,wkbn.com,wkow.com,wlfi.com,wmtw.com,wmur.com,wopular.com,world-top-news.com,worldnews.com,wplol.us,wpsdlocal6.com,wptz.com,wric.com,wsmv.com,wthitv.com,wthr.com,wtnh.com,wtol.com,wtsp.com,wvec.com,wwlp.com,wwltv.com,wyff4.com,yonhapnews.co.kr,yourbreakingnews.com',
+ 'News' ],
+ [ '2k.com,360game.vn,4399.com,a10.com,activision.com,addictinggames.com,alawar.com,alienwarearena.com,anagrammer.com,andkon.com,aq.com,arcadeprehacks.com,arcadeyum.com,arcgames.com,archeagegame.com,armorgames.com,askmrrobot.com,battle.net,battlefieldheroes.com,bigfishgames.com,bigpoint.com,bioware.com,bluesnews.com,boardgamegeek.com,bollyheaven.com,bubblebox.com,bukkit.org,bungie.net,buycraft.net,callofduty.com,candystand.com,cda.pl,challonge.com,championselect.net,cheapassgamer.com,cheatcc.com,cheatengine.org,cheathappens.com,chess.com,civfanatics.com,clashofclans-tools.com,clashofclansbuilder.com,comdotgame.com,commonsensemedia.org,coolrom.com,crazygames.com,csgolounge.com,curse.com,d20pfsrd.com,destructoid.com,diablofans.com,diablowiki.net,didigames.com,dota2.com,dota2lounge.com,dressupgames.com,dulfy.net,ebog.com,elderscrollsonline.com,elitedangerous.com,elitepvpers.com,emuparadise.me,enjoydressup.com,escapegames24.com,escapistmagazine.com,eventhubs.com,eveonline.com,farming-simulator.com,feed-the-beast.com,flashgames247.com,flightrising.com,flipline.com,flonga.com,freegames.ws,freeonlinegames.com,fresh-hotel.org,friv.com,friv.today,fullypcgames.net,funny-games.biz,funtrivia.com,futhead.com,g2a.com,gamasutra.com,game-debate.com,game-oldies.com,game321.com,gamebaby.com,gamebaby.net,gamebanana.com,gamefaqs.com,gamefly.com,gamefront.com,gamegape.com,gamehouse.com,gameinformer.com,gamejolt.com,gamemazing.com,gamemeteor.com,gamerankings.com,gamersgate.com,games-msn.com,games-workshop.com,games.com,games2girls.com,gamesbox.com,gamesfreak.net,gametop.com,gametracker.com,gametrailers.com,gamezhero.com,gbatemp.net,geforce.com,gematsu.com,giantbomb.com,girl.me,girlsgames123.com,girlsplay.com,gog.com,gogames.me,gonintendo.com,goodgamestudios.com,gosugamers.net,greenmangaming.com,gtaforums.com,gtainside.com,guildwars2.com,hackedarcadegames.com,hearthpwn.com,hirezstudios.com,hitbox.tv,hltv.org,howrse.com,icy-veins.com,indiedb.com,jayisgames.com,jigzone.com,joystiq.com,juegosdechicas.com,kabam.com,kbhgames.com,kerbalspaceprogram.com,king.com,kixeye.com,kizi.com,kogama.com,kongregate.com,kotaku.com,lolcounter.com,lolking.net,lolnexus.com,lolpro.com,lolskill.net,lootcrate.com,lumosity.com,mafa.com,mangafox.me,mangapark.com,mariowiki.com,maxgames.com,megagames.com,metacritic.com,mindjolt.com,minecraft.net,minecraftforum.net,minecraftservers.org,minecraftskins.com,mineplex.com,miniclip.com,mmo-champion.com,mmobomb.com,mmohuts.com,mmorpg.com,mmosite.com,mobafire.com,moddb.com,modxvm.com,mojang.com,moshimonsters.com,mousebreaker.com,moviestarplanet.com,mtgsalvation.com,muchgames.com,myonlinearcade.com,myplaycity.com,myrealgames.com,mythicspoiler.com,n4g.com,newgrounds.com,nexon.net,nexusmods.com,ninjakiwi.com,nintendo.com,nintendoeverything.com,nintendolife.com,nitrome.com,nosteam.ro,notdoppler.com,noxxic.com,operationsports.com,origin.com,ownedcore.com,pacogames.com,pathofexile.com,pcgamer.com,pch.com,pcsx2.net,penny-arcade.com,planetminecraft.com,plarium.com,playdota.com,playpink.com,playsides.com,playstationlifestyle.net,playstationtrophies.org,pog.com,pokemon.com,polygon.com,popcap.com,primarygames.com,probuilds.net,ps3hax.net,psnprofiles.com,psu.com,qq.com,r2games.com,resourcepack.net,retrogamer.com,rewardtv.com,riotgames.com,robertsspaceindustries.com,roblox.com,robocraftgame.com,rockpapershotgun.com,rockstargames.com,roosterteeth.com,runescape.com,schoolofdragons.com,screwattack.com,scufgaming.com,segmentnext.com,shacknews.com,shockwave.com,shoryuken.com,siliconera.com,silvergames.com,skydaz.com,smashbros.com,solomid.net,starcitygames.com,starsue.net,steamcommunity.com,steamgifts.com,strategywiki.org,supercheats.com,surrenderat20.net,swtor.com,tankionline.com,tcgplayer.com,teamfortress.com,teamliquid.net,tetrisfriends.com,thesims3.com,thesimsresource.com,thetechgame.com,topg.org,totaljerkface.com,toucharcade.com,transformice.com,trueachievements.com,twcenter.net,twitch.tv,twoplayergames.org,unity3d.com,vg247.com,vgchartz.com,videogamesblogger.com,warframe.com,warlight.net,warthunder.com,watchcartoononline.com,websudoku.com,wildstar-online.com,wildtangent.com,wineverygame.com,wizards.com,worldofsolitaire.com,worldoftanks.com,wowhead.com,wowprogress.com,wowwiki.com,xbox.com,xbox360iso.com,xboxachievements.com,xfire.com,xtremetop100.com,y8.com,yoyogames.com,zybez.net,zynga.com',
+ 'Video Game' ],
+]);
+
// Only allow link urls that are http(s)
const ALLOWED_LINK_SCHEMES = new Set(["http", "https"]);
@@ -122,11 +150,6 @@ let DirectoryLinksProvider = {
if (!this.__linksURL) {
try {
this.__linksURL = Services.prefs.getCharPref(this._observedPrefs["linksURL"]);
-
- // Temporarily override the default for en-US until new endpoint is live
- if (this.locale == "en-US" && !Services.prefs.prefHasUserValue(this._observedPrefs["linksURL"])) {
- this.__linksURL = "data:text/plain;base64,ewogICAgImRpcmVjdG9yeSI6IFsKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDQ5OCwKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy9kMTFiYTBiMzA5NWJiMTlkODA5MmNkMjliZTljYmI5ZTE5NzY3MWVhLjI4MDg4LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzEzMzJhNjhiYWRmMTFlM2Y3ZjY5YmY3MzY0ZTc5YzBhN2UyNzUzYmMuNTMxNi5wbmciLAogICAgICAgICAgICAidGl0bGUiOiAiTW96aWxsYSBDb21tdW5pdHkiLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHA6Ly9jb250cmlidXRlLm1vemlsbGEub3JnLyIKICAgICAgICB9LAogICAgICAgIHsKICAgICAgICAgICAgImJnQ29sb3IiOiAiIiwKICAgICAgICAgICAgImRpcmVjdG9yeUlkIjogNTAwLAogICAgICAgICAgICAiZW5oYW5jZWRJbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzL2NjNjM3NzRiN2E5YWFlMDJmZTM2YmM1Y2FmOTBjMWUyNWU2NmEyYmMuMTM3OTEucG5nIiwKICAgICAgICAgICAgImltYWdlVVJJIjogImh0dHBzOi8vZHRleDRrdmJwcG92dC5jbG91ZGZyb250Lm5ldC9pbWFnZXMvZTgyMmNkNDYyOGM1MTYyMzEzZjQ5ZjVkNDU1NmY4YWFmZGYzODc1MC4xMTUxMy5wbmciLAogICAgICAgICAgICAidGl0bGUiOiAiTW96aWxsYSBNYW5pZmVzdG8iLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHBzOi8vd3d3Lm1vemlsbGEub3JnL2Fib3V0L21hbmlmZXN0by8iCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDUwMiwKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy80MGU1NjMwNDA1ZDUwMzFjYTczMzkzYmQ3YmMwMDY0MTU2ZjJjYzgyLjEwOTg0LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzQ5MGQ0MmQxZjlhNzZjMDc3Mzk2MjZkMWI4YTU2OTE2OWFlYzhmYmUuMTEwMzkucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIkN1c3RvbWl6ZSBGaXJlZm94IiwKICAgICAgICAgICAgInR5cGUiOiAiYWZmaWxpYXRlIiwKICAgICAgICAgICAgInVybCI6ICJodHRwOi8vZmFzdGVzdGZpcmVmb3guY29tL2ZpcmVmb3gvZGVza3RvcC9jdXN0b21pemUvIgogICAgICAgIH0sCiAgICAgICAgewogICAgICAgICAgICAiYmdDb2xvciI6ICIiLAogICAgICAgICAgICAiZGlyZWN0b3J5SWQiOiA1MDQsCiAgICAgICAgICAgICJlbmhhbmNlZEltYWdlVVJJIjogImh0dHBzOi8vZHRleDRrdmJwcG92dC5jbG91ZGZyb250Lm5ldC9pbWFnZXMvODc3ZjFjNTYxZTczNWY3YjlmNDE5ZmY5YWM3OWViOGM3NDgxMTE5ZC4xNjc0NC5wbmciLAogICAgICAgICAgICAiaW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy8yNWM5ZmJiMDczMDhiODRkMTYwZmMxYjc5NTkzNjRhMmMxOGY5M2I5LjY0MDQucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIkZpcmVmb3ggTWFya2V0cGxhY2UiLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHBzOi8vbWFya2V0cGxhY2UuZmlyZWZveC5jb20vIgogICAgICAgIH0sCiAgICAgICAgewogICAgICAgICAgICAiYmdDb2xvciI6ICIjM2ZiNThlIiwKICAgICAgICAgICAgImRpcmVjdG9yeUlkIjogNTA1LAogICAgICAgICAgICAiZW5oYW5jZWRJbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzcyMDEyMWU3NDYyZDhjNzg2M2I0ZGQ4ZmE3YjVjMTA4OWI1ZjVmYjIuMzM4NjIucG5nIiwKICAgICAgICAgICAgImltYWdlVVJJIjogImh0dHBzOi8vZHRleDRrdmJwcG92dC5jbG91ZGZyb250Lm5ldC9pbWFnZXMvMGU2MDMxNjc1YTljNDkxZGQwYzY1ZTljNjdjZmJmNTRhNTg4MGYxNy4yMjk1LnN2ZyIsCiAgICAgICAgICAgICJ0aXRsZSI6ICJNb3ppbGxhIFdlYm1ha2VyIiwKICAgICAgICAgICAgInR5cGUiOiAiYWZmaWxpYXRlIiwKICAgICAgICAgICAgInVybCI6ICJodHRwczovL3dlYm1ha2VyLm9yZy8%2FdXRtX3NvdXJjZT1kaXJlY3RvcnktdGlsZXMmdXRtX21lZGl1bT1maXJlZm94LWJyb3dzZXIiCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDUwNiwKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy9kOTcxY2JhZmEwMzA5YTIwMWU1MThhY2RhYzRmMWVlNGRhYmM3ZWFhLjE1MTA5LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzL2I0YWRjNThkZDNjMDJkYTM1NTEwNDk3N2I5MTAyNTUwNjBjZmQ2ZDguMTAzNTAucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIkZpcmVmb3ggU3luYyIsCiAgICAgICAgICAgICJ0eXBlIjogImFmZmlsaWF0ZSIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL21vemlsbGEtZXVyb3BlLm9yZy9maXJlZm94L3N5bmMiCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDUwNywKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy8yMmZiODU2Y2Q1ODM2NTg1NWViNzI1YjE1NjVmMDhhNzI0NjRlMDM5LjE4NzE3LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzA2OGUwY2NiZDg3MDFhMjhlMmYwNzhjNjQwZWUwNzJiOWExNmUyZTEuMTI0OTAucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIlByaXZhY3kgUHJpbmNpcGxlcyIsCiAgICAgICAgICAgICJ0eXBlIjogImFmZmlsaWF0ZSIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL2V1cm9wZS5tb3ppbGxhLm9yZy9wcml2YWN5L3lvdSIKICAgICAgICB9CiAgICBdLAogICAgInN1Z2dlc3RlZCI6IFsKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiNjYWUxZjQiLAogICAgICAgICAgICAiZGlyZWN0b3J5SWQiOiA3MDIsCiAgICAgICAgICAgICJmcmVjZW50X3NpdGVzIjogWwogICAgICAgICAgICAgICAgImFkZG9ucy5tb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAiYWlyLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJibG9nLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJidWd6aWxsYS5tb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAiZGV2ZWxvcGVyLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJldGhlcnBhZC5tb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAiaGFja3MubW96aWxsYS5vcmciLAogICAgICAgICAgICAgICAgImhnLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJtb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAicGxhbmV0Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJxdWFsaXR5Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJzdXBwb3J0Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJzdXBwb3J0Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJ0cmVlaGVyZGVyLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJ3aWtpLm1vemlsbGEub3JnIgogICAgICAgICAgICBdLAogICAgICAgICAgICAiaW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy85ZWUyYjI2NTY3OGYyNzc1ZGUyZTRiZjY4MGRmNjAwYjUwMmU2MDM4LjM4NzUucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIlRoYW5rcyBmb3IgdGVzdGluZyEiLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHBzOi8vd3d3Lm1vemlsbGEuY29tL2ZpcmVmb3gvdGlsZXMiCiAgICAgICAgfQogICAgXQp9Cg%3D%3D";
- }
}
catch (e) {
Cu.reportError("Error fetching directory links url from prefs: " + e);
@@ -431,6 +454,14 @@ let DirectoryLinksProvider = {
this._enhancedLinks.get(NewTabUtils.extractSite(link.url));
},
+ /**
+ * Get the display name of an allowed frecent sites. Returns undefined for a
+ * unallowed frecent sites.
+ */
+ getFrecentSitesName(sites) {
+ return ALLOWED_FRECENT_SITES.get(sites.join(","));
+ },
+
/**
* Check if a url's scheme is in a Set of allowed schemes
*/
@@ -468,6 +499,13 @@ let DirectoryLinksProvider = {
}.bind(this);
rawLinks.suggested.filter(validityFilter).forEach((link, position) => {
+ // Only allow suggested links with approved frecent sites
+ let name = this.getFrecentSitesName(link.frecent_sites);
+ if (name == undefined) {
+ return;
+ }
+
+ link.targetedName = name;
link.lastVisitDate = rawLinks.suggested.length - position;
// We cache suggested tiles here but do not push any of them in the links list yet.
diff --git a/browser/modules/ReaderParent.jsm b/browser/modules/ReaderParent.jsm
index df4d4560f78..95a0f1b67d3 100644
--- a/browser/modules/ReaderParent.jsm
+++ b/browser/modules/ReaderParent.jsm
@@ -22,6 +22,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "UITour", "resource:///modules/UITour.js
const gStringBundle = Services.strings.createBundle("chrome://global/locale/aboutReader.properties");
let ReaderParent = {
+ _readerModeInfoPanelOpen: false,
MESSAGES: [
"Reader:AddToList",
@@ -187,6 +188,20 @@ let ReaderParent = {
command.setAttribute("hidden", !browser.isArticle);
command.setAttribute("accesskey", gStringBundle.GetStringFromName("readerView.enter.accesskey"));
}
+
+ let currentUriHost = browser.currentURI && browser.currentURI.asciiHost;
+ if (browser.isArticle &&
+ !Services.prefs.getBoolPref("browser.reader.detectedFirstArticle") &&
+ currentUriHost && !currentUriHost.endsWith("mozilla.org")) {
+ this.showReaderModeInfoPanel(browser);
+ Services.prefs.setBoolPref("browser.reader.detectedFirstArticle", true);
+ this._readerModeInfoPanelOpen = true;
+ } else if (this._readerModeInfoPanelOpen) {
+ if (UITour.isInfoOnTarget(win, "readerMode-urlBar")) {
+ UITour.hideInfo(win);
+ }
+ this._readerModeInfoPanelOpen = false;
+ }
},
forceShowReaderIcon: function(browser) {
@@ -228,10 +243,16 @@ let ReaderParent = {
let targetPromise = UITour.getTarget(win, "readerMode-urlBar");
targetPromise.then(target => {
let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
+ let icon = "chrome://browser/skin/";
+ if (win.devicePixelRatio > 1) {
+ icon += "reader-tour@2x.png";
+ } else {
+ icon += "reader-tour.png";
+ }
UITour.showInfo(win, browser.messageManager, target,
- browserBundle.GetStringFromName("readerView.promo.firstDetectedArticle.title"),
- browserBundle.GetStringFromName("readerView.promo.firstDetectedArticle.body"),
- "chrome://browser/skin/reader-tour.png");
+ browserBundle.GetStringFromName("readingList.promo.firstUse.readerView.title"),
+ browserBundle.GetStringFromName("readingList.promo.firstUse.readerView.body"),
+ icon);
});
},
diff --git a/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js b/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
index 7faa9d97ac4..1d5a1ac5249 100644
--- a/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
+++ b/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
@@ -269,6 +269,9 @@ add_task(function test_updateSuggestedTile() {
let testObserver = new TestFirstRun();
DirectoryLinksProvider.addObserver(testObserver);
+ let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+ DirectoryLinksProvider.getFrecentSitesName = () => "";
+
yield promiseSetupDirectoryLinksProvider({linksURL: dataURI});
let links = yield fetchData();
@@ -383,6 +386,7 @@ add_task(function test_updateSuggestedTile() {
// Cleanup
yield promiseCleanDirectoryLinksProvider();
+ DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
NewTabUtils.getProviderLinks = origGetProviderLinks;
DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
@@ -421,6 +425,9 @@ add_task(function test_suggestedLinksMap() {
});
add_task(function test_topSitesWithSuggestedLinks() {
+ let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+ DirectoryLinksProvider.getFrecentSitesName = () => "";
+
let topSites = ["site0.com", "1040.com", "site2.com", "hrblock.com", "site4.com", "freetaxusa.com", "site6.com"];
let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
NewTabUtils.isTopPlacesSite = function(site) {
@@ -468,6 +475,7 @@ add_task(function test_topSitesWithSuggestedLinks() {
isIdentical([...DirectoryLinksProvider._topSitesWithSuggestedLinks], expectedTopSitesWithSuggestedLinks);
// Cleanup.
+ DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
NewTabUtils.getProviderLinks = origGetProviderLinks;
});
@@ -479,7 +487,7 @@ add_task(function test_suggestedAttributes() {
let origCurrentTopSiteCount = DirectoryLinksProvider._getCurrentTopSiteCount;
DirectoryLinksProvider._getCurrentTopSiteCount = () => 8;
- let frecent_sites = ["top.site.com"];
+ let frecent_sites = "addons.mozilla.org,air.mozilla.org,blog.mozilla.org,bugzilla.mozilla.org,developer.mozilla.org,etherpad.mozilla.org,forums.mozillazine.org,hacks.mozilla.org,hg.mozilla.org,mozilla.org,planet.mozilla.org,quality.mozilla.org,support.mozilla.org,treeherder.mozilla.org,wiki.mozilla.org".split(",");
let imageURI = "https://image/";
let title = "the title";
let type = "affiliate";
@@ -514,6 +522,7 @@ add_task(function test_suggestedAttributes() {
// Make sure we get the expected attributes on the suggested tile
let link = gLinks.getLinks()[0];
do_check_eq(link.imageURI, imageURI);
+ do_check_eq(link.targetedName, "Mozilla");
do_check_eq(link.targetedSite, frecent_sites[0]);
do_check_eq(link.title, title);
do_check_eq(link.type, type);
@@ -528,6 +537,8 @@ add_task(function test_suggestedAttributes() {
add_task(function test_frequencyCappedSites_views() {
Services.prefs.setCharPref(kPingUrlPref, "");
+ let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+ DirectoryLinksProvider.getFrecentSitesName = () => "";
let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
NewTabUtils.isTopPlacesSite = () => true;
@@ -594,6 +605,7 @@ add_task(function test_frequencyCappedSites_views() {
checkFirstTypeAndLength("organic", 1);
// Cleanup.
+ DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
gLinks.removeProvider(DirectoryLinksProvider);
@@ -603,6 +615,8 @@ add_task(function test_frequencyCappedSites_views() {
add_task(function test_frequencyCappedSites_click() {
Services.prefs.setCharPref(kPingUrlPref, "");
+ let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+ DirectoryLinksProvider.getFrecentSitesName = () => "";
let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
NewTabUtils.isTopPlacesSite = () => true;
@@ -663,6 +677,7 @@ add_task(function test_frequencyCappedSites_click() {
checkFirstTypeAndLength("organic", 1);
// Cleanup.
+ DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
gLinks.removeProvider(DirectoryLinksProvider);
@@ -1139,6 +1154,8 @@ add_task(function test_DirectoryLinksProvider_getEnhancedLink() {
});
add_task(function test_DirectoryLinksProvider_enhancedURIs() {
+ let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+ DirectoryLinksProvider.getFrecentSitesName = () => "";
let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
NewTabUtils.isTopPlacesSite = () => true;
let origCurrentTopSiteCount = DirectoryLinksProvider._getCurrentTopSiteCount;
@@ -1182,6 +1199,7 @@ add_task(function test_DirectoryLinksProvider_enhancedURIs() {
do_check_eq(links[0].enhancedImageURI, "data:,net1");
// Cleanup.
+ DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
gLinks.removeProvider(DirectoryLinksProvider);
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index f2829392e15..051692eb97e 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -94,6 +94,7 @@ browser.jar:
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
+ skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/readinglist/icons.svg (../shared/readinglist/icons.svg)
skin/classic/browser/readinglist/readinglist-icon.svg (../shared/readinglist/readinglist-icon.svg)
diff --git a/browser/themes/linux/preferences/in-content/preferences.css b/browser/themes/linux/preferences/in-content/preferences.css
index 83436b9c279..11f22340efd 100644
--- a/browser/themes/linux/preferences/in-content/preferences.css
+++ b/browser/themes/linux/preferences/in-content/preferences.css
@@ -4,10 +4,6 @@
%include ../../../shared/incontentprefs/preferences.inc.css
-spinbuttons {
- -moz-appearance: none;
-}
-
.treecol-sortdirection {
/* override the Linux only toolkit rule */
-moz-appearance: none;
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index f7645cf5c9c..9b7d1a67d4c 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -146,6 +146,7 @@ browser.jar:
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
+ skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/readinglist/icons.svg (../shared/readinglist/icons.svg)
skin/classic/browser/readinglist/readinglist-icon.svg (../shared/readinglist/readinglist-icon.svg)
diff --git a/browser/themes/osx/preferences/in-content/preferences.css b/browser/themes/osx/preferences/in-content/preferences.css
index 761841fe476..0ba5d47fb82 100644
--- a/browser/themes/osx/preferences/in-content/preferences.css
+++ b/browser/themes/osx/preferences/in-content/preferences.css
@@ -9,29 +9,6 @@ prefpane .groupbox-title {
margin-bottom: 0;
}
-spinbuttons {
- -moz-appearance: none;
-}
-
-.spinbuttons-up {
- margin-top: 0 !important;
- border-radius: 4px 4px 0 0;
-}
-
-.spinbuttons-down {
- margin-bottom: 0 !important;
- border-radius: 0 0 4px 4px;
-}
-
-.spinbuttons-button > .button-box {
- -moz-padding-start: 2px !important;
- -moz-padding-end: 3px !important;
-}
-
-.spinbuttons-button > .button-box > .button-text {
- display: none;
-}
-
.actionsMenu > .menulist-label-box > .menulist-icon {
margin-top: 2px;
-moz-margin-start: 2px;
diff --git a/browser/themes/shared/devtools/toolbars.inc.css b/browser/themes/shared/devtools/toolbars.inc.css
index 4f74214ee5a..169c8031832 100644
--- a/browser/themes/shared/devtools/toolbars.inc.css
+++ b/browser/themes/shared/devtools/toolbars.inc.css
@@ -878,9 +878,12 @@
background-color: rgba(170,170,170,.4);
}
+.devtools-tab:not([selected])[highlighted] {
+ box-shadow: 0 2px 0 var(--theme-highlight-green) inset;
+}
+
.theme-dark .devtools-tab:not([selected])[highlighted] {
background-color: hsla(99,100%,14%,.2);
- box-shadow: 0 2px 0 #7bc107 inset;
}
.theme-light .devtools-tab:not([selected])[highlighted] {
diff --git a/browser/themes/shared/reader/reader-tour.png b/browser/themes/shared/reader/reader-tour.png
index 8e557e03821..be346b38479 100644
Binary files a/browser/themes/shared/reader/reader-tour.png and b/browser/themes/shared/reader/reader-tour.png differ
diff --git a/browser/themes/shared/reader/reader-tour@2x.png b/browser/themes/shared/reader/reader-tour@2x.png
new file mode 100644
index 00000000000..1a60d93ca93
Binary files /dev/null and b/browser/themes/shared/reader/reader-tour@2x.png differ
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index c8c3fa3fe7d..8a7186e6e13 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -123,6 +123,7 @@ browser.jar:
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
+ skin/classic/browser/reader-tour@2x.png (../shared/reader/reader-tour@2x.png)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/readinglist/icons.svg (../shared/readinglist/icons.svg)
skin/classic/browser/readinglist/readinglist-icon.svg (../shared/readinglist/readinglist-icon.svg)
diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index 353bb241c2f..b7f17f50a37 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -49,45 +49,13 @@ manifest_FLAGS += \
ANDROID_MANIFEST_FILE := $(CURDIR)/AndroidManifest.xml
-# Install robocop configs and helper
-INSTALL_TARGETS += robocop
-robocop_TARGET := export
-robocop_DEST := $(CURDIR)
-robocop_FILES := \
- $(TESTPATH)/robocop.ini \
- $(TESTPATH)/robocop_autophone.ini \
- $(NULL)
-robocop-deps := $(notdir $(robocop_FILES))
-
-ROBOCOP_FILES := \
- $(wildcard $(TESTPATH)/*.html) \
- $(wildcard $(TESTPATH)/*.jpg) \
- $(wildcard $(TESTPATH)/*.sjs) \
- $(wildcard $(TESTPATH)/test*.js) \
- $(wildcard $(TESTPATH)/robocop*.js) \
- $(wildcard $(TESTPATH)/*.xml) \
- $(wildcard $(TESTPATH)/*.ogg) \
- $(wildcard $(TESTPATH)/*.mp4) \
- $(wildcard $(TESTPATH)/*.webm) \
- $(wildcard $(TESTPATH)/*.swf) \
- $(wildcard $(TESTPATH)/reader_mode_pages) \
- $(NULL)
-
-ROBOCOP_DEST := $(DEPTH)/_tests/testing/mochitest/tests/robocop/
-ROBOCOP_TARGET := export
-INSTALL_TARGETS += ROBOCOP
-
GARBAGE += \
AndroidManifest.xml \
- $(robocop-deps) \
- $(testconstants-dep) \
$(NULL)
JAVAFILES += \
$(java-harness) \
$(java-tests) \
- $(robocop-deps) \
- $(testconstants-dep) \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build
index 12d61eb171d..70c4e125b6c 100644
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -18,3 +18,23 @@ main.add_classpathentry('harness', SRCDIR,
dstdir='harness/org/mozilla/gecko')
main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests',
dstdir='src/org/mozilla/gecko/tests')
+
+base = '/mobile/android/base/tests/'
+TEST_HARNESS_FILES.testing.mochitest += [
+ base + 'robocop.ini',
+ base + 'robocop_autophone.ini',
+]
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop += [base + x for x in [
+ '*.html',
+ '*.jpg',
+ '*.mp4',
+ '*.ogg',
+ '*.sjs',
+ '*.swf',
+ '*.webm',
+ '*.xml',
+ 'robocop*.js',
+ 'test*.js',
+]]
+# The ** below preserves directory structure.
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop.reader_mode_pages += [base + 'reader_mode_pages/**']
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index e2c4a80aace..bdfe312b54d 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3794,10 +3794,11 @@ EventStateManager::DispatchMouseOrPointerEvent(WidgetMouseEvent* aMouseEvent,
// event to the remote frame.
if (IsRemoteTarget(aTargetContent)) {
if (aMessage == NS_MOUSE_EXIT_SYNTH) {
- // For remote content, send a normal widget mouse exit event.
+ // For remote content, send a "top-level" widget mouse exit event.
nsAutoPtr
remoteEvent;
CreateMouseOrPointerWidgetEvent(aMouseEvent, NS_MOUSE_EXIT,
aRelatedContent, remoteEvent);
+ remoteEvent->exit = WidgetMouseEvent::eTopLevel;
// mCurrentTarget is set to the new target, so we must reset it to the
// old target and then dispatch a cross-process event. (mCurrentTarget
diff --git a/js/src/devtools/automation/winbuildenv.sh b/js/src/devtools/automation/winbuildenv.sh
index 78030a9b898..ef09727c96f 100644
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -34,7 +34,7 @@ export PATH="$(perl -le 'print join ":", grep { -d $_ } split ":", $ENV{PATH}')"
if ! which mozmake 2>/dev/null; then
export PATH="$PATH:$SOURCE/.."
if ! which mozmake 2>/dev/null; then
- TT_SERVER=${TT_SERVER:-http://tooltool.pvt.build.mozilla.org/build}
+ TT_SERVER=${TT_SERVER:-https://api.pub.build.mozilla.org/tooltool/}
( cd $SOURCE/..; ./scripts/scripts/tooltool/tooltool_wrapper.sh $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest $TT_SERVER setup.sh c:/mozilla-build/python27/python.exe C:/mozilla-build/tooltool.py )
fi
fi
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 8df23588040..2cf018ddc47 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -120,6 +120,7 @@ IsBidiUI()
nsCaret::nsCaret()
: mOverrideOffset(0)
, mIsBlinkOn(false)
+, mBlinkCount(-1)
, mVisible(false)
, mReadOnly(false)
, mShowDuringSelection(false)
@@ -594,6 +595,7 @@ void nsCaret::ResetBlinking()
uint32_t blinkRate = static_cast(
LookAndFeel::GetInt(LookAndFeel::eIntID_CaretBlinkTime, 500));
if (blinkRate > 0) {
+ mBlinkCount = Preferences::GetInt("ui.caretBlinkCount", -1);
mBlinkTimer->InitWithFuncCallback(CaretBlinkCallback, this, blinkRate,
nsITimer::TYPE_REPEATING_SLACK);
}
@@ -913,6 +915,19 @@ void nsCaret::CaretBlinkCallback(nsITimer* aTimer, void* aClosure)
}
theCaret->mIsBlinkOn = !theCaret->mIsBlinkOn;
theCaret->SchedulePaint();
+
+ // mBlinkCount of -1 means blink count is not enabled.
+ if (theCaret->mBlinkCount == -1) {
+ return;
+ }
+
+ // Track the blink count, but only at end of a blink cycle.
+ if (!theCaret->mIsBlinkOn) {
+ // If we exceeded the blink count, stop the timer.
+ if (--theCaret->mBlinkCount <= 0) {
+ theCaret->StopBlinking();
+ }
+ }
}
void
diff --git a/layout/base/nsCaret.h b/layout/base/nsCaret.h
index 814dd05798a..c5b8e4e2073 100644
--- a/layout/base/nsCaret.h
+++ b/layout/base/nsCaret.h
@@ -205,6 +205,12 @@ protected:
* mIsBlinkOn is true when we're in a blink cycle where the caret is on.
*/
bool mIsBlinkOn;
+ /**
+ * mBlinkCount is used to control the number of times to blink the caret
+ * before stopping the blink. This is reset each time we reset the
+ * blinking.
+ */
+ int32_t mBlinkCount;
/**
* mIsVisible is true when SetVisible was last called with 'true'.
*/
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 45bf9a8203f..fda6b857b25 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -206,9 +206,7 @@ class RefTest(object):
# Ensure that telemetry is disabled, so we don't connect to the telemetry
# server in the middle of the tests.
prefs['toolkit.telemetry.enabled'] = False
- # Don't send Telemetry reports to the production server. This is
- # needed as Telemetry sends pings also if FHR upload is enabled.
- prefs['toolkit.telemetry.server'] = 'http://%(server)s/telemetry-dummy/'
+ prefs['toolkit.telemetry.unified'] = False
# Likewise for safebrowsing.
prefs['browser.safebrowsing.enabled'] = False
prefs['browser.safebrowsing.malware.enabled'] = False
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 7845a685354..b950c88503f 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -47,6 +47,9 @@ pref("browser.viewport.defaultZoom", -1);
/* allow scrollbars to float above chrome ui */
pref("ui.scrollbarsCanOverlapContent", 1);
+/* turn off the caret blink after 10 cycles */
+pref("ui.caretBlinkCount", 10);
+
/* cache prefs */
pref("browser.cache.disk.enable", true);
pref("browser.cache.disk.capacity", 20480); // kilobytes
@@ -863,6 +866,10 @@ pref("reader.toolbar.vertical", false);
// Whether or not to display buttons related to reading list in reader view.
pref("browser.readinglist.enabled", true);
+// Telemetry settings.
+// Whether to use the unified telemetry behavior, requires a restart.
+pref("toolkit.telemetry.unified", false);
+
// Selection carets never fall-back to internal LongTap detector.
pref("selectioncaret.detects.longtap", false);
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 43b80987733..05af3bdf645 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -104,6 +104,7 @@ import android.os.Bundle;
import android.os.StrictMode;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
+import android.support.v4.view.MenuItemCompat;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Base64;
@@ -123,6 +124,7 @@ import android.view.ViewStub;
import android.view.ViewTreeObserver;
import android.view.Window;
import android.view.animation.Interpolator;
+import android.widget.Button;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.Toast;
@@ -3038,6 +3040,40 @@ public class BrowserApp extends GeckoApp
desktopMode.setChecked(tab.getDesktopMode());
desktopMode.setIcon(tab.getDesktopMode() ? R.drawable.ic_menu_desktop_mode_on : R.drawable.ic_menu_desktop_mode_off);
+ View backButtonView = MenuItemCompat.getActionView(back);
+
+ if (backButtonView != null) {
+ backButtonView.setOnLongClickListener(new Button.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ Tab tab = Tabs.getInstance().getSelectedTab();
+ if (tab != null) {
+ closeOptionsMenu();
+ return tabHistoryController.showTabHistory(tab,
+ TabHistoryController.HistoryAction.BACK);
+ }
+ return false;
+ }
+ });
+ }
+
+ View forwardButtonView = MenuItemCompat.getActionView(forward);
+
+ if (forwardButtonView != null) {
+ forwardButtonView.setOnLongClickListener(new Button.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ Tab tab = Tabs.getInstance().getSelectedTab();
+ if (tab != null) {
+ closeOptionsMenu();
+ return tabHistoryController.showTabHistory(tab,
+ TabHistoryController.HistoryAction.FORWARD);
+ }
+ return false;
+ }
+ });
+ }
+
String url = tab.getURL();
if (AboutPages.isAboutReader(url)) {
String urlFromReader = ReaderModeUtils.getUrlFromAboutReader(url);
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 647a90757db..b0f03622214 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1275,6 +1275,7 @@ public abstract class GeckoApp
mRootLayout = (OuterLayout) findViewById(R.id.root_layout);
mGeckoLayout = (RelativeLayout) findViewById(R.id.gecko_layout);
mMainLayout = (RelativeLayout) findViewById(R.id.main_layout);
+ mLayerView = (LayerView) findViewById(R.id.layer_view);
// Determine whether we should restore tabs.
mShouldRestore = getSessionRestoreState(savedInstanceState);
@@ -1414,13 +1415,12 @@ public abstract class GeckoApp
}
}
- if (mLayerView == null) {
- LayerView layerView = (LayerView) findViewById(R.id.layer_view);
- layerView.initializeView(EventDispatcher.getInstance());
- mLayerView = layerView;
- GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
- GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, layerView.getLayerClientObject()));
- }
+ // XXX our editor tests require the GeckoView to have focus to pass, so we have to
+ // manually shift focus to the GeckoView. requestFocus apparently doesn't work at
+ // this stage of starting up, so we have to unset and reset the focusability.
+ mLayerView.setFocusable(false);
+ mLayerView.setFocusable(true);
+ mLayerView.setFocusableInTouchMode(true);
}
/**
diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java
index 41bdbb04c98..9ce45f0bf6e 100644
--- a/mobile/android/base/GeckoView.java
+++ b/mobile/android/base/GeckoView.java
@@ -122,6 +122,10 @@ public class GeckoView extends LayerView
// Perform common initialization for Fennec/GeckoView.
GeckoAppShell.setLayerView(this);
+ initializeView(EventDispatcher.getInstance());
+ GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
+ GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, getLayerClientObject()));
+
// TODO: Fennec currently takes care of its own initialization, so this
// flag is a hack used in Fennec to prevent GeckoView initialization.
// This should go away once Fennec also uses GeckoView for
@@ -181,13 +185,9 @@ public class GeckoView extends LayerView
"Accessibility:Ready",
"GeckoView:Message");
- initializeView(EventDispatcher.getInstance());
-
if (GeckoThread.launch()) {
// This is the first launch, so finish initialization and go.
GeckoProfile profile = GeckoProfile.get(context).forceCreate();
- GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
- GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, getLayerClientObject()));
} else if (GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
// If Gecko is already running, that means the Activity was
diff --git a/mobile/android/base/adjust/AdjustHelper.java b/mobile/android/base/adjust/AdjustHelper.java
index 7eec04d075a..ce657ae6e7d 100644
--- a/mobile/android/base/adjust/AdjustHelper.java
+++ b/mobile/android/base/adjust/AdjustHelper.java
@@ -17,15 +17,18 @@ public class AdjustHelper implements AdjustHelperInterface {
public void onCreate(final Context context, final String maybeAppToken) {
final String environment;
final String appToken;
+ final LogLevel logLevel;
if (maybeAppToken != null) {
environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
appToken = maybeAppToken;
+ logLevel = LogLevel.WARN;
} else {
environment = AdjustConfig.ENVIRONMENT_SANDBOX;
appToken = "ABCDEFGHIJKL";
+ logLevel = LogLevel.VERBOSE;
}
AdjustConfig config = new AdjustConfig(context, appToken, environment);
- config.setLogLevel(LogLevel.VERBOSE);
+ config.setLogLevel(logLevel);
Adjust.onCreate(config);
}
diff --git a/mobile/android/base/gfx/JavaPanZoomController.java b/mobile/android/base/gfx/JavaPanZoomController.java
index d4399daaa34..d27eef80723 100644
--- a/mobile/android/base/gfx/JavaPanZoomController.java
+++ b/mobile/android/base/gfx/JavaPanZoomController.java
@@ -127,6 +127,8 @@ class JavaPanZoomController
private boolean mDefaultPrevented;
/* Whether longpress events are enabled, or suppressed by robocop tests. */
private boolean isLongpressEnabled;
+ /* Whether longpress detection should be ignored */
+ private boolean mIgnoreLongPress;
// Handler to be notified when overscroll occurs
private Overscroll mOverscroll;
@@ -393,11 +395,22 @@ class JavaPanZoomController
public void startingNewEventBlock(MotionEvent event, boolean waitingForTouchListeners) {
checkMainThread();
mSubscroller.cancel();
- if (waitingForTouchListeners && (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) {
- // this is the first touch point going down, so we enter the pending state
- // setting the state will kill any animations in progress, possibly leaving
- // the page in overscroll
- setState(PanZoomState.WAITING_LISTENERS);
+ mIgnoreLongPress = false;
+ if (waitingForTouchListeners) {
+ if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) {
+ // this is the first touch point going down, so we enter the pending state
+ // setting the state will kill any animations in progress, possibly leaving
+ // the page in overscroll
+ setState(PanZoomState.WAITING_LISTENERS);
+ } else if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_DOWN) {
+ // this is a second (or more) touch point going down, and we're waiting for
+ // the content listeners to respond. while we're waiting though we might end
+ // up triggering a long-press from the first touch point, which would be bad
+ // because from the user's point of view they are already in a multi-touch
+ // gesture. to prevent this from happening we set a flag that discards long-press
+ // gesture detections.
+ mIgnoreLongPress = true;
+ }
}
}
@@ -1357,7 +1370,7 @@ class JavaPanZoomController
@Override
public void onLongPress(MotionEvent motionEvent) {
- if (!isLongpressEnabled) {
+ if (!isLongpressEnabled || mIgnoreLongPress) {
return;
}
diff --git a/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png
index 33adefc60ab..33faec0e291 100644
Binary files a/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png and b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed.9.png
index 65e2d3e4855..04d6d800f4e 100644
Binary files a/mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed.9.png and b/mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png
index 11b3e2f242c..acb1884d790 100644
Binary files a/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png and b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png
index 02a55e12a51..d304f3c5dfc 100644
Binary files a/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png and b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png differ
diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common
index 6f134c9a1b9..e7e7022e5c0 100644
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -37,6 +37,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-warnings-as-errors
ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
+ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk.token
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
diff --git a/mobile/android/gradle/base/build.gradle b/mobile/android/gradle/base/build.gradle
index 3583f063af1..ae43dc38377 100644
--- a/mobile/android/gradle/base/build.gradle
+++ b/mobile/android/gradle/base/build.gradle
@@ -68,7 +68,7 @@ dependencies {
}
android.libraryVariants.all { variant ->
- variant.checkManifest.dependsOn generateCodeAndResources
+ variant.checkManifest.dependsOn rootProject.generateCodeAndResources
}
apply plugin: 'idea'
diff --git a/mobile/android/gradle/build.gradle b/mobile/android/gradle/build.gradle
index 18ad7607137..fcbf7a96739 100644
--- a/mobile/android/gradle/build.gradle
+++ b/mobile/android/gradle/build.gradle
@@ -26,22 +26,21 @@ repositories {
jcenter()
}
-subprojects {
- task generateCodeAndResources(type:Exec) {
- workingDir "${topobjdir}"
+task generateCodeAndResources(type:Exec) {
+ workingDir "${topobjdir}"
- commandLine "${topsrcdir}/mach"
- args 'build'
- args 'mobile/android/base/gradle-targets'
+ commandLine mozconfig.substs.GMAKE
+ args '-C'
+ args "${topobjdir}/mobile/android/base"
+ args 'gradle-targets'
- // Only show the output if something went wrong.
- ignoreExitValue = true
- standardOutput = new ByteArrayOutputStream()
- errorOutput = standardOutput
- doLast {
- if (execResult.exitValue != 0) {
- throw new GradleException("Process '${commandLine}' finished with non-zero exit value ${execResult.exitValue}:\n\n${standardOutput.toString()}")
- }
+ // Only show the output if something went wrong.
+ ignoreExitValue = true
+ standardOutput = new ByteArrayOutputStream()
+ errorOutput = standardOutput
+ doLast {
+ if (execResult.exitValue != 0) {
+ throw new GradleException("Process '${commandLine}' finished with non-zero exit value ${execResult.exitValue}:\n\n${standardOutput.toString()}")
}
}
}
diff --git a/mobile/android/gradle/omnijar/build.gradle b/mobile/android/gradle/omnijar/build.gradle
index 44ea426383f..1ed4ca36c60 100644
--- a/mobile/android/gradle/omnijar/build.gradle
+++ b/mobile/android/gradle/omnijar/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'java'
* This task runs when any input file is newer than the omnijar.
*/
task buildOmnijar(type:Exec) {
- dependsOn generateCodeAndResources
+ dependsOn rootProject.generateCodeAndResources
// Depend on all the Gecko resources.
inputs.sourceDir 'src/main/java/locales'
@@ -18,10 +18,9 @@ task buildOmnijar(type:Exec) {
workingDir "${topobjdir}"
- commandLine "${topsrcdir}/mach"
- args 'build'
+ commandLine mozconfig.substs.GMAKE
args '-C'
- args 'mobile/android/base'
+ args "${topobjdir}/mobile/android/base"
args 'gradle-omnijar'
// Only show the output if something went wrong.
diff --git a/mobile/android/gradle/preprocessed_code/build.gradle b/mobile/android/gradle/preprocessed_code/build.gradle
index 16674606b66..5386c3d476d 100644
--- a/mobile/android/gradle/preprocessed_code/build.gradle
+++ b/mobile/android/gradle/preprocessed_code/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
android {
compileSdkVersion 21
@@ -37,7 +37,7 @@ android {
}
android.libraryVariants.all { variant ->
- variant.checkManifest.dependsOn generateCodeAndResources
+ variant.checkManifest.dependsOn rootProject.generateCodeAndResources
}
diff --git a/mobile/android/gradle/preprocessed_resources/build.gradle b/mobile/android/gradle/preprocessed_resources/build.gradle
index 5c3c2b38576..3f5b379f3d6 100644
--- a/mobile/android/gradle/preprocessed_resources/build.gradle
+++ b/mobile/android/gradle/preprocessed_resources/build.gradle
@@ -24,7 +24,7 @@ android {
}
android.libraryVariants.all { variant ->
- variant.checkManifest.dependsOn generateCodeAndResources
+ variant.checkManifest.dependsOn rootProject.generateCodeAndResources
}
dependencies {
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 3a11340db34..69da0a85f94 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -179,7 +179,7 @@ pref("dom.url.encode_decode_hash", true);
// Whether to run add-on code in different compartments from browser code. This
// causes a separate compartment for each (addon, global) combination, which may
// significantly increase the number of compartments in the system.
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
pref("dom.compartment_per_addon", true);
#else
pref("dom.compartment_per_addon", false);
@@ -771,6 +771,8 @@ pref("toolkit.scrollbox.verticalScrollDistance", 3);
pref("toolkit.scrollbox.horizontalScrollDistance", 5);
pref("toolkit.scrollbox.clickToScroll.scrollDelay", 150);
+// Telemetry settings.
+// Server to submit telemetry pings to.
pref("toolkit.telemetry.server", "https://incoming.telemetry.mozilla.org");
// Telemetry server owner. Please change if you set toolkit.telemetry.server to a different server
pref("toolkit.telemetry.server_owner", "Mozilla");
@@ -779,6 +781,8 @@ pref("toolkit.telemetry.infoURL", "https://www.mozilla.org/legal/privacy/firefox
// Determines whether full SQL strings are returned when they might contain sensitive info
// i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs
pref("toolkit.telemetry.debugSlowSql", false);
+// Whether to use the unified telemetry behavior, requires a restart.
+pref("toolkit.telemetry.unified", true);
// Identity module
pref("toolkit.identity.enabled", false);
@@ -792,9 +796,9 @@ pref("devtools.errorconsole.deprecation_warnings", true);
// Disable debugging chrome
#ifdef MOZ_DEV_EDITION
-pref("devtools.chrome.enabled", true);
+sticky_pref("devtools.chrome.enabled", true);
#else
-pref("devtools.chrome.enabled", false);
+sticky_pref("devtools.chrome.enabled", false);
#endif
// Disable remote debugging protocol logging
@@ -802,9 +806,9 @@ pref("devtools.debugger.log", false);
pref("devtools.debugger.log.verbose", false);
// Disable remote debugging connections
#ifdef MOZ_DEV_EDITION
-pref("devtools.debugger.remote-enabled", true);
+sticky_pref("devtools.debugger.remote-enabled", true);
#else
-pref("devtools.debugger.remote-enabled", false);
+sticky_pref("devtools.debugger.remote-enabled", false);
#endif
pref("devtools.debugger.remote-port", 6000);
// Force debugger server binding on the loopback interface
@@ -2434,7 +2438,7 @@ pref("dom.ipc.plugins.unloadTimeoutSecs", 30);
// Asynchronous plugin initialization should only be enabled on non-e10s
// channels until some remaining bugs are resolved.
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
pref("dom.ipc.plugins.asyncInit", false);
#else
pref("dom.ipc.plugins.asyncInit", true);
@@ -4114,6 +4118,7 @@ pref("browser.history.maxStateObjectSize", 655360);
pref("xpinstall.whitelist.required", true);
// Only Firefox requires add-on signatures
pref("xpinstall.signatures.required", false);
+pref("xpinstall.signatures.infoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");
pref("extensions.alwaysUnpack", false);
pref("extensions.minCompatiblePlatformVersion", "2.0");
diff --git a/modules/libpref/prefapi.cpp b/modules/libpref/prefapi.cpp
index 5e82ba9b971..70b0e3a8dd5 100644
--- a/modules/libpref/prefapi.cpp
+++ b/modules/libpref/prefapi.cpp
@@ -140,7 +140,8 @@ static nsresult pref_DoCallback(const char* changed_pref);
enum {
kPrefSetDefault = 1,
- kPrefForceSet = 2
+ kPrefForceSet = 2,
+ kPrefStickyDefault = 4,
};
static nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, uint32_t flags);
@@ -340,7 +341,8 @@ pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, uint32_t i, void *arg)
(pref_ValueChanged(pref->defaultPref,
pref->userPref,
(PrefType) PREF_TYPE(pref)) ||
- !(pref->flags & PREF_HAS_DEFAULT))) {
+ !(pref->flags & PREF_HAS_DEFAULT) ||
+ pref->flags & PREF_STICKY_DEFAULT)) {
sourcePref = &pref->userPref;
} else {
if (argData->saveTypes == SAVE_ALL_AND_DEFAULTS) {
@@ -778,6 +780,8 @@ nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, uint32_t
{
pref_SetValue(&pref->defaultPref, &pref->flags, value, type);
pref->flags |= PREF_HAS_DEFAULT;
+ if (flags & kPrefStickyDefault)
+ pref->flags |= PREF_STICKY_DEFAULT;
if (!PREF_HAS_USER_VALUE(pref))
valueChanged = true;
}
@@ -787,9 +791,11 @@ nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, uint32_t
}
else
{
- /* If new value is same as the default value, then un-set the user value.
+ /* If new value is same as the default value and it's not a "sticky"
+ pref, then un-set the user value.
Otherwise, set the user value only if it has changed */
if ((pref->flags & PREF_HAS_DEFAULT) &&
+ !(pref->flags & PREF_STICKY_DEFAULT) &&
!pref_ValueChanged(pref->defaultPref, value, type) &&
!(flags & kPrefForceSet))
{
@@ -1002,7 +1008,12 @@ void PREF_ReaderCallback(void *closure,
const char *pref,
PrefValue value,
PrefType type,
- bool isDefault)
+ bool isDefault,
+ bool isStickyDefault)
{
- pref_HashPref(pref, value, type, isDefault ? kPrefSetDefault : kPrefForceSet);
+ uint32_t flags = isDefault ? kPrefSetDefault : kPrefForceSet;
+ if (isDefault && isStickyDefault) {
+ flags |= kPrefStickyDefault;
+ }
+ pref_HashPref(pref, value, type, flags);
}
diff --git a/modules/libpref/prefapi.h b/modules/libpref/prefapi.h
index 675b384c475..f1e412a6781 100644
--- a/modules/libpref/prefapi.h
+++ b/modules/libpref/prefapi.h
@@ -61,6 +61,8 @@ typedef enum { PREF_INVALID = 0,
PREF_LOCKED = 1, PREF_USERSET = 2, PREF_CONFIG = 4, PREF_REMOTE = 8,
PREF_LILOCAL = 16, PREF_STRING = 32, PREF_INT = 64, PREF_BOOL = 128,
PREF_HAS_DEFAULT = 256,
+ // pref is default pref with "sticky" semantics
+ PREF_STICKY_DEFAULT = 512,
PREF_VALUETYPE_MASK = (PREF_STRING | PREF_INT | PREF_BOOL)
} PrefType;
@@ -183,7 +185,8 @@ void PREF_ReaderCallback( void *closure,
const char *pref,
PrefValue value,
PrefType type,
- bool isDefault);
+ bool isDefault,
+ bool isStickyDefault);
#ifdef __cplusplus
}
diff --git a/modules/libpref/prefread.cpp b/modules/libpref/prefread.cpp
index 01612ba9402..6c4d339894f 100644
--- a/modules/libpref/prefread.cpp
+++ b/modules/libpref/prefread.cpp
@@ -44,6 +44,7 @@ enum {
static const char kUserPref[] = "user_pref";
static const char kPref[] = "pref";
+static const char kPrefSticky[] = "sticky_pref";
static const char kTrue[] = "true";
static const char kFalse[] = "false";
@@ -129,7 +130,8 @@ pref_DoCallback(PrefParseState *ps)
default:
break;
}
- (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault);
+ (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault,
+ ps->fstickydefault);
return true;
}
@@ -188,6 +190,7 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
ps->vb = nullptr;
ps->vtype = PREF_INVALID;
ps->fdefault = false;
+ ps->fstickydefault = false;
}
switch (c) {
case '/': /* begin comment block or line? */
@@ -198,7 +201,9 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
break;
case 'u': /* indicating user_pref */
case 'p': /* indicating pref */
- ps->smatch = (c == 'u' ? kUserPref : kPref);
+ case 's': /* indicating sticky_pref */
+ ps->smatch = (c == 'u' ? kUserPref :
+ (c == 's' ? kPrefSticky : kPref));
ps->sindex = 1;
ps->nextstate = PREF_PARSE_UNTIL_OPEN_PAREN;
state = PREF_PARSE_MATCH_STRING;
@@ -242,7 +247,8 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
/* name parsing */
case PREF_PARSE_UNTIL_NAME:
if (c == '\"' || c == '\'') {
- ps->fdefault = (ps->smatch == kPref);
+ ps->fdefault = (ps->smatch == kPref || ps->smatch == kPrefSticky);
+ ps->fstickydefault = (ps->smatch == kPrefSticky);
ps->quotechar = c;
ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */
state = PREF_PARSE_QUOTED_STRING;
diff --git a/modules/libpref/prefread.h b/modules/libpref/prefread.h
index 4d5ce1e958f..3c317ff044d 100644
--- a/modules/libpref/prefread.h
+++ b/modules/libpref/prefread.h
@@ -26,12 +26,15 @@ extern "C" {
* preference type (PREF_STRING, PREF_INT, or PREF_BOOL)
* @param defPref
* preference type (true: default, false: user preference)
+ * @param stickyPref
+ * default preference marked as a "sticky" pref
*/
typedef void (*PrefReader)(void *closure,
const char *pref,
PrefValue val,
PrefType type,
- bool defPref);
+ bool defPref,
+ bool stickyPref);
/* structure fields are private */
typedef struct PrefParseState {
@@ -52,6 +55,7 @@ typedef struct PrefParseState {
char *vb; /* value buffer (ptr into lb) */
PrefType vtype; /* PREF_STRING,INT,BOOL */
bool fdefault; /* true if (default) pref */
+ bool fstickydefault; /* true if (sticky) pref */
} PrefParseState;
/**
diff --git a/modules/libpref/test/unit/data/testPrefSticky.js b/modules/libpref/test/unit/data/testPrefSticky.js
new file mode 100644
index 00000000000..69b3165fb48
--- /dev/null
+++ b/modules/libpref/test/unit/data/testPrefSticky.js
@@ -0,0 +1,2 @@
+pref("testPref.unsticky.bool", true);
+sticky_pref("testPref.sticky.bool", false);
diff --git a/modules/libpref/test/unit/data/testPrefStickyUser.js b/modules/libpref/test/unit/data/testPrefStickyUser.js
new file mode 100644
index 00000000000..0ea0906813e
--- /dev/null
+++ b/modules/libpref/test/unit/data/testPrefStickyUser.js
@@ -0,0 +1,5 @@
+// testPrefSticky.js defined this pref as a sticky_pref(). Once a sticky
+// pref has been changed, it's written as a user_pref().
+// So this test file reflects that scenario.
+// Note the default in testPrefSticky.js is also false.
+user_pref("testPref.sticky.bool", false);
diff --git a/modules/libpref/test/unit/test_stickyprefs.js b/modules/libpref/test/unit/test_stickyprefs.js
new file mode 100644
index 00000000000..c2c5a7c4b74
--- /dev/null
+++ b/modules/libpref/test/unit/test_stickyprefs.js
@@ -0,0 +1,170 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/ */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+const ps = Services.prefs;
+
+// Once we fetch the profile directory the xpcshell test harness will send
+// a profile-before-change notification at shutdown. This causes the prefs
+// service to flush the prefs file - and the prefs file it uses ends up being
+// testPrefSticky*.js in the test dir. This upsets things in confusing ways :)
+// We avoid this by ensuring our "temp" prefs.js is the current prefs file.
+do_get_profile();
+do_register_cleanup(saveAndReload);
+
+// A little helper to reset the service and load some pref files
+function resetAndLoad(filenames) {
+ ps.resetPrefs();
+ for (let filename of filenames) {
+ ps.readUserPrefs(do_get_file(filename));
+ }
+}
+
+// A little helper that saves the current state to a file in the profile
+// dir, then resets the service and re-reads the file it just saved.
+// Used to test what gets actually written - things the pref service decided
+// not to write don't exist at all after this call.
+function saveAndReload() {
+ let file = do_get_profile();
+ file.append("prefs.js");
+ ps.savePrefFile(file);
+
+ // Now reset the pref service and re-read what we saved.
+ ps.resetPrefs();
+ ps.readUserPrefs(file);
+}
+
+function run_test() {
+ run_next_test();
+}
+
+// A sticky pref should not be written if the value is unchanged.
+add_test(function notWrittenWhenUnchanged() {
+ resetAndLoad(["data/testPrefSticky.js"]);
+ Assert.strictEqual(ps.getBoolPref("testPref.unsticky.bool"), true);
+ Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
+
+ // write prefs - but we haven't changed the sticky one, so it shouldn't be written.
+ saveAndReload();
+ // sticky should not have been written to the new file.
+ try {
+ ps.getBoolPref("testPref.sticky.bool");
+ Assert.ok(false, "expected failure reading this pref");
+ } catch (ex) {
+ Assert.ok(ex, "exception reading regular pref");
+ }
+ run_next_test();
+});
+
+// Loading a sticky_pref then a user_pref for the same pref means it should
+// always be written.
+add_test(function writtenOnceLoadedWithoutChange() {
+ // Load the same pref file *as well as* a pref file that has a user_pref for
+ // our sticky with the default value. It should be re-written without us
+ // touching it.
+ resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+ // reset and re-read what we just wrote - it should be written.
+ saveAndReload();
+ Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false,
+ "user_pref was written with default value");
+ run_next_test();
+});
+
+// If a sticky pref is explicicitly changed, even to the default, it is written.
+add_test(function writtenOnceLoadedWithChangeNonDefault() {
+ // Load the same pref file *as well as* a pref file that has a user_pref for
+ // our sticky - then change the pref. It should be written.
+ resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+ // Set a new val and check we wrote it.
+ ps.setBoolPref("testPref.sticky.bool", false);
+ saveAndReload();
+ Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false,
+ "user_pref was written with custom value");
+ run_next_test();
+});
+
+// If a sticky pref is changed to the non-default value, it is written.
+add_test(function writtenOnceLoadedWithChangeNonDefault() {
+ // Load the same pref file *as well as* a pref file that has a user_pref for
+ // our sticky - then change the pref. It should be written.
+ resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+ // Set a new val and check we wrote it.
+ ps.setBoolPref("testPref.sticky.bool", true);
+ saveAndReload();
+ Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), true,
+ "user_pref was written with custom value");
+ run_next_test();
+});
+
+// Test that prefHasUserValue always returns true whenever there is a sticky
+// value, even when that value matches the default. This is mainly for
+// about:config semantics - prefs with a sticky value always remain bold and
+// always offer "reset" (which fully resets and drops the sticky value as if
+// the pref had never changed.)
+add_test(function hasUserValue() {
+ // sticky pref without user value.
+ resetAndLoad(["data/testPrefSticky.js"]);
+ Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
+ Assert.ok(!ps.prefHasUserValue("testPref.sticky.bool"),
+ "should not initially reflect a user value");
+
+ ps.setBoolPref("testPref.sticky.bool", false);
+ Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
+ "should reflect a user value after set to default");
+
+ ps.setBoolPref("testPref.sticky.bool", true);
+ Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
+ "should reflect a user value after change to non-default");
+
+ ps.clearUserPref("testPref.sticky.bool");
+ Assert.ok(!ps.prefHasUserValue("testPref.sticky.bool"),
+ "should reset to no user value");
+ ps.setBoolPref("testPref.sticky.bool", false, "expected default");
+
+ // And make sure the pref immediately reflects a user value after load.
+ resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+ Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
+ Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
+ "should have a user value when loaded value is the default");
+ run_next_test();
+});
+
+// Test that clearUserPref removes the "sticky" value.
+add_test(function clearUserPref() {
+ // load things such that we have a sticky value which is the same as the
+ // default.
+ resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+ ps.clearUserPref("testPref.sticky.bool");
+
+ // Once we save prefs the sticky pref should no longer be written.
+ saveAndReload();
+ try {
+ ps.getBoolPref("testPref.sticky.bool");
+ Assert.ok(false, "expected failure reading this pref");
+ } catch (ex) {
+ Assert.ok(ex, "pref doesn't have a sticky value");
+ }
+ run_next_test();
+});
+
+// Test that a pref observer gets a notification fired when a sticky pref
+// has it's value changed to the same value as the default. The reason for
+// this behaviour is that later we might have other code that cares about a
+// pref being sticky (IOW, we notify due to the "state" of the pref changing
+// even if the value has not)
+add_test(function observerFires() {
+ // load things so there's no sticky value.
+ resetAndLoad(["data/testPrefSticky.js"]);
+
+ function observe(subject, topic, data) {
+ Assert.equal(data, "testPref.sticky.bool");
+ ps.removeObserver("testPref.sticky.bool", observe);
+ run_next_test();
+ }
+ ps.addObserver("testPref.sticky.bool", observe, false);
+
+ ps.setBoolPref("testPref.sticky.bool", ps.getBoolPref("testPref.sticky.bool"));
+ // and the observer will fire triggering the next text.
+});
diff --git a/modules/libpref/test/unit/xpcshell.ini b/modules/libpref/test/unit/xpcshell.ini
index 443d96e3bb4..2ee36ed26f9 100644
--- a/modules/libpref/test/unit/xpcshell.ini
+++ b/modules/libpref/test/unit/xpcshell.ini
@@ -11,6 +11,8 @@ support-files =
[test_bug506224.js]
[test_bug577950.js]
[test_bug790374.js]
+[test_stickyprefs.js]
+support-files = data/testPrefSticky.js data/testPrefStickyUser.js
[test_changeType.js]
[test_dirtyPrefs.js]
[test_extprefs.js]
diff --git a/services/fxaccounts/FxAccounts.jsm b/services/fxaccounts/FxAccounts.jsm
index 3836b7e76b1..deb362f139e 100644
--- a/services/fxaccounts/FxAccounts.jsm
+++ b/services/fxaccounts/FxAccounts.jsm
@@ -1068,6 +1068,12 @@ FxAccountsInternal.prototype = {
pollEmailStatus: function pollEmailStatus(currentState, sessionToken, why) {
log.debug("entering pollEmailStatus: " + why);
if (why == "start") {
+ if (this.currentTimer) {
+ log.debug("pollEmailStatus starting while existing timer is running");
+ clearTimeout(this.currentTimer);
+ this.currentTimer = null;
+ }
+
// If we were already polling, stop and start again. This could happen
// if the user requested the verification email to be resent while we
// were already polling for receipt of an earlier email.
diff --git a/services/fxaccounts/tests/xpcshell/test_accounts.js b/services/fxaccounts/tests/xpcshell/test_accounts.js
index 97d831d5953..656ec51b75f 100644
--- a/services/fxaccounts/tests/xpcshell/test_accounts.js
+++ b/services/fxaccounts/tests/xpcshell/test_accounts.js
@@ -39,11 +39,6 @@ const CONTENT_URL = "http://accounts.example.com/";
Services.prefs.setCharPref("identity.fxaccounts.remote.profile.uri", PROFILE_SERVER_URL);
Services.prefs.setCharPref("identity.fxaccounts.settings.uri", CONTENT_URL);
-
-function run_test() {
- run_next_test();
-}
-
/*
* The FxAccountsClient communicates with the remote Firefox
* Accounts auth server. Mock the server calls, with a little
@@ -264,8 +259,6 @@ add_task(function* test_getCertificate() {
// Sanity-check that our mocked client is working correctly
add_test(function test_client_mock() {
- do_test_pending();
-
let fxa = new MockFxAccounts();
let client = fxa.internal.fxAccountsClient;
do_check_eq(client._verified, false);
@@ -275,7 +268,6 @@ add_test(function test_client_mock() {
client.recoveryEmailStatus()
.then(response => {
do_check_eq(response.verified, false);
- do_test_finished();
run_next_test();
});
});
@@ -285,8 +277,6 @@ add_test(function test_client_mock() {
// Polling should detect that the email is verified, and eventually
// 'onverified' should be observed
add_test(function test_verification_poll() {
- do_test_pending();
-
let fxa = new MockFxAccounts();
let test_user = getTestUser("francine");
let login_notification_received = false;
@@ -299,7 +289,6 @@ add_test(function test_verification_poll() {
do_check_eq(user.verified, true);
do_check_eq(user.email, test_user.email);
do_check_true(login_notification_received);
- do_test_finished();
run_next_test();
});
});
@@ -326,8 +315,6 @@ add_test(function test_verification_poll() {
// poll should time out. No verifiedlogin event should be observed, and the
// internal whenVerified promise should be rejected
add_test(function test_polling_timeout() {
- do_test_pending();
-
// This test could be better - the onverified observer might fire on
// somebody else's stack, and we're not making sure that we're not receiving
// such a message. In other words, this tests either failure, or success, but
@@ -351,15 +338,13 @@ add_test(function test_polling_timeout() {
},
(fail) => {
removeObserver();
- do_test_finished();
- run_next_test();
+ fxa.signOut().then(run_next_test);
}
);
});
});
add_test(function test_getKeys() {
- do_test_pending();
let fxa = new MockFxAccounts();
let user = getTestUser("eusebius");
@@ -384,7 +369,6 @@ add_test(function test_getKeys() {
do_check_eq(user.kB, expandHex("66"));
do_check_eq(user.keyFetchToken, undefined);
do_check_eq(user.unwrapBKey, undefined);
- do_test_finished();
run_next_test();
});
});
@@ -394,8 +378,6 @@ add_test(function test_getKeys() {
// fetchAndUnwrapKeys with no keyFetchToken should trigger signOut
add_test(function test_fetchAndUnwrapKeys_no_token() {
- do_test_pending();
-
let fxa = new MockFxAccounts();
let user = getTestUser("lettuce.protheroe");
delete user.keyFetchToken
@@ -403,7 +385,6 @@ add_test(function test_fetchAndUnwrapKeys_no_token() {
makeObserver(ONLOGOUT_NOTIFICATION, function() {
log.debug("test_fetchAndUnwrapKeys_no_token observed logout");
fxa.internal.getUserAccountData().then(user => {
- do_test_finished();
run_next_test();
});
});
@@ -424,8 +405,6 @@ add_test(function test_fetchAndUnwrapKeys_no_token() {
// signs in with a verified email. Ensure that no sign-in events are triggered
// on Alice's behalf. In the end, Bob should be the signed-in user.
add_test(function test_overlapping_signins() {
- do_test_pending();
-
let fxa = new MockFxAccounts();
let alice = getTestUser("alice");
let bob = getTestUser("bob");
@@ -436,7 +415,6 @@ add_test(function test_overlapping_signins() {
fxa.internal.getUserAccountData().then(user => {
do_check_eq(user.email, bob.email);
do_check_eq(user.verified, true);
- do_test_finished();
run_next_test();
});
});
@@ -614,7 +592,7 @@ add_test(function test_accountStatus() {
(result) => {
do_check_false(result);
fxa.internal.fxAccountsClient._deletedOnServer = false;
- run_next_test();
+ fxa.signOut().then(run_next_test);
}
);
}
@@ -667,7 +645,6 @@ add_test(function test_resend_email() {
});
add_test(function test_sign_out() {
- do_test_pending();
let fxa = new MockFxAccounts();
let remoteSignOutCalled = false;
let client = fxa.internal.fxAccountsClient;
@@ -678,7 +655,6 @@ add_test(function test_sign_out() {
fxa.internal.getUserAccountData().then(user => {
do_check_eq(user, null);
do_check_true(remoteSignOutCalled);
- do_test_finished();
run_next_test();
});
});
@@ -686,7 +662,6 @@ add_test(function test_sign_out() {
});
add_test(function test_sign_out_with_remote_error() {
- do_test_pending();
let fxa = new MockFxAccounts();
let client = fxa.internal.fxAccountsClient;
let remoteSignOutCalled = false;
@@ -698,7 +673,6 @@ add_test(function test_sign_out_with_remote_error() {
fxa.internal.getUserAccountData().then(user => {
do_check_eq(user, null);
do_check_true(remoteSignOutCalled);
- do_test_finished();
run_next_test();
});
});
@@ -848,7 +822,7 @@ add_test(function test_getOAuthToken_invalid_param() {
fxa.getOAuthToken()
.then(null, err => {
do_check_eq(err.message, "INVALID_PARAMETER");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
@@ -858,7 +832,7 @@ add_test(function test_getOAuthToken_invalid_scope_array() {
fxa.getOAuthToken({scope: []})
.then(null, err => {
do_check_eq(err.message, "INVALID_PARAMETER");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
@@ -872,7 +846,7 @@ add_test(function test_getOAuthToken_misconfigure_oauth_uri() {
do_check_eq(err.message, "INVALID_PARAMETER");
// revert the pref
Services.prefs.setCharPref("identity.fxaccounts.remote.oauth.uri", "https://example.com/v1");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
@@ -886,7 +860,7 @@ add_test(function test_getOAuthToken_no_account() {
fxa.getOAuthToken({ scope: "profile" })
.then(null, err => {
do_check_eq(err.message, "NO_ACCOUNT");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
@@ -898,7 +872,7 @@ add_test(function test_getOAuthToken_unverified() {
fxa.getOAuthToken({ scope: "profile" })
.then(null, err => {
do_check_eq(err.message, "UNVERIFIED_ACCOUNT");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
});
@@ -1071,7 +1045,7 @@ add_test(function test_getSignedInUserProfile_error_uses_account_data() {
fxa.getSignedInUserProfile()
.catch(error => {
do_check_eq(error.message, "UNKNOWN_ERROR");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
@@ -1087,7 +1061,7 @@ add_test(function test_getSignedInUserProfile_unverified_account() {
fxa.getSignedInUserProfile()
.catch(error => {
do_check_eq(error.message, "UNVERIFIED_ACCOUNT");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
@@ -1103,7 +1077,7 @@ add_test(function test_getSignedInUserProfile_no_account_data() {
fxa.getSignedInUserProfile()
.catch(error => {
do_check_eq(error.message, "NO_ACCOUNT");
- run_next_test();
+ fxa.signOut().then(run_next_test);
});
});
diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build
index 36b0d981639..5c5bac2221a 100644
--- a/testing/mochitest/moz.build
+++ b/testing/mochitest/moz.build
@@ -70,12 +70,6 @@ TEST_HARNESS_FILES.testing.mochitest += [
'server.js',
]
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
- TEST_HARNESS_FILES.testing.mochitest += [
- '/mobile/android/base/tests/robocop.ini',
- '/mobile/android/base/tests/robocop_autophone.ini',
- ]
-
TEST_HARNESS_FILES.testing.mochitest.pywebsocket += [
'pywebsocket/standalone.py',
]
diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index e0192afbb9a..08e84bd40a2 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -492,17 +492,15 @@ def main(args):
auto.setDeviceManager(dm)
options = parser.verifyRemoteOptions(options, auto)
+ if options is None:
+ raise ValueError("Invalid options specified, use --help for a list of valid options")
+
mochitest = MochiRemote(auto, dm, options)
log = mochitest.log
message_logger.logger = log
mochitest.message_logger = message_logger
- if (options is None):
- log.error(
- "Invalid options specified, use --help for a list of valid options")
- return 1
-
productPieces = options.remoteProductName.split('.')
if (productPieces is not None):
auto.setProduct(productPieces[0])
diff --git a/testing/mozbase/mozlog/mozlog/structured/commandline.py b/testing/mozbase/mozlog/mozlog/structured/commandline.py
index d4a993febe5..2ea9214da36 100644
--- a/testing/mozbase/mozlog/mozlog/structured/commandline.py
+++ b/testing/mozbase/mozlog/mozlog/structured/commandline.py
@@ -179,6 +179,8 @@ def setup_logging(suite, args, defaults=None):
formatters = defaultdict(list)
found = False
found_stdout_logger = False
+ if args is None:
+ args = {}
if not hasattr(args, 'iteritems'):
args = vars(args)
diff --git a/testing/mozharness/mozharness.json b/testing/mozharness/mozharness.json
index ea595d806b2..6ae6934b132 100644
--- a/testing/mozharness/mozharness.json
+++ b/testing/mozharness/mozharness.json
@@ -1,4 +1,4 @@
{
"repo": "https://hg.mozilla.org/build/mozharness",
- "revision": "fa7ea67fc5a2"
+ "revision": "ca580fcfa627"
}
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index 2a8f50e903f..0d748971a09 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -309,8 +309,9 @@ user_pref("browser.tabs.remote.autostart.2", false);
// Don't forceably kill content processes after a timeout
user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);
-// Avoid performing Readinglist Intro during tests.
+// Avoid performing Reading List and Reader Mode intros during tests.
user_pref("browser.readinglist.introShown", true);
+user_pref("browser.reader.detectedFirstArticle", true);
// Don't let PAC generator to set PAC, as mochitest framework has its own PAC
// rules during testing.
diff --git a/toolkit/components/places/PlacesDBUtils.jsm b/toolkit/components/places/PlacesDBUtils.jsm
index b8f4e1affc1..d759f226460 100644
--- a/toolkit/components/places/PlacesDBUtils.jsm
+++ b/toolkit/components/places/PlacesDBUtils.jsm
@@ -67,7 +67,6 @@ this.PlacesDBUtils = {
}
// Notify observers that maintenance finished.
- Services.prefs.setIntPref("places.database.lastMaintenance", parseInt(Date.now() / 1000));
Services.obs.notifyObservers(null, FINISHED_MAINTENANCE_TOPIC, null);
}
},
@@ -94,7 +93,12 @@ this.PlacesDBUtils = {
, this._refreshUI
]);
tasks._telemetryStart = Date.now();
- tasks.callback = aCallback;
+ tasks.callback = function() {
+ Services.prefs.setIntPref("places.database.lastMaintenance",
+ parseInt(Date.now() / 1000));
+ if (aCallback)
+ aCallback();
+ }
tasks.scope = aScope;
this._executeTasks(tasks);
},
diff --git a/toolkit/components/places/tests/unit/test_preventive_maintenance.js b/toolkit/components/places/tests/unit/test_preventive_maintenance.js
index 1f4a616432f..bc87e6bad98 100644
--- a/toolkit/components/places/tests/unit/test_preventive_maintenance.js
+++ b/toolkit/components/places/tests/unit/test_preventive_maintenance.js
@@ -1279,14 +1279,17 @@ add_task(function test_preventive_maintenance()
stmt.finalize();
do_check_true(defaultBookmarksMaxId > 0);
- for ([, test] in Iterator(tests)) {
+ for (let [, test] in Iterator(tests)) {
dump("\nExecuting test: " + test.name + "\n" + "*** " + test.desc + "\n");
yield test.setup();
let promiseMaintenanceFinished =
promiseTopicObserved(FINISHED_MAINTENANCE_NOTIFICATION_TOPIC);
- PlacesDBUtils.maintenanceOnIdle();
+ Services.prefs.clearUserPref("places.database.lastMaintenance");
+ let callbackInvoked = false;
+ PlacesDBUtils.maintenanceOnIdle(() => callbackInvoked = true);
yield promiseMaintenanceFinished;
+ do_check_true(callbackInvoked);
// Check the lastMaintenance time has been saved.
do_check_neq(Services.prefs.getIntPref("places.database.lastMaintenance"), null);
diff --git a/toolkit/components/places/tests/unit/test_telemetry.js b/toolkit/components/places/tests/unit/test_telemetry.js
index 7c6ddae2e7b..2853c9e47ff 100644
--- a/toolkit/components/places/tests/unit/test_telemetry.js
+++ b/toolkit/components/places/tests/unit/test_telemetry.js
@@ -126,6 +126,7 @@ add_task(function test_execute()
});
add_test(function test_healthreport_callback() {
+ Services.prefs.clearUserPref("places.database.lastMaintenance");
PlacesDBUtils.telemetry(null, function onResult(data) {
do_check_neq(data, null);
@@ -133,6 +134,7 @@ add_test(function test_healthreport_callback() {
do_check_eq(data.PLACES_PAGES_COUNT, 1);
do_check_eq(data.PLACES_BOOKMARKS_COUNT, 1);
+ do_check_true(!Services.prefs.prefHasUserValue("places.database.lastMaintenance"));
run_next_test();
});
});
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index e081ef3fe56..982bc9fd702 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3045,6 +3045,7 @@
"high": "150000",
"n_buckets": 20,
"extended_statistics_ok": true,
+ "releaseChannelCollection": "opt-out",
"description": "PLACES: Number of unique pages"
},
"PLACES_BOOKMARKS_COUNT": {
@@ -3054,6 +3055,7 @@
"high": "8000",
"n_buckets": 15,
"extended_statistics_ok": true,
+ "releaseChannelCollection": "opt-out",
"description": "PLACES: Number of bookmarks"
},
"PLACES_TAGS_COUNT": {
@@ -4863,12 +4865,14 @@
"expires_in_version": "never",
"kind": "count",
"keyed": true,
+ "releaseChannelCollection": "opt-out",
"description": "Record the search counts for search engines"
},
"SEARCH_DEFAULT_ENGINE": {
"expires_in_version": "never",
"kind": "flag",
"keyed": true,
+ "releaseChannelCollection": "opt-out",
"description": "Record the default search engine."
},
"SEARCH_SERVICE_INIT_MS": {
@@ -7496,7 +7500,7 @@
"kind": "boolean",
"description": "Stores 1 every time the URL is copied or shared."
},
- "LOOP_TWO_WAY_MEDIA_CONN_LENGTH": {
+ "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1": {
"alert_emails": ["firefox-dev@mozilla.org", "dmose@mozilla.com"],
"expires_in_version": "43",
"kind": "enumerated",
@@ -7504,7 +7508,7 @@
"releaseChannelCollection": "opt-out",
"description": "Connection length for bi-directionally connected media (0=SHORTER_THAN_10S, 1=BETWEEN_10S_AND_30S, 2=BETWEEN_30S_AND_5M, 3=MORE_THAN_5M)"
},
- "LOOP_SHARING_STATE_CHANGE": {
+ "LOOP_SHARING_STATE_CHANGE_1": {
"alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
"expires_in_version": "43",
"kind": "enumerated",
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 80f4645ffbb..865fe190a3c 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -1106,13 +1106,16 @@ HistogramAdd(Histogram& histogram, int32_t value, uint32_t dataset)
return NS_OK;
}
- histogram.Add(value);
#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
if (Histogram* subsession = GetSubsessionHistogram(histogram)) {
subsession->Add(value);
}
#endif
+ // It is safe to add to the histogram now: the subsession histogram was already
+ // cloned from this so we won't add the sample twice.
+ histogram.Add(value);
+
return NS_OK;
}
diff --git a/toolkit/components/telemetry/TelemetryController.jsm b/toolkit/components/telemetry/TelemetryController.jsm
index 8f38f04587e..403b8adf717 100644
--- a/toolkit/components/telemetry/TelemetryController.jsm
+++ b/toolkit/components/telemetry/TelemetryController.jsm
@@ -21,6 +21,7 @@ Cu.import("resource://gre/modules/PromiseUtils.jsm", this);
Cu.import("resource://gre/modules/Task.jsm", this);
Cu.import("resource://gre/modules/DeferredTask.jsm", this);
Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
const LOGGER_NAME = "Toolkit.Telemetry";
const LOGGER_PREFIX = "TelemetryController::";
@@ -35,6 +36,11 @@ const PREF_CACHED_CLIENTID = PREF_BRANCH + "cachedClientID";
const PREF_FHR_ENABLED = "datareporting.healthreport.service.enabled";
const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
const PREF_SESSIONS_BRANCH = "datareporting.sessions.";
+const PREF_UNIFIED = PREF_BRANCH + "unified";
+
+// Whether the FHR/Telemetry unification features are enabled.
+// Changing this pref requires a restart.
+const IS_UNIFIED_TELEMETRY = Preferences.get(PREF_UNIFIED, false);
const PING_FORMAT_VERSION = 4;
@@ -47,6 +53,12 @@ const DEFAULT_RETENTION_DAYS = 14;
// Timeout after which we consider a ping submission failed.
const PING_SUBMIT_TIMEOUT_MS = 2 * 60 * 1000;
+// We treat pings before midnight as happening "at midnight" with this tolerance.
+const MIDNIGHT_TOLERANCE_MS = 15 * 60 * 1000;
+// We try to spread "midnight" pings out over this interval.
+const MIDNIGHT_FUZZING_INTERVAL_MS = 60 * 60 * 1000;
+const MIDNIGHT_FUZZING_DELAY_MS = Math.random() * MIDNIGHT_FUZZING_INTERVAL_MS;
+
XPCOMUtils.defineLazyModuleGetter(this, "ClientID",
"resource://gre/modules/ClientID.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
@@ -114,11 +126,30 @@ function isNewPingFormat(aPing) {
("version" in aPing) && (aPing.version >= 2);
}
+/**
+ * Takes a date and returns it trunctated to a date with daily precision.
+ */
+function truncateToDays(date) {
+ return new Date(date.getFullYear(),
+ date.getMonth(),
+ date.getDate(),
+ 0, 0, 0, 0);
+}
+
+function tomorrow(date) {
+ let d = new Date(date);
+ d.setDate(d.getDate() + 1);
+ return d;
+}
+
/**
* This is a policy object used to override behavior for testing.
*/
let Policy = {
now: () => new Date(),
+ midnightPingFuzzingDelay: () => MIDNIGHT_FUZZING_DELAY_MS,
+ setPingSendTimeout: (callback, delayMs) => setTimeout(callback, delayMs),
+ clearPingSendTimeout: (id) => clearTimeout(id),
}
this.EXPORTED_SYMBOLS = ["TelemetryController"];
@@ -340,6 +371,9 @@ let Impl = {
_delayedInitTask: null,
// The deferred promise resolved when the initialization task completes.
_delayedInitTaskDeferred: null,
+ // Timer for scheduled ping sends.
+ _pingSendTimer: null,
+
// The session recorder, shared with FHR and the Data Reporting Service.
_sessionRecorder: null,
// This is a public barrier Telemetry clients can use to add blockers to the shutdown
@@ -483,6 +517,31 @@ let Impl = {
}, error => this._log.error("addPendingPingFromFile - Unable to add the pending ping", error));
},
+ /**
+ * This helper calculates the next time that we can send pings at.
+ * Currently this mostly redistributes ping sends around midnight to avoid submission
+ * spikes around local midnight for daily pings.
+ *
+ * @param now Date The current time.
+ * @return Number The next time (ms from UNIX epoch) when we can send pings.
+ */
+ _getNextPingSendTime: function(now) {
+ const todayDate = truncateToDays(now);
+ const tomorrowDate = tomorrow(todayDate);
+ const nextMidnightRangeStart = tomorrowDate.getTime() - MIDNIGHT_TOLERANCE_MS;
+ const currentMidnightRangeEnd = todayDate.getTime() - MIDNIGHT_TOLERANCE_MS + Policy.midnightPingFuzzingDelay();
+
+ if (now.getTime() < currentMidnightRangeEnd) {
+ return currentMidnightRangeEnd;
+ }
+
+ if (now.getTime() >= nextMidnightRangeStart) {
+ return nextMidnightRangeStart + Policy.midnightPingFuzzingDelay();
+ }
+
+ return now.getTime();
+ },
+
/**
* Submit ping payloads to Telemetry. This will assemble a complete ping, adding
* environment data, client id and some general info.
@@ -509,12 +568,23 @@ let Impl = {
// Always persist the pings if we are allowed to.
let archivePromise = TelemetryArchive.promiseArchivePing(pingData)
.catch(e => this._log.error("submitExternalPing - Failed to archive ping " + pingData.id, e));
-
let p = [ archivePromise ];
- if (!this._initialized) {
- // We are still initializing and should not send yet, add this to the pending pings.
- this._log.trace("submitExternalPing - still initializing, ping is pending");
+ // Check if we can send pings now.
+ const now = Policy.now();
+ const nextPingSendTime = this._getNextPingSendTime(now);
+ const throttled = (nextPingSendTime > now.getTime());
+
+ // We can't send pings now, schedule a later send.
+ if (throttled) {
+ this._log.trace("submitExternalPing - throttled, delaying ping send to " + new Date(nextPingSendTime));
+ this._reschedulePingSendTimer(nextPingSendTime);
+ }
+
+ if (!this._initialized || throttled) {
+ // We can't send because we are still initializing or throttled, add this to the pending pings.
+ this._log.trace("submitExternalPing - ping is pending, initialized: " + this._initialized +
+ ", throttled: " + throttled);
p.push(TelemetryStorage.addPendingPing(pingData));
} else {
// Try to send the ping, persist it if sending it fails.
@@ -541,6 +611,16 @@ let Impl = {
return Promise.resolve();
}
+ // Check if we can send pings now - otherwise schedule a later send.
+ const now = Policy.now();
+ const nextPingSendTime = this._getNextPingSendTime(now);
+ if (nextPingSendTime > now.getTime()) {
+ this._log.trace("sendPersistedPings - delaying ping send to " + new Date(nextPingSendTime));
+ this._reschedulePingSendTimer(nextPingSendTime);
+ return Promise.resolve();
+ }
+
+ // We can send now.
let pingsIterator = Iterator(this.popPayloads());
let p = [for (data of pingsIterator) this.doPing(data, true).catch((e) => {
this._log.error("sendPersistedPings - doPing rejected", e);
@@ -816,13 +896,10 @@ let Impl = {
* false otherwise.
*/
enableTelemetryRecording: function enableTelemetryRecording() {
+ const enabled = Preferences.get(PREF_ENABLED, false);
+
// Enable base Telemetry recording, if needed.
-#if !defined(MOZ_WIDGET_ANDROID)
- Telemetry.canRecordBase = Preferences.get(PREF_FHR_ENABLED, false);
-#else
- // FHR recording is always "enabled" on Android (data upload is not).
- Telemetry.canRecordBase = true;
-#endif
+ Telemetry.canRecordBase = enabled || IS_UNIFIED_TELEMETRY;
#ifdef MOZILLA_OFFICIAL
if (!Telemetry.isOfficialTelemetry && !this._testMode) {
@@ -834,7 +911,6 @@ let Impl = {
}
#endif
- let enabled = Preferences.get(PREF_ENABLED, false);
this._server = Preferences.get(PREF_SERVER, undefined);
if (!enabled || !Telemetry.canRecordBase) {
// Turn off extended telemetry recording if disabled by preferences or if base/telemetry
@@ -874,16 +950,13 @@ let Impl = {
// Only initialize the session recorder if FHR is enabled.
// TODO: move this after the |enableTelemetryRecording| block and drop the
- // PREF_FHR_ENABLED check after bug 1137252 lands.
- if (!this._sessionRecorder && Preferences.get(PREF_FHR_ENABLED, true)) {
+ // PREF_FHR_ENABLED check once we permanently switch over to unified Telemetry.
+ if (!this._sessionRecorder &&
+ (Preferences.get(PREF_FHR_ENABLED, true) || IS_UNIFIED_TELEMETRY)) {
this._sessionRecorder = new SessionRecorder(PREF_SESSIONS_BRANCH);
this._sessionRecorder.onStartup();
}
- // Initialize some probes that are kept in their own modules
- this._thirdPartyCookies = new ThirdPartyCookieProbe();
- this._thirdPartyCookies.init();
-
if (!this.enableTelemetryRecording()) {
this._log.config("setupChromeProcess - Telemetry recording is disabled, skipping Chrome process setup.");
return Promise.resolve();
@@ -961,7 +1034,11 @@ let Impl = {
try {
// First wait for clients processing shutdown.
yield this._shutdownBarrier.wait();
- // Then wait for any outstanding async ping activity.
+
+ // Then clear scheduled ping sends...
+ this._clearPingSendTimer();
+
+ // ... and wait for any outstanding async ping activity.
yield this._connectionsBarrier.wait();
} finally {
// Reset state.
@@ -1031,11 +1108,13 @@ let Impl = {
/**
* Check if pings can be sent to the server. If FHR is not allowed to upload,
* pings are not sent to the server (Telemetry is a sub-feature of FHR).
+ * If unified telemetry is off, don't send pings if Telemetry is disabled.
* @return {Boolean} True if pings can be send to the servers, false otherwise.
*/
_canSend: function() {
return (Telemetry.isOfficialTelemetry || this._testMode) &&
- Preferences.get(PREF_FHR_UPLOAD_ENABLED, false);
+ Preferences.get(PREF_FHR_UPLOAD_ENABLED, false) &&
+ (IS_UNIFIED_TELEMETRY || Preferences.get(PREF_ENABLED));
},
/**
@@ -1051,6 +1130,19 @@ let Impl = {
};
},
+ _reschedulePingSendTimer: function(timestamp) {
+ this._clearPingSendTimer();
+ const interval = timestamp - Policy.now();
+ this._pingSendTimer = Policy.setPingSendTimeout(() => this.sendPersistedPings(), interval);
+ },
+
+ _clearPingSendTimer: function() {
+ if (this._pingSendTimer) {
+ Policy.clearPingSendTimeout(this._pingSendTimer);
+ this._pingSendTimer = null;
+ }
+ },
+
/**
* Allows waiting for TelemetryControllers delayed initialization to complete.
* This will complete before TelemetryController is shutting down.
diff --git a/toolkit/components/telemetry/TelemetrySession.jsm b/toolkit/components/telemetry/TelemetrySession.jsm
index 294dbf74720..9fbef9be724 100644
--- a/toolkit/components/telemetry/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/TelemetrySession.jsm
@@ -60,6 +60,8 @@ const PREF_BRANCH = "toolkit.telemetry.";
const PREF_PREVIOUS_BUILDID = PREF_BRANCH + "previousBuildID";
const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
const PREF_ASYNC_PLUGIN_INIT = "dom.ipc.plugins.asyncInit";
+const PREF_UNIFIED = PREF_BRANCH + "unified";
+
const MESSAGE_TELEMETRY_PAYLOAD = "Telemetry:Payload";
const MESSAGE_TELEMETRY_GET_CHILD_PAYLOAD = "Telemetry:GetChildPayload";
@@ -69,6 +71,10 @@ const ABORTED_SESSION_FILE_NAME = "aborted-session-ping";
const SESSION_STATE_FILE_NAME = "session-state.json";
+// Whether the FHR/Telemetry unification features are enabled.
+// Changing this pref requires a restart.
+const IS_UNIFIED_TELEMETRY = Preferences.get(PREF_UNIFIED, false);
+
// Maximum number of content payloads that we are willing to store.
const MAX_NUM_CONTENT_PAYLOADS = 10;
@@ -1339,12 +1345,8 @@ let Impl = {
* respectively.
*/
assemblePayloadWithMeasurements: function(simpleMeasurements, info, reason, clearSubsession) {
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
- const isSubsession = !this._isClassicReason(reason);
-#else
- const isSubsession = false;
- clearSubsession = false;
-#endif
+ const isSubsession = IS_UNIFIED_TELEMETRY && !this._isClassicReason(reason);
+ clearSubsession = IS_UNIFIED_TELEMETRY && clearSubsession;
this._log.trace("assemblePayloadWithMeasurements - reason: " + reason +
", submitting subsession data: " + isSubsession);
@@ -1481,6 +1483,11 @@ let Impl = {
return Promise.resolve();
}
+ if (!Telemetry.canRecordBase && !testing) {
+ this._log.config("setupChromeProcess - Telemetry recording is disabled, skipping Chrome process setup.");
+ return Promise.resolve();
+ }
+
// Generate a unique id once per session so the server can cope with duplicate
// submissions, orphaning and other oddities. The id is shared across subsessions.
this._sessionId = Policy.generateSessionUUID();
@@ -1503,11 +1510,6 @@ let Impl = {
Preferences.set(PREF_PREVIOUS_BUILDID, thisBuildID);
}
- if (!Telemetry.canRecordBase && !testing) {
- this._log.config("setupChromeProcess - Telemetry recording is disabled, skipping Chrome process setup.");
- return Promise.resolve();
- }
-
TelemetryController.shutdown.addBlocker("TelemetrySession: shutting down",
() => this.shutdownChromeProcess(),
() => this._getState());
@@ -1541,23 +1543,26 @@ let Impl = {
Telemetry.asyncFetchTelemetryData(function () {});
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
- // Check for a previously written aborted session ping.
- yield this._checkAbortedSessionPing();
+ if (IS_UNIFIED_TELEMETRY) {
+ // Check for a previously written aborted session ping.
+ yield this._checkAbortedSessionPing();
- TelemetryEnvironment.registerChangeListener(ENVIRONMENT_CHANGE_LISTENER,
- (reason, data) => this._onEnvironmentChange(reason, data));
- // Write the first aborted-session ping as early as possible. Just do that
- // if we are not testing, since calling Telemetry.reset() will make a previous
- // aborted ping a pending ping.
- if (!testing) {
- yield this._saveAbortedSessionPing();
+ // Write the first aborted-session ping as early as possible. Just do that
+ // if we are not testing, since calling Telemetry.reset() will make a previous
+ // aborted ping a pending ping.
+ if (!testing) {
+ yield this._saveAbortedSessionPing();
+ }
+
+ TelemetryEnvironment.registerChangeListener(ENVIRONMENT_CHANGE_LISTENER,
+ (reason, data) => this._onEnvironmentChange(reason, data));
+
+ // Start the scheduler.
+ // We skip this if unified telemetry is off, so we don't
+ // trigger the new unified ping types.
+ TelemetryScheduler.init();
}
- // Start the scheduler.
- TelemetryScheduler.init();
-#endif
-
this._delayedInitTaskDeferred.resolve();
} catch (e) {
this._delayedInitTaskDeferred.reject(e);
@@ -1663,7 +1668,10 @@ let Impl = {
savePendingPings: function savePendingPings() {
this._log.trace("savePendingPings");
-#ifndef MOZ_WIDGET_ANDROID
+ if (!IS_UNIFIED_TELEMETRY) {
+ return this.savePendingPingsClassic();
+ }
+
let options = {
retentionDays: RETENTION_DAYS,
addClientId: true,
@@ -1677,9 +1685,6 @@ let Impl = {
return TelemetryController.addPendingPing(getPingType(shutdownPayload), shutdownPayload, options)
.then(() => this.savePendingPingsClassic(),
() => this.savePendingPingsClassic());
-#else
- return this.savePendingPingsClassic();
-#endif
},
/**
@@ -1869,10 +1874,10 @@ let Impl = {
this._log.trace("shutdownChromeProcess - testing: " + testing);
let cleanup = () => {
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
- TelemetryEnvironment.unregisterChangeListener(ENVIRONMENT_CHANGE_LISTENER);
- TelemetryScheduler.shutdown();
-#endif
+ if (IS_UNIFIED_TELEMETRY) {
+ TelemetryEnvironment.unregisterChangeListener(ENVIRONMENT_CHANGE_LISTENER);
+ TelemetryScheduler.shutdown();
+ }
this.uninstall();
let reset = () => {
@@ -1881,13 +1886,17 @@ let Impl = {
};
if (Telemetry.isOfficialTelemetry || testing) {
- return this.savePendingPings()
- .then(() => this._stateSaveSerializer.flushTasks())
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
- .then(() => this._abortedSessionSerializer
- .enqueueTask(() => this._removeAbortedSessionPing()))
-#endif
- .then(reset);
+ return Task.spawn(function*() {
+ yield this.savePendingPings();
+ yield this._stateSaveSerializer.flushTasks();
+
+ if (IS_UNIFIED_TELEMETRY) {
+ yield this._abortedSessionSerializer
+ .enqueueTask(() => this._removeAbortedSessionPing());
+ }
+
+ reset();
+ }.bind(this));
}
reset();
@@ -1933,13 +1942,11 @@ let Impl = {
};
let promise = TelemetryController.submitExternalPing(getPingType(payload), payload, options);
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
// If required, also save the payload as an aborted session.
- if (saveAsAborted) {
+ if (saveAsAborted && IS_UNIFIED_TELEMETRY) {
let abortedPromise = this._saveAbortedSessionPing(payload);
promise = promise.then(() => abortedPromise);
}
-#endif
return promise;
},
diff --git a/toolkit/components/telemetry/TelemetryStorage.jsm b/toolkit/components/telemetry/TelemetryStorage.jsm
index d3826396f51..639985ed24c 100644
--- a/toolkit/components/telemetry/TelemetryStorage.jsm
+++ b/toolkit/components/telemetry/TelemetryStorage.jsm
@@ -443,8 +443,7 @@ let TelemetryStorageImpl = {
return this.loadPingFile(pingPath).then(ping => {
// Since we read a ping successfully, update the related histogram.
Telemetry.getHistogramById("READ_SAVED_PING_SUCCESS").add(1);
- this.addPendingPing(ping);
- return this.savePing(ping, false);
+ return this.addPendingPing(ping);
});
},
diff --git a/toolkit/components/telemetry/docs/index.rst b/toolkit/components/telemetry/docs/index.rst
index 84a7a45bd66..2c49b3ff5ca 100644
--- a/toolkit/components/telemetry/docs/index.rst
+++ b/toolkit/components/telemetry/docs/index.rst
@@ -19,3 +19,4 @@ Client-side, this consists of:
common-ping
environment
main-ping
+ preferences
diff --git a/toolkit/components/telemetry/docs/pings.rst b/toolkit/components/telemetry/docs/pings.rst
index 2eb3078450d..28b5af3b5e1 100644
--- a/toolkit/components/telemetry/docs/pings.rst
+++ b/toolkit/components/telemetry/docs/pings.rst
@@ -45,13 +45,3 @@ To allow for cheaper lookup of archived pings, storage follows a specific naming
* ```` - Timestamp of the ping creation date.
* ```` - The ping identifier.
* ```` - The ping type.
-
-Preferences
-===========
-
-Telemetry behaviour is controlled through the following preferences:
-
-* ``datareporting.healthreport.service.enabled`` - If true, records base Telemetry data. Otherwise, completely disables telemetry recording.
-* ``toolkit.telemetry.enabled`` - If true, record the extended Telemetry data. Please note that base Telemetry data needs to be enabled as well and we need to be in an official build or in test mode. This preference is controlled through the `Preferences` dialog.
-* ``datareporting.healthreport.uploadEnabled`` - Send the data we record if user has consented to FHR. This preference is controlled through the `Preferences` dialog.
-* ``toolkit.telemetry.archive.enabled`` - Allow pings to be archived locally.
diff --git a/toolkit/components/telemetry/docs/preferences.rst b/toolkit/components/telemetry/docs/preferences.rst
new file mode 100644
index 00000000000..50c0f74064b
--- /dev/null
+++ b/toolkit/components/telemetry/docs/preferences.rst
@@ -0,0 +1,41 @@
+Preferences
+===========
+
+Telemetry behaviour is controlled through the preferences listed here.
+
+*Note:* On official builds (which define ``MOZILLA_OFFICIAL``), Telemetry is only initialized when ``MOZ_TELEMETRY_REPORTING`` is defined.
+Sending only happens on official builds with ``MOZ_TELEMETRY_REPORTING`` defined.
+
+``toolkit.telemetry.unified``
+
+ This controls whether unified behavior is enabled. If true:
+
+ * Telemetry is always enabled and recording *base* data.
+ * Telemetry will send additional ``main`` pings.
+
+``toolkit.telemetry.enabled``
+
+ If ``unified`` is off, this controls whether the Telemetry module is enabled.
+ If ``unified`` is on, this controls whether to record *extended* data.
+ This preference is controlled through the `Preferences` dialog.
+
+``datareporting.healthreport.uploadEnabled``
+
+ Send the data we record if user has consented to FHR. This preference is controlled through the `Preferences` dialog.
+
+``toolkit.telemetry.archive.enabled``
+
+ Allow pings to be archived locally. This can only be enabled if ``unified`` is on.
+
+``toolkit.telemetry.server``
+
+ The server Telemetry pings are sent to.
+
+``toolkit.telemetry.log.level``
+
+ This sets the Telemetry logging verbosity per ``Log.jsm``, with ``Trace`` or ``0`` being the most verbose and the default being ``Warn``.
+ By default logging goes only the console service.
+
+``toolkit.telemetry.log.dump``
+
+ Sets whether to dump Telemetry log messages to ``stdout`` too.
diff --git a/toolkit/components/telemetry/tests/unit/head.js b/toolkit/components/telemetry/tests/unit/head.js
index 9daaf430036..c3748df7dbc 100644
--- a/toolkit/components/telemetry/tests/unit/head.js
+++ b/toolkit/components/telemetry/tests/unit/head.js
@@ -144,17 +144,31 @@ function fakeSchedulerTimer(set, clear) {
*/
function fakeNow(...args) {
const date = new Date(...args);
+ const modules = [
+ Cu.import("resource://gre/modules/TelemetrySession.jsm"),
+ Cu.import("resource://gre/modules/TelemetryEnvironment.jsm"),
+ Cu.import("resource://gre/modules/TelemetryController.jsm"),
+ ];
- let ping = Cu.import("resource://gre/modules/TelemetryController.jsm");
- ping.Policy.now = () => date;
- let session = Cu.import("resource://gre/modules/TelemetrySession.jsm");
- session.Policy.now = () => date;
- let environment = Cu.import("resource://gre/modules/TelemetryEnvironment.jsm");
- environment.Policy.now = () => date;
+ for (let m of modules) {
+ m.Policy.now = () => date;
+ }
return new Date(date);
}
+// Fake the timeout functions for TelemetryController sending.
+function fakePingSendTimer(set, clear) {
+ let ping = Cu.import("resource://gre/modules/TelemetryController.jsm");
+ ping.Policy.setPingSendTimeout = set;
+ ping.Policy.clearPingSendTimeout = clear;
+}
+
+function fakeMidnightPingFuzzingDelay(delayMs) {
+ let ping = Cu.import("resource://gre/modules/TelemetryController.jsm");
+ ping.Policy.midnightPingFuzzingDelay = () => delayMs;
+}
+
// Return a date that is |offset| ms in the future from |date|.
function futureDate(date, offset) {
return new Date(date.getTime() + offset);
@@ -179,3 +193,6 @@ Services.prefs.setBoolPref("toolkit.telemetry.archive.enabled", true);
// Avoid timers interrupting test behavior.
fakeSchedulerTimer(() => {}, () => {});
+fakePingSendTimer(() => {}, () => {});
+// Make pind sending predictable.
+fakeMidnightPingFuzzingDelay(0);
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
index 4d00a840219..f8ee8aee933 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
@@ -150,17 +150,12 @@ add_task(function* asyncSetup() {
// Ensure that not overwriting an existing file fails silently
add_task(function* test_overwritePing() {
- let ping = {id: "foo"}
+ let ping = {id: "foo"};
yield TelemetryStorage.savePing(ping, true);
yield TelemetryStorage.savePing(ping, false);
yield TelemetryStorage.cleanupPingFile(ping);
});
-// Sends a ping to a non existing server.
-add_task(function* test_noServerPing() {
- yield sendPing(false, false);
-});
-
// Checks that a sent ping is correctly received by a dummy http server.
add_task(function* test_simplePing() {
startWebserver();
@@ -265,6 +260,70 @@ add_task(function* test_archivePings() {
Assert.equal(ping.id, pingId, "TelemetryController must archive pings if FHR is enabled.");
});
+// Test that we fuzz the submission time around midnight properly
+// to avoid overloading the telemetry servers.
+add_task(function* test_midnightPingSendFuzzing() {
+ const fuzzingDelay = 60 * 60 * 1000;
+ fakeMidnightPingFuzzingDelay(fuzzingDelay);
+ let now = new Date(2030, 5, 1, 11, 00, 0);
+ fakeNow(now);
+
+ let pingSendTimerCallback = null;
+ let pingSendTimeout = null;
+ fakePingSendTimer((callback, timeout) => {
+ pingSendTimerCallback = callback;
+ pingSendTimeout = timeout;
+ }, () => {});
+
+ gRequestIterator = Iterator(new Request());
+ yield TelemetryController.reset();
+
+ // A ping submitted shortly before midnight should not get sent yet.
+ now = new Date(2030, 5, 1, 23, 55, 0);
+ fakeNow(now);
+ registerPingHandler((req, res) => {
+ Assert.ok(false, "No ping should be received yet.");
+ });
+ yield sendPing(true, true);
+
+ Assert.ok(!!pingSendTimerCallback);
+ Assert.deepEqual(futureDate(now, pingSendTimeout), new Date(2030, 5, 2, 0, 45, 0));
+
+ // A ping after midnight within the fuzzing delay should also not get sent.
+ now = new Date(2030, 5, 2, 0, 40, 0);
+ fakeNow(now);
+ pingSendTimeout = null;
+ yield sendPing(true, true);
+ Assert.deepEqual(futureDate(now, pingSendTimeout), new Date(2030, 5, 2, 0, 45, 0));
+
+ // The Request constructor restores the previous ping handler.
+ gRequestIterator = Iterator(new Request());
+
+ // Setting the clock to after the fuzzing delay, we should trigger the two ping sends
+ // with the timer callback.
+ now = futureDate(now, pingSendTimeout);
+ fakeNow(now);
+ yield pingSendTimerCallback();
+ let requests = [];
+ requests.push(yield gRequestIterator.next());
+ requests.push(yield gRequestIterator.next());
+ for (let req of requests) {
+ let ping = decodeRequestPayload(req);
+ checkPingFormat(ping, TEST_PING_TYPE, true, true);
+ }
+
+ // Moving the clock further we should still send pings immediately.
+ now = futureDate(now, 5 * 60 * 1000);
+ yield sendPing(true, true);
+ let request = yield gRequestIterator.next();
+ let ping = decodeRequestPayload(request);
+ checkPingFormat(ping, TEST_PING_TYPE, true, true);
+
+ // Clean-up.
+ fakeMidnightPingFuzzingDelay(0);
+ fakePingSendTimer(() => {}, () => {});
+});
+
add_task(function* stopServer(){
gHttpServer.stop(do_test_finished);
});
diff --git a/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
index 281133a3fca..69a0af4a14d 100644
--- a/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
+++ b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
@@ -707,6 +707,27 @@ function test_datasets()
Assert.ok(registered.has("TELEMETRY_TEST_KEYED_RELEASE_OPTOUT"));
}
+function test_instantiate() {
+ if (gIsAndroid) {
+ // We don't support subsessions yet on Android.
+ return;
+ }
+
+ const ID = "TELEMETRY_TEST_COUNT";
+ let h = Telemetry.getHistogramById(ID);
+
+ // Instantiate the subsession histogram through |add| and make sure they match.
+ // This MUST be the first use of "TELEMETRY_TEST_COUNT" in this file, otherwise
+ // |add| will not instantiate the histogram.
+ h.add(1);
+ let snapshot = h.snapshot();
+ let subsession = Telemetry.snapshotSubsessionHistograms();
+ Assert.equal(snapshot.sum, subsession[ID].sum,
+ "Histogram and subsession histogram sum must match.");
+ // Clear the histogram, so we don't void the assumptions from the other tests.
+ h.clear();
+}
+
function test_subsession() {
if (gIsAndroid) {
// We don't support subsessions yet on Android.
@@ -853,6 +874,9 @@ function generateUUID() {
function run_test()
{
+ // This MUST be the very first test of this file.
+ test_instantiate();
+
let kinds = [Telemetry.HISTOGRAM_EXPONENTIAL, Telemetry.HISTOGRAM_LINEAR]
for each (let histogram_type in kinds) {
let [min, max, bucket_count] = [1, INT_MAX - 1, 10]
diff --git a/toolkit/components/timermanager/nsUpdateTimerManager.js b/toolkit/components/timermanager/nsUpdateTimerManager.js
index 2f6041a795f..5a6ef5bf86b 100644
--- a/toolkit/components/timermanager/nsUpdateTimerManager.js
+++ b/toolkit/components/timermanager/nsUpdateTimerManager.js
@@ -292,6 +292,10 @@ TimerManager.prototype = {
*/
registerTimer: function TM_registerTimer(id, callback, interval) {
LOG("TimerManager:registerTimer - id: " + id);
+ if (id in this._timers && callback != this._timers[id].callback) {
+ LOG("TimerManager:registerTimer - Ignoring second registration for " + id);
+ return;
+ }
let prefLastUpdate = PREF_APP_UPDATE_LASTUPDATETIME_FMT.replace(/%ID%/, id);
// Initialize the last update time to 0 when the preference isn't set so
// the timer will be notified soon after a new profile's first use.
diff --git a/toolkit/devtools/event-emitter.js b/toolkit/devtools/event-emitter.js
index 3c40f674d23..a2bbb192a19 100644
--- a/toolkit/devtools/event-emitter.js
+++ b/toolkit/devtools/event-emitter.js
@@ -25,6 +25,16 @@ module.exports = EventEmitter;
const { Cu, components } = require("chrome");
const Services = require("Services");
const promise = require("promise");
+let loggingEnabled = true;
+
+if (!isWorker) {
+ loggingEnabled = Services.prefs.getBoolPref("devtools.dump.emit");
+ Services.prefs.addObserver("devtools.dump.emit", {
+ observe: () => {
+ loggingEnabled = Services.prefs.getBoolPref("devtools.dump.emit");
+ }
+ }, false);
+}
/**
* Decorate an object with event emitter functionality.
@@ -147,60 +157,60 @@ EventEmitter.prototype = {
},
logEvent: function(aEvent, args) {
- let logging = isWorker ? true : Services.prefs.getBoolPref("devtools.dump.emit");
-
- if (logging) {
- let caller, func, path;
- if (!isWorker) {
- caller = components.stack.caller.caller;
- func = caller.name;
- let file = caller.filename;
- if (file.includes(" -> ")) {
- file = caller.filename.split(/ -> /)[1];
- }
- path = file + ":" + caller.lineNumber;
- }
-
- let argOut = "(";
- if (args.length === 1) {
- argOut += aEvent;
- }
-
- let out = "EMITTING: ";
-
- // We need this try / catch to prevent any dead object errors.
- try {
- for (let i = 1; i < args.length; i++) {
- if (i === 1) {
- argOut = "(" + aEvent + ", ";
- } else {
- argOut += ", ";
- }
-
- let arg = args[i];
- argOut += arg;
-
- if (arg && arg.nodeName) {
- argOut += " (" + arg.nodeName;
- if (arg.id) {
- argOut += "#" + arg.id;
- }
- if (arg.className) {
- argOut += "." + arg.className;
- }
- argOut += ")";
- }
- }
- } catch(e) {
- // Object is dead so the toolbox is most likely shutting down,
- // do nothing.
- }
-
- argOut += ")";
- out += "emit" + argOut + " from " + func + "() -> " + path + "\n";
-
- dump(out);
+ if (!loggingEnabled) {
+ return;
}
+
+ let caller, func, path;
+ if (!isWorker) {
+ caller = components.stack.caller.caller;
+ func = caller.name;
+ let file = caller.filename;
+ if (file.includes(" -> ")) {
+ file = caller.filename.split(/ -> /)[1];
+ }
+ path = file + ":" + caller.lineNumber;
+ }
+
+ let argOut = "(";
+ if (args.length === 1) {
+ argOut += aEvent;
+ }
+
+ let out = "EMITTING: ";
+
+ // We need this try / catch to prevent any dead object errors.
+ try {
+ for (let i = 1; i < args.length; i++) {
+ if (i === 1) {
+ argOut = "(" + aEvent + ", ";
+ } else {
+ argOut += ", ";
+ }
+
+ let arg = args[i];
+ argOut += arg;
+
+ if (arg && arg.nodeName) {
+ argOut += " (" + arg.nodeName;
+ if (arg.id) {
+ argOut += "#" + arg.id;
+ }
+ if (arg.className) {
+ argOut += "." + arg.className;
+ }
+ argOut += ")";
+ }
+ }
+ } catch(e) {
+ // Object is dead so the toolbox is most likely shutting down,
+ // do nothing.
+ }
+
+ argOut += ")";
+ out += "emit" + argOut + " from " + func + "() -> " + path + "\n";
+
+ dump(out);
},
};
diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index b23bb6cd1c9..ec2124d3384 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -2251,12 +2251,13 @@ function resolveURIToLocalPath(aURI) {
* Optional. The content type of this source, if immediately available.
*/
function SourceActor({ source, thread, originalUrl, generatedSource,
- contentType }) {
+ isInlineSource, contentType }) {
this._threadActor = thread;
this._originalUrl = originalUrl;
this._source = source;
this._generatedSource = generatedSource;
this._contentType = contentType;
+ this._isInlineSource = isInlineSource;
this.onSource = this.onSource.bind(this);
this._invertSourceMap = this._invertSourceMap.bind(this);
@@ -2286,8 +2287,14 @@ SourceActor.prototype = {
_addonPath: null,
get isSourceMapped() {
- return this._originalURL || this._generatedSource ||
- this.threadActor.sources.isPrettyPrinted(this.url);
+ return !this.isInlineSource && (
+ this._originalURL || this._generatedSource ||
+ this.threadActor.sources.isPrettyPrinted(this.url)
+ );
+ },
+
+ get isInlineSource() {
+ return this._isInlineSource;
},
get threadActor() { return this._threadActor; },
@@ -2410,10 +2417,13 @@ SourceActor.prototype = {
return toResolvedContent(this.source.text);
}
else {
- // XXX bug 865252: Don't load from the cache if this is a source mapped
- // source because we can't guarantee that the cache has the most up to date
- // content for this source like we can if it isn't source mapped.
- let sourceFetched = fetch(this.url, { loadFromCache: !this.source });
+ // Only load the HTML page source from cache (which exists when
+ // there are inline sources). Otherwise, we can't trust the
+ // cache because we are most likely here because we are
+ // fetching the original text for sourcemapped code, and the
+ // page hasn't requested it before (if it has, it was a
+ // previous debugging session).
+ let sourceFetched = fetch(this.url, { loadFromCache: this.isInlineSource });
// Record the contentType we just learned during fetching
return sourceFetched.then(result => {
diff --git a/toolkit/devtools/server/actors/utils/TabSources.js b/toolkit/devtools/server/actors/utils/TabSources.js
index c647cd27e60..aa2b17073b5 100644
--- a/toolkit/devtools/server/actors/utils/TabSources.js
+++ b/toolkit/devtools/server/actors/utils/TabSources.js
@@ -156,6 +156,7 @@ TabSources.prototype = {
source: source,
originalUrl: originalUrl,
generatedSource: generatedSource,
+ isInlineSource: isInlineSource,
contentType: contentType
});
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
index 4b5b17da390..10c0f81c356 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
@@ -23,6 +23,10 @@ dateUpdated=Updated %S
#LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (notification.unsigned, notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled.
+notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution.
+notification.unsigned.link=More Information
#LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
notification.blocked=%1$S has been disabled due to security or stability issues.
notification.blocked.link=More Information
@@ -74,6 +78,10 @@ installCancelled=Install cancelled
#LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
details.notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (details.notification.unsigned, details.notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+details.notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled.
+details.notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution.
+details.notification.unsigned.link=More Information
#LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
details.notification.blocked=%1$S has been disabled due to security or stability issues.
details.notification.blocked.link=More Information
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 288f3f972d3..378f21790e0 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -2639,6 +2639,7 @@ var gListView = {
showEmptyNotice: function gListView_showEmptyNotice(aShow) {
this._emptyNotice.hidden = !aShow;
+ this._listBox.hidden = aShow;
},
onSortChanged: function gListView_onSortChanged(aSortBy, aAscending) {
@@ -2785,6 +2786,7 @@ var gDetailView = {
version.hidden = true;
}
+ var screenshotbox = document.getElementById("detail-screenshot-box");
var screenshot = document.getElementById("detail-screenshot");
if (aAddon.screenshots && aAddon.screenshots.length > 0) {
if (aAddon.screenshots[0].thumbnailURL) {
@@ -2797,9 +2799,9 @@ var gDetailView = {
screenshot.height = aAddon.screenshots[0].height;
}
screenshot.setAttribute("loading", "true");
- screenshot.hidden = false;
+ screenshotbox.hidden = false;
} else {
- screenshot.hidden = true;
+ screenshotbox.hidden = true;
}
var desc = document.getElementById("detail-desc");
@@ -3073,6 +3075,17 @@ var gDetailView = {
errorLink.value = gStrings.ext.GetStringFromName("details.notification.blocked.link");
errorLink.href = this._addon.blocklistURL;
errorLink.hidden = false;
+ } else if (this._addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
+ let msgType = this._addon.appDisabled ? "error" : "warning";
+ this.node.setAttribute("notification", msgType);
+ document.getElementById("detail-" + msgType).textContent = gStrings.ext.formatStringFromName(
+ "details.notification.unsigned" + (this._addon.appDisabled ? "AndDisabled" : ""),
+ [this._addon.name, gStrings.brandShortName], 2
+ );
+ var infoLink = document.getElementById("detail-" + msgType + "-link");
+ infoLink.value = gStrings.ext.GetStringFromName("details.notification.unsigned.link");
+ infoLink.href = Services.prefs.getCharPref("xpinstall.signatures.infoURL");
+ infoLink.hidden = false;
} else if (!this._addon.isCompatible && (AddonManager.checkCompatibility ||
(this._addon.blocklistState != Ci.nsIBlocklistService.STATE_SOFTBLOCKED))) {
this.node.setAttribute("notification", "warning");
@@ -3337,6 +3350,7 @@ var gDetailView = {
}
if (aProperties.indexOf("appDisabled") != -1 ||
+ aProperties.indexOf("signedState") != -1 ||
aProperties.indexOf("userDisabled") != -1)
this.updateState();
},
@@ -3455,8 +3469,8 @@ var gUpdatesView = {
self.showEmptyNotice(false);
self._updateSelected.hidden = true;
- while (self._listBox.itemCount > 0)
- self._listBox.removeItemAt(0);
+ while (self._listBox.childNodes.length > 0)
+ self._listBox.removeChild(self._listBox.firstChild);
}
var elements = [];
@@ -3490,6 +3504,7 @@ var gUpdatesView = {
showEmptyNotice: function gUpdatesView_showEmptyNotice(aShow) {
this._emptyNotice.hidden = !aShow;
+ this._listBox.hidden = aShow;
},
isManualUpdate: function gUpdatesView_isManualUpdate(aInstall, aOnlyAvailable) {
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 62ad368905e..8b15554e240 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -787,7 +787,7 @@
-
+
@@ -842,77 +842,77 @@
oncommand="document.getBindingParent(this).toggleReleaseNotes();"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1247,6 +1247,18 @@
this._errorLink.value = gStrings.ext.GetStringFromName("notification.blocked.link");
this._errorLink.href = this.mAddon.blocklistURL;
this._errorLink.hidden = false;
+ } else if (!isUpgrade &&
+ this.mAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
+ this.setAttribute("notification", this.mAddon.appDisabled ? "error" : "warning");
+ let msg = this.mAddon.appDisabled ? this._error : this._warning;
+ msg.textContent = gStrings.ext.formatStringFromName(
+ "notification.unsigned" + (this.mAddon.appDisabled ? "AndDisabled" : ""),
+ [this.mAddon.name, gStrings.brandShortName], 2
+ );
+ let infoLink = this.mAddon.appDisabled ? this._errorLink : this._warningLink;
+ infoLink.value = gStrings.ext.GetStringFromName("notification.unsigned.link");
+ infoLink.href = Services.prefs.getCharPref("xpinstall.signatures.infoURL");
+ infoLink.hidden = false;
} else if ((!isUpgrade && !this.mAddon.isCompatible) && (AddonManager.checkCompatibility
|| (this.mAddon.blocklistState != Ci.nsIBlocklistService.STATE_SOFTBLOCKED))) {
this.setAttribute("notification", "warning");
@@ -1647,6 +1659,7 @@
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 33103598407..a2a13468d27 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -119,570 +119,577 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &discover.description2;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+ &discover.description2;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &detail.contributions.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &detail.contributions.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 632c382372f..b99a372965e 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -129,6 +129,8 @@ const PREFIX_NS_EM = "http://www.mozilla.org/2004/em-rdf#";
const TOOLKIT_ID = "toolkit@mozilla.org";
+const XPI_SIGNATURE_CHECK_PERIOD = 24 * 60 * 60;
+
// The value for this is in Makefile.in
#expand const DB_SCHEMA = __MOZ_EXTENSIONS_DB_SCHEMA__;
const NOTIFICATION_TOOLBOXPROCESS_LOADED = "ToolboxProcessLoaded";
@@ -1359,6 +1361,22 @@ function verifyDirSignedState(aDir, aExpectedID) {
return Promise.resolve(AddonManager.SIGNEDSTATE_MISSING);
}
+/**
+ * Verifies that a bundle's contents are all correctly signed by an
+ * AMO-issued certificate
+ *
+ * @param aBundle
+ * the nsIFile for the bundle to check, either a directory or zip file
+ * @param aExpectedID
+ * the expected ID of the signature
+ * @return a Promise that resolves to an AddonManager.SIGNEDSTATE_* constant.
+ */
+function verifyBundleSignedState(aBundle, aExpectedID) {
+ if (aBundle.isFile())
+ return verifyZipSignedState(aBundle, aExpectedID);
+ return verifyDirSignedState(aBundle, aExpectedID);
+}
+
/**
* Replaces %...% strings in an addon url (update and updateInfo) with
* appropriate values.
@@ -2344,6 +2362,12 @@ this.XPIProvider = {
this.extensionsActive = true;
this.runPhase = XPI_BEFORE_UI_STARTUP;
+
+ let timerManager = Cc["@mozilla.org/updates/timer-manager;1"].
+ getService(Ci.nsIUpdateTimerManager);
+ timerManager.registerTimer("xpi-signature-verification", () => {
+ this.verifySignatures();
+ }, XPI_SIGNATURE_CHECK_PERIOD);
}
catch (e) {
logger.error("startup failed", e);
@@ -2494,6 +2518,45 @@ this.XPIProvider = {
!XPIDatabase.writeAddonsList());
},
+ /**
+ * Verifies that all installed add-ons are still correctly signed.
+ */
+ verifySignatures: function XPI_verifySignatures() {
+ XPIDatabase.getAddonList(addon => SIGNED_TYPES.has(addon.type), (addons) => {
+ Task.spawn(function*() {
+ let changes = {
+ enabled: [],
+ disabled: []
+ };
+
+ for (let addon of addons) {
+ // The add-on might have vanished, we'll catch that on the next startup
+ if (!addon._sourceBundle.exists())
+ continue;
+
+ let signedState = yield verifyBundleSignedState(addon._sourceBundle, addon.id);
+ if (signedState == addon.signedState)
+ continue;
+
+ addon.signedState = signedState;
+ AddonManagerPrivate.callAddonListeners("onPropertyChanged",
+ createWrapper(addon),
+ ["signedState"]);
+
+ let disabled = XPIProvider.updateAddonDisabledState(addon);
+ if (disabled !== undefined)
+ changes[disabled ? "disabled" : "enabled"].push(addon.id);
+ }
+
+ XPIDatabase.saveChanges();
+
+ Services.obs.notifyObservers(null, "xpi-signature-changed", JSON.stringify(changes));
+ }).then(null, err => {
+ logger.error("XPI_verifySignature: " + err);
+ })
+ });
+ },
+
/**
* Persists changes to XPIProvider.bootstrappedAddons to its store (a pref).
*/
@@ -4557,6 +4620,10 @@ this.XPIProvider = {
* @param aSoftDisabled
* Value for the softDisabled property. If undefined the value will
* not change. If true this will force userDisabled to be true
+ * @return a tri-state indicating the action taken for the add-on:
+ * - undefined: The add-on did not change state
+ * - true: The add-on because disabled
+ * - false: The add-on became enabled
* @throws if addon is not a DBAddonInternal
*/
updateAddonDisabledState: function XPI_updateAddonDisabledState(aAddon,
@@ -4587,7 +4654,7 @@ this.XPIProvider = {
if (aAddon.userDisabled == aUserDisabled &&
aAddon.appDisabled == appDisabled &&
aAddon.softDisabled == aSoftDisabled)
- return;
+ return undefined;
let wasDisabled = aAddon.disabled;
let isDisabled = aUserDisabled || aSoftDisabled || appDisabled;
@@ -4607,21 +4674,22 @@ this.XPIProvider = {
});
}
+ let wrapper = createWrapper(aAddon);
+
if (appDisabledChanged) {
AddonManagerPrivate.callAddonListeners("onPropertyChanged",
- aAddon,
- ["appDisabled"]);
+ wrapper,
+ ["appDisabled"]);
}
// If the add-on is not visible or the add-on is not changing state then
// there is no need to do anything else
if (!aAddon.visible || (wasDisabled == isDisabled))
- return;
+ return undefined;
// Flag that active states in the database need to be updated on shutdown
Services.prefs.setBoolPref(PREF_PENDING_OPERATIONS, true);
- let wrapper = createWrapper(aAddon);
// Have we just gone back to the current state?
if (isDisabled != aAddon.active) {
AddonManagerPrivate.callAddonListeners("onOperationCancelled", wrapper);
@@ -4673,6 +4741,8 @@ this.XPIProvider = {
// Notify any other providers that a new theme has been enabled
if (aAddon.type == "theme" && !isDisabled)
AddonManagerPrivate.notifyAddonChanged(aAddon.id, aAddon.type, needsRestart);
+
+ return isDisabled;
},
/**
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js b/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
index 0736aa39191..8c3061b7638 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
@@ -64,7 +64,7 @@ function check_list(aItem) {
// Check the children of the list
let list = gManagerWindow.document.getElementById(LIST_ID);
- is(list.itemCount, aItem ? 1 : 0, "Should get expected number of items in list");
+ is(list.childNodes.length, aItem ? 1 : 0, "Should get expected number of items in list");
if (aItem != null) {
let itemName = list.firstChild.getAttribute("name");
is(itemName, aItem.name, "List item should have correct name");
diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/extensions/test/browser/browser_details.js
index 3dd708dc0ff..489d26011c5 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_details.js
@@ -143,6 +143,16 @@ function test() {
blocklistURL: "http://example.com/addon8@tests.mozilla.org",
name: "Test add-on 8",
blocklistState: Ci.nsIBlocklistService.STATE_OUTDATED
+ }, {
+ id: "addon9@tests.mozilla.org",
+ name: "Test add-on 9",
+ signedState: AddonManager.SIGNEDSTATE_MISSING,
+ }, {
+ id: "addon10@tests.mozilla.org",
+ name: "Test add-on 10",
+ signedState: AddonManager.SIGNEDSTATE_MISSING,
+ isActive: false,
+ appDisabled: true,
}, {
id: "hotfix@tests.mozilla.org",
name: "Test hotfix 1",
@@ -171,7 +181,7 @@ add_test(function() {
is(get("detail-version").value, "2.1", "Version should be correct");
is(get("detail-icon").src, "chrome://foo/skin/icon64.png", "Icon should be correct");
is_element_hidden(get("detail-creator"), "Creator should be hidden");
- is_element_hidden(get("detail-screenshot"), "Screenshot should be hidden");
+ is_element_hidden(get("detail-screenshot-box"), "Screenshot should be hidden");
is(get("detail-screenshot").width, "", "Screenshot dimensions should not be set");
is(get("detail-screenshot").height, "", "Screenshot dimensions should not be set");
is(get("detail-desc").textContent, "Short description", "Description should be correct");
@@ -278,7 +288,7 @@ add_test(function() {
is(get("detail-creator")._creatorName.value, "Mozilla", "Creator should be correct");
is_element_hidden(get("detail-creator")._creatorLink, "Creator link should be hidden");
- is_element_visible(get("detail-screenshot"), "Screenshot should be visible");
+ is_element_visible(get("detail-screenshot-box"), "Screenshot should be visible");
is(get("detail-screenshot").src, "chrome://branding/content/about.png", "Should be showing the full sized screenshot");
is(get("detail-screenshot").width, 200, "Screenshot dimensions should be set");
is(get("detail-screenshot").height, 150, "Screenshot dimensions should be set");
@@ -335,7 +345,7 @@ add_test(function() {
is(get("detail-creator")._creatorLink.value, "Mozilla", "Creator link should be correct");
is(get("detail-creator")._creatorLink.href, "http://www.mozilla.org", "Creator link href should be correct");
- is_element_visible(get("detail-screenshot"), "Screenshot should be visible");
+ is_element_visible(get("detail-screenshot-box"), "Screenshot should be visible");
is(get("detail-screenshot").src, "chrome://branding/content/icon64.png", "Should be showing the thumbnail");
is(get("detail-screenshot").width, 160, "Screenshot dimensions should be set");
is(get("detail-screenshot").height, 120, "Screenshot dimensions should be set");
@@ -686,6 +696,52 @@ add_test(function() {
});
});
+// Opens and tests the details view for add-on 9
+add_test(function() {
+ open_details("addon9@tests.mozilla.org", "extension", function() {
+ is(get("detail-name").textContent, "Test add-on 9", "Name should be correct");
+
+ is_element_hidden(get("detail-prefs-btn"), "Preferences button should be hidden");
+ is_element_hidden(get("detail-enable-btn"), "Enable button should be hidden");
+ is_element_visible(get("detail-disable-btn"), "Disable button should be visible");
+ is_element_visible(get("detail-uninstall-btn"), "Remove button should be visible");
+
+ is_element_hidden(get("detail-error"), "Error message should be hidden");
+ is_element_hidden(get("detail-error-link"), "Error link should be hidden");
+ is_element_visible(get("detail-warning"), "Error message should be visible");
+ is(get("detail-warning").textContent, "Test add-on 9 could not be verified for use in " + gApp + ". Proceed with caution.", "Warning message should be correct");
+ is_element_visible(get("detail-warning-link"), "Warning link should be visible");
+ is(get("detail-warning-link").value, "More Information", "Warning link text should be correct");
+ is(get("detail-warning-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Warning link should be correct");
+ is_element_hidden(get("detail-pending"), "Pending message should be hidden");
+
+ run_next_test();
+ });
+});
+
+// Opens and tests the details view for add-on 10
+add_test(function() {
+ open_details("addon10@tests.mozilla.org", "extension", function() {
+ is(get("detail-name").textContent, "Test add-on 10", "Name should be correct");
+
+ is_element_hidden(get("detail-prefs-btn"), "Preferences button should be hidden");
+ is_element_hidden(get("detail-enable-btn"), "Enable button should be hidden");
+ is_element_hidden(get("detail-disable-btn"), "Disable button should be hidden");
+ is_element_visible(get("detail-uninstall-btn"), "Remove button should be visible");
+
+ is_element_hidden(get("detail-warning"), "Warning message should be hidden");
+ is_element_hidden(get("detail-warning-link"), "Warning link should be hidden");
+ is_element_visible(get("detail-error"), "Error message should be visible");
+ is(get("detail-error").textContent, "Test add-on 10 could not be verified for use in " + gApp + " and has been disabled.", "Error message should be correct");
+ is_element_visible(get("detail-error-link"), "Error link should be visible");
+ is(get("detail-error-link").value, "More Information", "Error link text should be correct");
+ is(get("detail-error-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Error link should be correct");
+ is_element_hidden(get("detail-pending"), "Pending message should be hidden");
+
+ run_next_test();
+ });
+});
+
// Opens and tests the details view for hotfix 1
add_test(function() {
open_details("hotfix@tests.mozilla.org", "extension", function() {
@@ -730,7 +786,7 @@ add_test(function() {
is(get("detail-version").value, "2.5", "Version should be correct");
is(get("detail-icon").src, "chrome://foo/skin/icon264.png", "Icon should be correct");
is_element_hidden(get("detail-creator"), "Creator should be hidden");
- is_element_hidden(get("detail-screenshot"), "Screenshot should be hidden");
+ is_element_hidden(get("detail-screenshot-box"), "Screenshot should be hidden");
is(get("detail-desc").textContent, "Short description replacement", "Description should be correct");
is(get("detail-fulldesc").textContent, "Longer description replacement", "Full description should be correct");
diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
index 1813df78cb9..8b80e0f3d98 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -69,10 +69,14 @@ function getInstallItem() {
}
function openDetailsView(aId) {
+ let view = gManagerWindow.document.getElementById("view-port").selectedPanel
+ Assert.equal(view.id, "list-view", "Should be in the list view to use this function");
+
let item = get_addon_element(gManagerWindow, aId);
Assert.ok(item, "Should have got add-on element.");
is_element_visible(item, "Add-on element should be visible.");
+ item.scrollIntoView();
EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, gManagerWindow);
EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, gManagerWindow);
@@ -165,13 +169,12 @@ add_task(function* testNotInstalledDisabledDetails() {
el = doc.getElementById("detail-warning");
is_element_hidden(el, "Warning notification is hidden.");
el = doc.getElementsByTagName("setting")[0];
+
+ yield gCategoryUtilities.openType("plugin");
}
});
add_task(function* testNotInstalled() {
- Assert.ok(gCategoryUtilities.isTypeVisible("plugin"), "Plugin tab visible.");
- yield gCategoryUtilities.openType("plugin");
-
for (let addon of gMockAddons) {
gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), true);
let item = get_addon_element(gManagerWindow, addon.id);
@@ -208,6 +211,8 @@ add_task(function* testNotInstalledDetails() {
el = doc.getElementById("detail-warning");
is_element_visible(el, "Warning notification is visible.");
el = doc.getElementsByTagName("setting")[0];
+
+ yield gCategoryUtilities.openType("plugin");
}
});
@@ -218,8 +223,6 @@ add_task(function* testInstalled() {
gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, addon.id), false);
gPrefs.setCharPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id), "1.2.3.4");
- yield gCategoryUtilities.openType("plugin");
-
let item = get_addon_element(gManagerWindow, addon.id);
Assert.ok(item, "Got add-on element.");
item.parentNode.ensureElementIsVisible(item);
@@ -269,14 +272,14 @@ add_task(function* testInstalledDetails() {
let menuSep = doc.getElementById("addonitem-menuseparator");
is_element_hidden(menuSep, "Menu separator is hidden.");
contextMenu.hidePopup();
+
+ yield gCategoryUtilities.openType("plugin");
}
});
add_task(function* testInstalledGlobalEmeDisabled() {
gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, false);
for (let addon of gMockAddons) {
- yield gCategoryUtilities.openType("plugin");
-
let item = get_addon_element(gManagerWindow, addon.id);
if (addon.isEME) {
Assert.ok(!item, "Couldn't get add-on element.");
diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js b/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
index 05b43a23882..b7009f3f035 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
@@ -271,6 +271,10 @@ add_test(function() {
try {
ok(!settings[6].hasAttribute("first-row"), "Not the first row");
var button = gManagerWindow.document.getAnonymousElementByAttribute(settings[6], "anonid", "button");
+
+ // Workaround for bug 1155324 - we need to ensure that the button is scrolled into view.
+ button.scrollIntoView();
+
input = gManagerWindow.document.getAnonymousElementByAttribute(settings[6], "anonid", "input");
is(input.value, "", "Label value should be empty");
is(input.tooltipText, "", "Label tooltip should be empty");
diff --git a/toolkit/mozapps/extensions/test/browser/browser_list.js b/toolkit/mozapps/extensions/test/browser/browser_list.js
index fd6cfed7ee1..d9193f0bb69 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_list.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_list.js
@@ -96,6 +96,16 @@ function test() {
blocklistURL: "http://example.com/addon9@tests.mozilla.org",
name: "Test add-on 9",
blocklistState: Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE,
+ }, {
+ id: "addon10@tests.mozilla.org",
+ name: "Test add-on 10",
+ signedState: AddonManager.SIGNEDSTATE_MISSING,
+ }, {
+ id: "addon11@tests.mozilla.org",
+ name: "Test add-on 11",
+ signedState: AddonManager.SIGNEDSTATE_MISSING,
+ isActive: false,
+ appDisabled: true,
}]);
open_manager(null, function(aWindow) {
@@ -139,7 +149,7 @@ function get_class_node(parent, cls) {
add_test(function() {
gCategoryUtilities.openType("extension", function() {
let items = get_test_items();
- is(Object.keys(items).length, 9, "Should be nine add-ons installed");
+ is(Object.keys(items).length, 11, "Should be the right number of add-ons installed");
info("Addon 1");
let addon = items["Test add-on"];
@@ -387,6 +397,44 @@ add_test(function() {
is(get_node(addon, "error-link").href, "http://example.com/addon9@tests.mozilla.org", "Error link should be correct");
is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
+ info("Addon 10");
+ addon = items["Test add-on 10"];
+ addon.parentNode.ensureElementIsVisible(addon);
+ is(get_node(addon, "name").value, "Test add-on 10", "Name should be correct");
+
+ is_element_hidden(get_node(addon, "preferences-btn"), "Preferences button should be hidden");
+ is_element_hidden(get_node(addon, "enable-btn"), "Enable button should be hidden");
+ is_element_visible(get_node(addon, "disable-btn"), "Disable button should be visible");
+ is_element_visible(get_node(addon, "remove-btn"), "Remove button should be visible");
+
+ is_element_visible(get_node(addon, "warning"), "Warning message should be visible");
+ is(get_node(addon, "warning").textContent, "Test add-on 10 could not be verified for use in " + gApp + ". Proceed with caution.", "Warning message should be correct");
+ is_element_visible(get_node(addon, "warning-link"), "Warning link should be visible");
+ is(get_node(addon, "warning-link").value, "More Information", "Warning link text should be correct");
+ is(get_node(addon, "warning-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Warning link should be correct");
+ is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
+ is_element_hidden(get_node(addon, "error-link"), "Error link should be hidden");
+ is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
+
+ info("Addon 11");
+ addon = items["Test add-on 11"];
+ addon.parentNode.ensureElementIsVisible(addon);
+ is(get_node(addon, "name").value, "Test add-on 11", "Name should be correct");
+
+ is_element_hidden(get_node(addon, "preferences-btn"), "Preferences button should be hidden");
+ is_element_hidden(get_node(addon, "enable-btn"), "Enable button should be hidden");
+ is_element_hidden(get_node(addon, "disable-btn"), "Disable button should be hidden");
+ is_element_visible(get_node(addon, "remove-btn"), "Remove button should be visible");
+
+ is_element_hidden(get_node(addon, "warning"), "Warning message should be hidden");
+ is_element_hidden(get_node(addon, "warning-link"), "Warning link should be hidden");
+ is_element_visible(get_node(addon, "error"), "Error message should be visible");
+ is(get_node(addon, "error").textContent, "Test add-on 11 could not be verified for use in " + gApp + " and has been disabled.", "Error message should be correct");
+ is_element_visible(get_node(addon, "error-link"), "Error link should be visible");
+ is(get_node(addon, "error-link").value, "More Information", "Error link text should be correct");
+ is(get_node(addon, "error-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Error link should be correct");
+ is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
+
run_next_test();
});
});
@@ -412,7 +460,7 @@ add_test(function() {
gCategoryUtilities.openType("plugin", function() {
gCategoryUtilities.openType("extension", function() {
let items = get_test_items();
- is(Object.keys(items).length, 9, "Should be nine add-ons installed");
+ is(Object.keys(items).length, 11, "Should be the right number of add-ons installed");
info("Addon 1");
let addon = items["Test add-on"];
@@ -616,7 +664,7 @@ add_test(function() {
}]);
let items = get_test_items();
- is(Object.keys(items).length, 9, "Should be nine add-ons installed");
+ is(Object.keys(items).length, 11, "Should be the right number of add-ons installed");
let addon = items["Test add-on replacement"];
addon.parentNode.ensureElementIsVisible(addon);
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js b/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
new file mode 100644
index 00000000000..904a265596a
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
@@ -0,0 +1,234 @@
+// Enable signature checks for these tests
+Services.prefs.setBoolPref(PREF_XPI_SIGNATURES_REQUIRED, true);
+// Disable update security
+Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
+
+const DATA = "data/signing_checks/";
+const GOOD = [
+ ["signed_bootstrap_2.xpi", AddonManager.SIGNEDSTATE_SIGNED],
+ ["signed_nonbootstrap_2.xpi", AddonManager.SIGNEDSTATE_SIGNED]
+];
+const BAD = [
+ ["unsigned_bootstrap_2.xpi", AddonManager.SIGNEDSTATE_MISSING],
+ ["signed_bootstrap_badid_2.xpi", AddonManager.SIGNEDSTATE_BROKEN],
+ ["unsigned_nonbootstrap_2.xpi", AddonManager.SIGNEDSTATE_MISSING],
+ ["signed_nonbootstrap_badid_2.xpi", AddonManager.SIGNEDSTATE_BROKEN],
+];
+const ID = "test@tests.mozilla.org";
+
+const profileDir = gProfD.clone();
+profileDir.append("extensions");
+
+function verifySignatures() {
+ return new Promise(resolve => {
+ let observer = (subject, topic, data) => {
+ Services.obs.removeObserver(observer, "xpi-signature-changed");
+ resolve(JSON.parse(data));
+ }
+ Services.obs.addObserver(observer, "xpi-signature-changed", false);
+
+ do_print("Verifying signatures");
+ let XPIscope = Components.utils.import("resource://gre/modules/addons/XPIProvider.jsm");
+ XPIscope.XPIProvider.verifySignatures();
+ });
+}
+
+function run_test() {
+ createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "4", "4");
+
+ run_next_test();
+}
+
+function verify_no_change([startFile, startState], [endFile, endState]) {
+ add_task(function*() {
+ do_print("A switch from " + startFile + " to " + endFile + " should cause no change.");
+
+ // Install the first add-on
+ manuallyInstall(do_get_file(DATA + startFile), profileDir, ID);
+ startupManager();
+
+ let addon = yield promiseAddonByID(ID);
+ do_check_neq(addon, null);
+ let wasAppDisabled = addon.appDisabled;
+ do_check_neq(addon.appDisabled, addon.isActive);
+ do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+ do_check_eq(addon.signedState, startState);
+
+ // Swap in the files from the next add-on
+ manuallyUninstall(profileDir, ID);
+ manuallyInstall(do_get_file(DATA + endFile), profileDir, ID);
+
+ let events = {
+ [ID]: []
+ };
+
+ if (startState != endState)
+ events[ID].unshift(["onPropertyChanged", ["signedState"]]);
+
+ prepare_test(events);
+
+ // Trigger the check
+ let changes = yield verifySignatures();
+ do_check_eq(changes.enabled.length, 0);
+ do_check_eq(changes.disabled.length, 0);
+
+ do_check_eq(addon.appDisabled, wasAppDisabled);
+ do_check_neq(addon.appDisabled, addon.isActive);
+ do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+ do_check_eq(addon.signedState, endState);
+
+ // Remove the add-on and restart to let it go away
+ manuallyUninstall(profileDir, ID);
+ yield promiseRestartManager();
+ yield promiseShutdownManager();
+ });
+}
+
+function verify_enables([startFile, startState], [endFile, endState]) {
+ add_task(function*() {
+ do_print("A switch from " + startFile + " to " + endFile + " should enable the add-on.");
+
+ // Install the first add-on
+ manuallyInstall(do_get_file(DATA + startFile), profileDir, ID);
+ startupManager();
+
+ let addon = yield promiseAddonByID(ID);
+ do_check_neq(addon, null);
+ do_check_false(addon.isActive);
+ do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+ do_check_eq(addon.signedState, startState);
+
+ // Swap in the files from the next add-on
+ manuallyUninstall(profileDir, ID);
+ manuallyInstall(do_get_file(DATA + endFile), profileDir, ID);
+
+ let needsRestart = hasFlag(addon.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_ENABLE);
+ do_print(needsRestart);
+
+ let events = {};
+ if (!needsRestart) {
+ events[ID] = [
+ ["onPropertyChanged", ["appDisabled"]],
+ ["onEnabling", false],
+ "onEnabled"
+ ];
+ }
+ else {
+ events[ID] = [
+ ["onPropertyChanged", ["appDisabled"]],
+ "onEnabling"
+ ];
+ }
+
+ if (startState != endState)
+ events[ID].unshift(["onPropertyChanged", ["signedState"]]);
+
+ prepare_test(events);
+
+ // Trigger the check
+ let changes = yield verifySignatures();
+ do_check_eq(changes.enabled.length, 1);
+ do_check_eq(changes.enabled[0], ID);
+ do_check_eq(changes.disabled.length, 0);
+
+ do_check_false(addon.appDisabled);
+ if (needsRestart)
+ do_check_neq(addon.pendingOperations, AddonManager.PENDING_NONE);
+ else
+ do_check_true(addon.isActive);
+ do_check_eq(addon.signedState, endState);
+
+ ensure_test_completed();
+
+ // Remove the add-on and restart to let it go away
+ manuallyUninstall(profileDir, ID);
+ yield promiseRestartManager();
+ yield promiseShutdownManager();
+ });
+}
+
+function verify_disables([startFile, startState], [endFile, endState]) {
+ add_task(function*() {
+ do_print("A switch from " + startFile + " to " + endFile + " should disable the add-on.");
+
+ // Install the first add-on
+ manuallyInstall(do_get_file(DATA + startFile), profileDir, ID);
+ startupManager();
+
+ let addon = yield promiseAddonByID(ID);
+ do_check_neq(addon, null);
+ do_check_true(addon.isActive);
+ do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+ do_check_eq(addon.signedState, startState);
+
+ let needsRestart = hasFlag(addon.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_DISABLE);
+
+ // Swap in the files from the next add-on
+ manuallyUninstall(profileDir, ID);
+ manuallyInstall(do_get_file(DATA + endFile), profileDir, ID);
+
+ let events = {};
+ if (!needsRestart) {
+ events[ID] = [
+ ["onPropertyChanged", ["appDisabled"]],
+ ["onDisabling", false],
+ "onDisabled"
+ ];
+ }
+ else {
+ events[ID] = [
+ ["onPropertyChanged", ["appDisabled"]],
+ "onDisabling"
+ ];
+ }
+
+ if (startState != endState)
+ events[ID].unshift(["onPropertyChanged", ["signedState"]]);
+
+ prepare_test(events);
+
+ // Trigger the check
+ let changes = yield verifySignatures();
+ do_check_eq(changes.enabled.length, 0);
+ do_check_eq(changes.disabled.length, 1);
+ do_check_eq(changes.disabled[0], ID);
+
+ do_check_true(addon.appDisabled);
+ if (needsRestart)
+ do_check_neq(addon.pendingOperations, AddonManager.PENDING_NONE);
+ else
+ do_check_false(addon.isActive);
+ do_check_eq(addon.signedState, endState);
+
+ ensure_test_completed();
+
+ // Remove the add-on and restart to let it go away
+ manuallyUninstall(profileDir, ID);
+ yield promiseRestartManager();
+ yield promiseShutdownManager();
+ });
+}
+
+for (let start of GOOD) {
+ for (let end of BAD) {
+ verify_disables(start, end);
+ }
+}
+
+for (let start of BAD) {
+ for (let end of GOOD) {
+ verify_enables(start, end);
+ }
+}
+
+for (let start of GOOD) {
+ for (let end of GOOD.filter(f => f != start)) {
+ verify_no_change(start, end);
+ }
+}
+
+for (let start of BAD) {
+ for (let end of BAD.filter(f => f != start)) {
+ verify_no_change(start, end);
+ }
+}
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
index 3113825e82f..a59e9e3b8d2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -22,6 +22,7 @@ skip-if = appname != "firefox"
[test_provider_unsafe_access_shutdown.js]
[test_provider_unsafe_access_startup.js]
[test_shutdown.js]
+[test_signed_verify.js]
[test_signed_inject.js]
skip-if = true
[test_signed_install.js]
diff --git a/toolkit/themes/linux/global/in-content/common.css b/toolkit/themes/linux/global/in-content/common.css
index e3e19b4778f..fcadd858265 100644
--- a/toolkit/themes/linux/global/in-content/common.css
+++ b/toolkit/themes/linux/global/in-content/common.css
@@ -88,3 +88,7 @@ xul|*.text-link:-moz-focusring,
xul|*.inline-link:-moz-focusring {
border: 1px dotted -moz-DialogText;
}
+
+xul|spinbuttons {
+ -moz-appearance: none;
+}
diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/extensions/extensions.css
index 5c642fbbf1a..33bbf754bb7 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/extensions/extensions.css
@@ -2,318 +2,26 @@
* 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/. */
-@import url("chrome://global/skin/inContentUI.css");
+%include ../../../shared/extensions/extensions.inc.css
-
-/*** global warnings ***/
-
-.global-warning-container {
- overflow-x: hidden;
+#header-utils-btn .toolbarbutton-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native");
}
-.global-warning {
- -moz-box-align: center;
- padding: 0 8px;
- font-weight: bold;
-}
-
-.global-warning-text {
- color: -moz-FieldText;
-}
-
-#addons-page[warning] .global-warning-container {
- background-color: rgba(255, 255, 0, 0.1);
- background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
- background-repeat: repeat-x;
-}
-
-#detail-view .global-warning {
- padding: 4px 12px;
- border-bottom: 1px solid ThreeDShadow;
- min-height: 41px;
-}
-
-@media (max-width: 600px) {
- .global-warning-text {
- display: none;
- }
-}
-
-/* Plugins aren't yet disabled by safemode (bug 342333),
- so don't show that warning when viewing plugins. */
-#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
-#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
- background-color: inherit;
- background-image: none;
-}
-
-
-/*** notification icons ***/
-
.warning-icon {
list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu");
- width: 16px;
height: 16px;
- margin: 3px 0;
}
.error-icon {
list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu");
- width: 16px;
height: 16px;
- margin: 3px 0;
}
.pending-icon,
.info-icon {
list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu");
- width: 16px;
height: 16px;
- margin: 3px 0;
-}
-
-/*** view alert boxes ***/
-
-.alert-container {
- -moz-box-align: center;
-}
-
-.alert-spacer-before {
- -moz-box-flex: 1;
-}
-
-.alert-spacer-after {
- -moz-box-flex: 3;
-}
-
-.alert {
- -moz-box-align: center;
- padding: 10px;
- font-size: 12px;
- border: 1px solid ThreeDShadow;
- border-radius: 8px;
- color: WindowText;
- background-color: Window;
- background-clip: padding-box;
-}
-
-.alert .alert-title {
- font-weight: bold;
- font-size: 200%;
- margin-bottom: 15px;
-}
-
-.alert button {
- margin: 1em 2em;
-}
-
-.loading {
- list-style-image: url("chrome://global/skin/icons/loading_16.png");
- padding-left: 20px;
- padding-right: 20px;
-}
-
-/*** category selector ***/
-
-#categories {
- -moz-appearance: none;
- border: none;
- -moz-margin-end: -1px;
- background-color: transparent;
- position: relative;
- margin-top: 41px;
-}
-
-.category {
- -moz-appearance: none;
- border-width: 1px;
- -moz-border-end-width: 0;
- border-style: solid;
- border-color: transparent;
- padding: 10px 4px;
- -moz-box-align: center;
- overflow: hidden;
- min-height: 0;
- color: WindowText;
-}
-
-.category:-moz-locale-dir(ltr) {
- border-top-left-radius: 5px;
- border-bottom-left-radius: 5px;
-}
-
-.category:-moz-locale-dir(rtl) {
- border-top-right-radius: 5px;
- border-bottom-right-radius: 5px;
-}
-
-.category[disabled] {
- border-top: 0;
- border-bottom: 0;
- height: 0;
- opacity: 0;
- transition-property: height, opacity;
- transition-duration: 1s, 0.8s;
-}
-
-.category:not([disabled]) {
- height: 52px;
- transition-property: height, opacity;
- transition-duration: 1s, 0.8s;
-}
-
-.category[selected] {
- background-color: -moz-Field;
- color: -moz-FieldText;
- border-color: ThreeDShadow;
-}
-
-.category-name {
- font-size: 150%;
-}
-
-/* Maximize the size of the viewport when the window is small */
-@media (max-width: 800px) {
- .category-name {
- display: none;
- }
-}
-
-.category-badge {
- background-color: Highlight;
- padding: 2px 8px;
- margin: 6px 0;
- border-radius: 10000px;
- color: HighlightText;
- font-weight: bold;
- text-align: center;
-}
-
-.category-badge[value="0"] {
- visibility: hidden;
-}
-
-.category-icon {
- width: 32px;
- height: 32px;
- -moz-margin-start: 6px;
-}
-
-#category-search > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
-}
-#category-discover > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
-}
-#category-locale > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
-}
-#category-searchengine > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
-}
-#category-extension > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
-}
-#category-service > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
-}
-#category-theme > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
-}
-#category-plugin > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
-}
-#category-dictionary > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
-}
-#category-experiment > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
-}
-#category-availableUpdates > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
-}
-#category-recentUpdates > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
-}
-
-
-/*** header ***/
-
-#header {
- margin-bottom: 18px;
-}
-
-.nav-button {
- min-width: 0;
-}
-
-#back-btn:-moz-locale-dir(ltr) {
- list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar");
-}
-
-#forward-btn:-moz-locale-dir(ltr) {
- list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar");
-}
-
-#back-btn:-moz-locale-dir(rtl) {
- list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
-}
-
-#forward-btn:-moz-locale-dir(rtl) {
- list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
-}
-
-#back-btn[disabled="true"]:-moz-locale-dir(ltr) {
- list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
-}
-
-#forward-btn[disabled="true"]:-moz-locale-dir(ltr) {
- list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
-}
-
-#back-btn[disabled="true"]:-moz-locale-dir(rtl) {
- list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
-}
-
-#forward-btn[disabled="true"]:-moz-locale-dir(rtl) {
- list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
-}
-
-#header-utils-btn {
- min-width: 4.5em;
-}
-
-#header-utils-btn .toolbarbutton-icon {
- list-style-image: url("moz-icon://stock/gtk-preferences?size=toolbar");
-}
-
-#header-utils-btn:-moz-focusring > .button-box {
- border: none;
-}
-
-#header-search {
- margin: 0;
-}
-
-@media (max-width: 600px) {
- #header-search {
- width: 12em;
- }
-}
-
-.view-header {
- padding: 4px;
- margin: 0;
- min-height: 41px;
- background-color: ThreeDHighlight;
- border-bottom: 1px solid ThreeDShadow;
-}
-
-
-/*** sorters ***/
-
-.sort-controls {
- -moz-appearance: none;
}
.sorter[checkState="1"] .button-icon {
@@ -326,247 +34,7 @@
list-style-image: url("moz-icon://stock/gtk-sort-ascending?size=16");
}
-
-/*** discover view ***/
-
-.discover-spacer-before,
-.discover-spacer-after {
- -moz-box-flex: 1;
-}
-
-#discover-error .alert {
- max-width: 45em;
- -moz-box-flex: 1;
-}
-
-.discover-logo {
- list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
- -moz-margin-end: 15px;
-}
-
-.discover-title {
- font-weight: bold;
- font-size: 24px;
- font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
- margin: 0 0 15px 0;
-}
-
-.discover-description {
- text-align: justify;
- margin: 0 0 15px 0;
-}
-
-.discover-footer {
- text-align: justify;
-}
-
-
-/*** list ***/
-
-.list {
- -moz-appearance: none;
- margin: 0;
- border: none;
- background-color: transparent;
-}
-
-.addon {
- border-bottom: 1px solid ThreeDLightShadow;
- padding: 5px;
-}
-
-.addon[selected] .text-link,
-.addon[selected] .button-link {
- color: inherit;
-}
-
-.details {
- cursor: pointer;
- margin: 0;
- -moz-margin-start: 10px;
-}
-
-.icon-container {
- width: 48px;
- height: 48px;
- margin: 3px 7px;
- -moz-box-align: center;
- -moz-box-pack: center;
-}
-
-.icon {
- list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
- max-width: 48px;
- max-height: 48px;
-}
-
-.addon[active="false"] .icon {
- filter: grayscale(1);
-}
-
-.addon-view[type="theme"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-view[type="locale"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-view[type="plugin"] .icon {
- list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-view[type="dictionary"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-.addon-view[type="experiment"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
-}
-
-.name-container {
- font-size: 150%;
- margin-bottom: 0;
- font-weight: bold;
- -moz-box-align: end;
- -moz-box-flex: 1;
-}
-
-.creator {
- font-weight: bold;
-}
-
-.addon-view[active="false"]:not([selected]) {
- color: GrayText;
-}
-
-.description-container {
- -moz-margin-start: 6px;
- -moz-box-align: center;
-}
-
-.description {
- margin: 0;
-}
-
-.warning,
-.pending,
-.error {
- -moz-margin-start: 48px;
- -moz-box-align: center;
-}
-
-.content-container,
-.basicinfo-container {
- -moz-box-align: start;
-}
-
-.addon[status="installing"] > .content-container {
- -moz-box-align: stretch;
-}
-
-.advancedinfo-container,
-.update-info-container {
- -moz-box-align: center;
-}
-
-.update-available {
- -moz-box-align: end;
-}
-
-.install-status-container {
- -moz-box-pack: end;
- -moz-box-align: end;
-}
-
-.name-outer-container {
- -moz-box-pack: center;
-}
-
-.relnotes-toggle-container,
-.icon-outer-container {
- -moz-box-pack: start;
-}
-
-.status-container,
-.control-container {
- -moz-box-pack: end;
-}
-
-.addon-view:not([selected]) .warning {
- color: #90792E;
-}
-
-.addon-view:not([selected]) .error {
- color: #7C322B;
-}
-
-.addon-view:not([selected]) .pending {
- color: #4F7939;
-}
-
-.addon[active="false"] {
- background-image: linear-gradient(rgba(135, 135, 135, 0.2),
- rgba(135, 135, 135, 0.1));
-}
-
-.addon-view[notification="warning"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
- linear-gradient(rgba(255, 255, 0, 0.04),
- rgba(255, 255, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[notification="error"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
- linear-gradient(rgba(255, 0, 0, 0.04),
- rgba(255, 0, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
- linear-gradient(rgba(0, 255, 0, 0.04),
- rgba(0, 255, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
- linear-gradient(rgba(128, 128, 128, 0.04),
- rgba(128, 128, 128, 0));
- background-repeat: repeat-x;
-}
-
-.addon .relnotes-container {
- -moz-box-align: start;
- height: 0;
- overflow: hidden;
- opacity: 0;
- transition-property: height, opacity;
- transition-duration: 0.5s, 0.5s;
-}
-
-.addon[show-relnotes] .relnotes-container {
- opacity: 1;
- transition-property: height, opacity;
- transition-duration: 0.5s, 0.5s;
-}
-
-.addon .relnotes-header {
- font-weight: bold;
- margin: 10px 0;
-}
-
.addon .relnotes-toggle {
- -moz-appearance: none;
- border: none;
- background: transparent;
- font-weight: bold;
- cursor: pointer;
list-style-image: url("moz-icon://stock/gtk-go-down?size=16");
}
@@ -578,221 +46,6 @@
list-style-image: url("moz-icon://stock/gtk-go-up?size=16");
}
-
-/*** search view ***/
-
-#search-filter {
- padding: 5px 20px;
- font-size: 120%;
- overflow-x: hidden;
- border-bottom: 1px solid ThreeDShadow;
-}
-
-#search-filter-label {
- font-weight: bold;
-}
-
-#search-allresults-link {
- margin-top: 1em;
- margin-bottom: 2em;
-}
-
-/*** detail view ***/
-
-#detail-view[active="false"] .fade {
- opacity: 0.6;
-}
-
-#detail-view .loading {
- opacity: 0;
-}
-
-#detail-view[loading-extended] .loading {
- -moz-box-align: center;
- -moz-box-pack: center;
- opacity: 1;
- transition-property: opacity;
- transition-duration: 1s;
-}
-
-.detail-view-container {
- padding: 0 2em 2em 2em;
- font-size: 110%;
-}
-
-#detail-notifications {
- margin-top: 1em;
- margin-bottom: 2em;
-}
-
-#detail-notifications .warning,
-#detail-notifications .pending,
-#detail-notifications .error {
- -moz-margin-start: 0;
-}
-
-#detail-icon-container {
- width: 64px;
- -moz-margin-end: 10px;
-}
-
-#detail-icon {
- max-width: 64px;
- max-height: 64px;
-}
-
-#detail-summary {
- margin-bottom: 2em;
-}
-
-#detail-name-container {
- font-size: 200%;
-}
-
-#detail-screenshot {
- -moz-margin-end: 2em;
- max-width: 300px;
- max-height: 300px;
-}
-
-#detail-screenshot[loading] {
- background-image: url("chrome://global/skin/icons/loading_16.png");
- background-position: 50% 50%;
- background-repeat: no-repeat;
- border: 1px threedshadow solid;
- border-radius: 5px;
- box-sizing: border-box;
-}
-
-#detail-screenshot[loading="error"] {
- background-image: url("chrome://global/skin/media/error.png");
-}
-
-#detail-desc-container {
- margin-bottom: 2em;
-}
-
-#detail-desc, #detail-fulldesc {
- -moz-margin-start: 6px;
- /* This is necessary to fix layout issues with multi-line descriptions, see
- bug 592712*/
- outline: solid transparent;
- white-space: pre-wrap;
- min-width: 10em;
-}
-
-#detail-fulldesc {
- margin-top: 1em;
-}
-
-#detail-contributions {
- border-radius: 5px;
- border: 1px solid ThreeDShadow;
- margin-bottom: 2em;
- padding: 1em;
- background: ThreeDHighlight;
-}
-
-#detail-contrib-description {
- font-style: italic;
- margin-bottom: 1em;
-}
-
-#detail-contrib-suggested {
- color: GrayText;
-}
-
-#detail-grid {
- margin-bottom: 2em;
-}
-
-#detail-grid > columns > column:first-child {
- min-width: 15em;
- max-width: 25em;
-}
-
-.detail-row[first-row="true"],
-.detail-row-complex[first-row="true"],
-setting[first-row="true"] {
- border-top: none;
-}
-
-.detail-row,
-.detail-row-complex,
-setting {
- border-top: 1px solid ThreeDShadow;
- -moz-box-align: center;
- min-height: 32px;
-}
-
-#detail-controls {
- margin-bottom: 1em;
-}
-
-#detail-view[active="false"]:not([pending]):not([notification]) {
- background-image: linear-gradient(rgba(135, 135, 135, 0.1),
- rgba(135, 135, 135, 0));
-}
-
-setting[first-row="true"] {
- margin-top: 2em;
-}
-
-setting {
- -moz-box-align: start;
-}
-
-.preferences-alignment {
- min-height: 32px;
- -moz-box-align: center;
-}
-
-.preferences-description {
- font-size: 90.9%;
- color: graytext;
- margin-top: -2px;
- -moz-margin-start: 2em;
- white-space: pre-wrap;
-}
-
-.preferences-description:empty {
- display: none;
-}
-
-menulist { /* Fixes some styling inconsistencies */
- font-size: 100%;
- margin: 1px 5px 2px 5px;
-}
-
-colorpicker[type="button"] { /* Fixes some styling inconsistencies */
- height: 29px;
- margin: 1px 5px 2px 5px;
-}
-
-setting[type="radio"] > radiogroup {
- -moz-box-orient: horizontal;
-}
-
-/*** creator ***/
-
-.creator > label {
- -moz-margin-start: 0;
- -moz-margin-end: 0;
-}
-
-.creator > .text-link {
- margin-top: 1px;
- margin-bottom: 1px;
-}
-
-
-/*** rating ***/
-
-.meta-rating {
- -moz-margin-end: 0;
- vertical-align: text-top;
-}
-
.meta-rating[showrating="average"] > .star {
list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png");
padding: 0 1px;
@@ -808,149 +61,3 @@ setting[type="radio"] > radiogroup {
list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png");
padding: 0 1px;
}
-
-
-/*** download progress ***/
-
-.download-progress {
- width: 200px;
-}
-
-.download-progress .start-cap,
-.download-progress .end-cap {
- display: none;
-}
-
-.download-progress .progress {
- padding: 0;
- margin: 0;
- border: none;
-}
-
-.download-progress .cancel {
- -moz-appearance: none;
- background-color: ButtonFace;
- padding-bottom: 1px;
- -moz-padding-start: 2px;
- border-width: 1px;
- border-style: solid;
- border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
- border-radius: 10000px;
- min-width: 16px;
- width: 16px;
- height: 16px;
- margin: 3px;
-}
-
-.download-progress .cancel:hover {
- background-color: -moz-ButtonHoverFace;
-}
-
-.download-progress .cancel {
- list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
-}
-
-.download-progress .status-container {
- -moz-box-align: center;
-}
-
-
-/*** install status ***/
-
-.install-status {
- -moz-box-align: center;
-}
-
-
-/*** check for updates ***/
-
-#updates-container {
- -moz-box-align: center;
-}
-
-#updates-installed,
-#updates-downloaded {
- font-weight: bold;
-}
-
-#update-selected {
- margin: 12px;
-}
-
-
-/*** buttons ***/
-
-.addon-control[disabled="true"]:not(.no-auto-hide) {
- display: none;
-}
-
-.no-auto-hide .addon-control {
- display: block !important;
-}
-
-.addon-control.enable {
- list-style-image: url("moz-icon://stock/gtk-yes?size=button");
-}
-
-.addon-control.disable {
- list-style-image: url("moz-icon://stock/gtk-no?size=button");
-}
-
-.addon-control.remove {
- list-style-image: url("moz-icon://stock/gtk-remove?size=button");
-}
-
-.addon-control.preferences {
- list-style-image: url("moz-icon://stock/gtk-preferences?size=button");
-}
-
-.addon-control.install,
-.addon-control.update {
- list-style-image: url("moz-icon://stock/gtk-save?size=button");
-}
-
-.button-link {
- -moz-appearance: none;
- background: transparent;
- border: none;
- text-decoration: underline;
- color: -moz-nativehyperlinktext;
- cursor: pointer;
- min-width: 0;
- margin: 0 6px;
-}
-
-.button-link:active {
- color: -moz-activehyperlinktext;
-}
-
-.header-button .toolbarbutton-text {
- display: none;
-}
-
-/*** telemetry experiments ***/
-
-#detail-experiment-container {
- font-size: 80%;
- margin-bottom: 1em;
-}
-
-#detail-experiment-bullet-container,
-#detail-experiment-state,
-#detail-experiment-time,
-.experiment-bullet-container,
-.experiment-state,
-.experiment-time {
- vertical-align: middle;
- display: inline-block;
-}
-
-.addon .experiment-bullet,
-#detail-experiment-bullet {
- fill: rgb(158, 158, 158);
-}
-
-.addon[active="true"] .experiment-bullet,
-#detail-view[active="true"] #detail-experiment-bullet {
- fill: rgb(106, 201, 20);
-}
diff --git a/toolkit/themes/linux/mozapps/extensions/heart.png b/toolkit/themes/linux/mozapps/extensions/heart.png
new file mode 100644
index 00000000000..655f4c4be79
Binary files /dev/null and b/toolkit/themes/linux/mozapps/extensions/heart.png differ
diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index a13287a40a8..db6d7bc797e 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -6,7 +6,7 @@ toolkit.jar:
+ skin/classic/mozapps/update/updates.css (update/updates.css)
+ skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png)
+ skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css)
-+ skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css)
+* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css)
+ skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png)
+ skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png)
+ skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png)
@@ -22,6 +22,9 @@ toolkit.jar:
+ skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png)
* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css)
+ skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css)
++ skin/classic/mozapps/extensions/heart.png (extensions/heart.png)
++ skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png)
++ skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg)
+ skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png)
+ skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png)
+ skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png)
diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css
index 0017197aa63..3c0d7dfd219 100644
--- a/toolkit/themes/osx/global/in-content/common.css
+++ b/toolkit/themes/osx/global/in-content/common.css
@@ -89,11 +89,34 @@ xul|menulist:-moz-focusring,
xul|checkbox:-moz-focusring > .checkbox-check,
xul|radio[focused="true"] > .radio-check,
xul|tab:-moz-focusring > .tab-middle > .tab-text {
- outline: 2px solid rgba(0,149,221,0.5);
- outline-offset: 1px;
- -moz-outline-radius: 2px;
+ outline: 2px solid rgba(0,149,221,0.5);
+ outline-offset: 1px;
+ -moz-outline-radius: 2px;
}
xul|radio[focused="true"] > .radio-check {
- -moz-outline-radius: 100%;
+ -moz-outline-radius: 100%;
+}
+
+xul|spinbuttons {
+ -moz-appearance: none;
+}
+
+xul|*.spinbuttons-up {
+ margin-top: 0 !important;
+ border-radius: 4px 4px 0 0;
+}
+
+xul|*.spinbuttons-down {
+ margin-bottom: 0 !important;
+ border-radius: 0 0 4px 4px;
+}
+
+xul|*.spinbuttons-button > xul|*.button-box {
+ -moz-padding-start: 2px !important;
+ -moz-padding-end: 3px !important;
+}
+
+xul|*.spinbuttons-button > xul|*.button-box > xul|*.button-text {
+ display: none;
}
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/extensions/extensions.css
index 9614967a4b5..5297c25f394 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/extensions/extensions.css
@@ -2,298 +2,10 @@
* 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/. */
-@import url("chrome://global/skin/inContentUI.css");
+%include ../../../shared/extensions/extensions.inc.css
-%include ../../global/shared.inc
-
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-
-/*** global warnings ***/
-
-.global-warning-container {
- overflow-x: hidden;
-}
-
-.global-warning {
- -moz-box-align: center;
- padding: 0 8px;
- color: #916D15;
- font-weight: bold;
-}
-
-.global-warning,
-.global-warning .button-link {
- text-shadow: @loweredShadow@;
-}
-
-#addons-page[warning] .global-warning-container {
- background-color: rgba(255, 255, 0, 0.1);
- background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
- background-repeat: repeat-x;
-}
-
-#detail-view .global-warning {
- padding: 4px 12px;
- min-height: 31px;
- border-bottom: 1px solid rgba(50, 65, 92, 0.4);
-}
-
-@media (max-width: 600px) {
- .global-warning-text {
- display: none;
- }
-
- .global-warning .warning-icon {
- background-color: rgba(255, 255, 255, 0.7);
- box-shadow: 0px 0px 2px 4px rgba(255, 255, 255, 0.7);
- border-radius: 10px;
- }
-}
-
-/*** global informations ***/
-#addons-page .global-info-container {
- background-color: #e3e6eb;
- border-top-right-radius: 5px;
- border-top-left-radius: 5px;
-}
-
-/* Plugins aren't yet disabled by safemode (bug 342333),
- so don't show that warning when viewing plugins. */
-#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
-#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
- background-color: inherit;
- background-image: none;
-}
-
-
-/*** notification icons ***/
-
-.warning-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-.error-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-.pending-icon,
-.info-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-.addon-view[pending="disable"] .pending-icon,
-.addon-view[pending="uninstall"] .pending-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-
-/*** view alert boxes ***/
-
-.alert-container {
- -moz-box-align: center;
-}
-
-.alert-spacer-before {
- -moz-box-flex: 1;
-}
-
-.alert-spacer-after {
- -moz-box-flex: 3;
-}
-
-.alert {
- -moz-box-align: center;
- padding: 10px;
- color: #373D48;
- font-size: 12px;
- border: 1px solid #A8B8D1;
- border-radius: 8px;
- background-image: linear-gradient(rgba(255, 255, 255, 0.7), rgba(236, 241, 247, 0.7));
- background-clip: padding-box;
- box-shadow: 0 -3px 0 rgba(58, 78, 103, 0.05) inset,
- 0 3px 0 rgba(175, 195, 220, 0.3);
-}
-
-.alert .alert-title {
- font-weight: bold;
- font-size: 200%;
- margin-bottom: 15px;
-}
-
-.alert button {
- margin: 1em 2em;
-}
-
-.loading {
- list-style-image: url("chrome://global/skin/icons/loading_16.png");
- padding-left: 20px;
- padding-right: 20px;
-}
-
-
-
-/*** category selector ***/
-
-#categories {
- -moz-appearance: none;
- border: none;
- -moz-margin-end: -1px;
- background-color: transparent;
- position: relative;
- margin-top: 31px;
-}
-
-.category {
- -moz-appearance: none;
- color: #252F3B;
- border-width: 1px;
- border-style: solid;
- border-color: transparent;
- padding: 10px 4px;
- -moz-box-align: center;
- overflow: hidden;
- min-height: 0;
-}
-
-.category:-moz-locale-dir(ltr) {
- border-top-left-radius: 5px;
- border-bottom-left-radius: 5px;
-}
-
-.category:-moz-locale-dir(rtl) {
- border-top-right-radius: 5px;
- border-bottom-right-radius: 5px;
-}
-
-.category[disabled] {
- border-top: 0;
- border-bottom: 0;
- height: 0;
- opacity: 0;
- transition-property: height, opacity;
- transition-duration: 1s, 0.8s;
-}
-
-.category:not([disabled]) {
- height: 52px;
- transition-property: height, opacity;
- transition-duration: 1s, 0.8s;
-}
-
-.category[selected] {
- background-color: rgba(255, 255, 255, 0.35);
- color: -moz-dialogtext;
- border-color: rgba(50, 65, 92, 0.4);
- -moz-border-end-color: #C9CFD7;
-}
-
-.category-name {
- font-size: 150%;
-}
-
-/* Maximize the size of the viewport when the window is small */
-@media (max-width: 800px) {
- .category-name {
- display: none;
- }
-}
-
-.category-badge {
- background-color: #55D4FF;
- padding: 2px 8px;
- margin: 6px 0;
- border-radius: 10000px;
- color: #FFF;
- font-weight: bold;
- text-align: center;
-}
-
-.category-badge[value="0"] {
- visibility: hidden;
-}
-
-.category-icon {
- width: 32px;
- height: 32px;
- -moz-margin-start: 6px;
-}
-
-#category-search > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
-}
-#category-discover > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
-}
-#category-locale > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
-}
-#category-searchengine > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
-}
-#category-extension > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
-}
-#category-service > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
-}
-#category-theme > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
-}
-#category-plugin > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
-}
-#category-dictionary > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
-}
-#category-experiment > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
-}
-#category-availableUpdates > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
-}
-#category-recentUpdates > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
-}
-
-
-/*** header ***/
-
-#header {
- margin-bottom: 18px;
-}
-
-.nav-button {
- list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);
-}
-
-#back-btn:-moz-locale-dir(ltr),
-#forward-btn:-moz-locale-dir(rtl) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- border-right: none;
- -moz-image-region: rect(0, 20px, 20px, 0);
- padding-right: 3px;
-}
-
-#back-btn:-moz-locale-dir(rtl),
-#forward-btn:-moz-locale-dir(ltr) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- -moz-image-region: rect(0, 40px, 20px, 20px);
- padding-left: 3px;
+.no-auto-hide > .menulist-dropmarker {
+ -moz-padding-start: 0px !important;
}
#header-utils-btn {
@@ -307,80 +19,25 @@
-moz-margin-start: 2px;
}
-#header-search {
- margin: 0;
- -moz-appearance: none;
- padding: 3px 5px 2px;
- border: 1px solid rgba(60,73,97,0.5);
- border-radius: 10000px;
- box-shadow: inset 0 1px 1px rgba(0,0,0,0.15), 0 1px rgba(255,255,255,0.25);
- background: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.3));
- background-clip: padding-box;
+.warning-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
+ height: 15px;
}
-@media (max-width: 600px) {
- #header-search {
- width: 12em;
- }
+.error-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
+ height: 15px;
}
-#header-search[focused] {
- box-shadow: @focusRingShadow@, inset 0 1px 1px rgba(0,0,0,0.15);
- border-color: -moz-mac-focusring;
+.pending-icon,
+.info-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
+ height: 15px;
}
-#header-search > .textbox-input-box {
- -moz-padding-start: 15px;
- background: url("chrome://mozapps/skin/extensions/search.png") left no-repeat;
-}
-
-#header-search > .textbox-input-box:-moz-locale-dir(rtl) {
- background-position: right;
-}
-
-#header-search > .textbox-input-box > html|*.textbox-input::-moz-placeholder {
- color: #5C6470;
- opacity: 1.0;
-}
-
-.view-header {
- padding: 4px;
- margin: 0;
- min-height: 31px;
- border-bottom: 1px solid rgba(50, 65, 92, 0.4);
- background-image: linear-gradient(rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.05));
-}
-
-
-/*** sorters ***/
-
-.sort-controls {
- -moz-appearance: none;
-}
-
-.sorter {
- -moz-appearance: none;
- border: none;
- color: #41434B;
- background-color: transparent;
- border-radius: 10000px;
- padding: 0 6px;
- margin: 0 6px;
- min-width: 12px !important;
- -moz-box-direction: reverse;
-}
-
-.sorter[checkState="1"],
-.sorter[checkState="2"],
-.sorter:active:hover {
- text-shadow: @loweredShadow@;
- background-color: #C0C3CB;
- box-shadow: inset #A3A6AC 0 1px 1px, @loweredShadow@;
-}
-
-.sorter:hover {
- text-shadow: @loweredShadow@;
- background-color: #C0C3CB;
+.addon-view[pending="disable"] .pending-icon,
+.addon-view[pending="uninstall"] .pending-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
}
.sorter[checkState="1"] {
@@ -391,576 +48,18 @@
list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
}
-.sorter .button-icon {
- -moz-margin-start: 4px;
-}
-
-
-/*** discover view ***/
-
-.discover-spacer-before,
-.discover-spacer-after {
- -moz-box-flex: 1;
-}
-
-#discover-error .alert {
- max-width: 45em;
- -moz-box-flex: 1;
-}
-
-.discover-logo {
- list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
- -moz-margin-end: 15px;
-}
-
-.discover-title {
- font-weight: bold;
- font-size: 24px;
- font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
- margin: 0 0 15px 0;
-}
-
-.discover-description {
- text-align: justify;
- margin: 0 0 15px 0;
-}
-
-.discover-footer {
- text-align: justify;
-}
-
-
-/*** list ***/
-
-.list {
- -moz-appearance: none;
- margin: 0;
- border: none;
- background-color: transparent;
-}
-
-.addon {
- border-bottom: 1px solid #B6B1B9;
- padding: 5px;
- color: #373D48;
-}
-
-.details {
- cursor: pointer;
- margin: 0;
- -moz-margin-start: 10px;
-}
-
-.icon-container {
- width: 48px;
- height: 48px;
- margin: 3px 7px;
- -moz-box-align: center;
- -moz-box-pack: center;
-}
-
-.icon {
- list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
- max-width: 48px;
- max-height: 48px;
-}
-
-.addon[active="false"] .icon {
- filter: grayscale(1);
-}
-
-.addon-view[type="theme"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-view[type="locale"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-view[type="plugin"] .icon {
- list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-view[type="dictionary"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-.addon-view[type="experiment"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
-}
-
-.name-container {
- font-size: 150%;
- margin-bottom: 0;
- font-weight: bold;
- color: #000;
- text-shadow: @loweredShadow@;
- -moz-box-align: end;
- -moz-box-flex: 1;
-}
-
-.creator {
- font-weight: bold;
-}
-
-.creator .text-link {
- color: #0066CC;
-}
-
-.description-container {
- margin-top: 8px;
- -moz-margin-start: 6px;
- -moz-box-align: center;
-}
-
-.description {
- margin: 0;
-}
-
-.warning,
-.pending,
-.error {
- -moz-margin-start: 48px;
- font-weight: bold;
- text-shadow: @loweredShadow@;
- -moz-box-align: center;
-}
-
-.content-container,
-.basicinfo-container {
- -moz-box-align: start;
-}
-
-.addon[status="installing"] > .content-container {
- -moz-box-align: stretch;
-}
-
-.update-info-container {
- -moz-box-align: center;
-}
-
-.advancedinfo-container,
-.update-available {
- -moz-box-align: end;
-}
-
-.install-status-container {
- -moz-box-pack: end;
- -moz-box-align: end;
-}
-
-.name-outer-container {
- -moz-box-pack: center;
-}
-
-.relnotes-toggle-container,
-.icon-outer-container {
- -moz-box-pack: start;
-}
-
-.status-container,
-.control-container {
- -moz-box-pack: end;
-}
-
-.addon-view .warning {
- color: #916D15;
-}
-
-.addon-view .error {
- color: #864441;
-}
-
-.addon-view .pending {
- color: #1B7123;
-}
-
-.addon-view[pending="disable"] .pending,
-.addon-view[pending="uninstall"] .pending {
- color: #62666E;
-}
-
-.addon-view[notification="warning"] {
- background-image: linear-gradient(rgba(255, 255, 0, 0.2), rgba(255, 255, 0, 0.1));
-}
-
-.addon-view[notification="error"] {
- background-image: linear-gradient(rgba(255, 0, 0, 0.2), rgba(255, 0, 0, 0.1));
-}
-
-.addon-view[notification="info"] {
- background-image: linear-gradient(rgba(0, 0, 255, 0.2), rgba(0, 0, 255, 0.1));
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
- background-image: linear-gradient(rgba(0, 255, 0, 0.2), rgba(0, 255, 0, 0.1));
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
- background-image: linear-gradient(rgba(128, 128, 128, 0.2), rgba(128, 128, 128, 0.1));
-}
-
-.addon .relnotes-container {
- -moz-box-align: start;
- height: 0;
- overflow: hidden;
- opacity: 0;
- transition-property: height, opacity;
- transition-duration: 0.5s, 0.5s;
-}
-
-.addon[show-relnotes] .relnotes-container {
- opacity: 1;
- transition-property: height, opacity;
- transition-duration: 0.5s, 0.5s;
-}
-
-.addon .relnotes-header {
- font-weight: bold;
- margin: 10px 0;
-}
-
.addon .relnotes-toggle {
- -moz-appearance: none;
- border: none;
- background: transparent;
- font-weight: bold;
-moz-box-direction: reverse;
- cursor: pointer;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
-.addon .relnotes-toggle > .button-box > .button-icon {
- -moz-padding-start: 4px;
-}
-
.addon[show-relnotes] .relnotes-toggle {
list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
}
-.addon[active="false"] {
- background-color: rgba(135, 135, 135, 0.1);
- background-image: linear-gradient(rgba(135, 135, 135, 0),
- rgba(135, 135, 135, 0.1));
-}
-
-.addon-view[active="false"],
-.addon-view[active="false"] .name-container {
- color: #686A6B;
-}
-
-.addon-view[notification="warning"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
- linear-gradient(rgba(255, 255, 0, 0.04),
- rgba(255, 255, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[notification="error"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
- linear-gradient(rgba(255, 0, 0, 0.04),
- rgba(255, 0, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
- linear-gradient(rgba(0, 255, 0, 0.04),
- rgba(0, 255, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
- linear-gradient(rgba(128, 128, 128, 0.04),
- rgba(128, 128, 128, 0));
- background-repeat: repeat-x;
-}
-
-.addon[selected] {
- background-color: rgba(105, 125, 149, 0.39);
- color: black;
-}
-
-.addon[selected] .name-container {
- text-shadow: @loweredShadow@;
-}
-
-.addon[active="false"][selected] .name-container {
- color: #3F3F3F;
-}
-
-
-/*** search view ***/
-
-#search-filter {
- padding: 5px 20px;
- font-size: 120%;
- overflow-x: hidden;
- border-bottom: 1px solid rgba(50, 65, 92, 0.4);
-}
-
-#search-filter-label {
- font-weight: bold;
- color: #666;
-}
-
-.search-filter-radio {
- -moz-appearance: none;
- padding: 0 10px;
- margin: 0 3px;
- border-radius: 10000px;
-}
-
-.search-filter-radio[selected] {
- text-shadow: @loweredShadow@;
- background-color: #C0C3CB;
- box-shadow: inset #A3A6AC 0 1px 1px, @loweredShadow@;
-}
-
-.search-filter-radio:hover {
- text-shadow: @loweredShadow@;
- background-color: #C0C3CB;
-}
-
-.search-filter-radio .radio-check {
- display: none;
-}
-
-.search-filter-radio .radio-icon {
- display: none;
-}
-
-#search-allresults-link {
- margin-top: 1em;
- margin-bottom: 2em;
-}
-
-/*** detail view ***/
-
-#detail-view .loading {
- opacity: 0;
-}
-
-#detail-view[loading-extended] .loading {
- opacity: 1;
- transition-property: opacity;
- transition-duration: 1s;
-}
-
-.detail-view-container {
- padding: 0 2em 2em 2em;
- font-size: 110%;
-}
-
-#detail-notifications {
- margin-top: 1em;
- margin-bottom: 2em;
-}
-
-#detail-notifications .warning,
-#detail-notifications .pending,
-#detail-notifications .error {
- -moz-margin-start: 0;
-}
-
-#detail-icon-container {
- width: 64px;
- -moz-margin-end: 10px;
- margin-top: 6px;
-}
-
-#detail-icon {
- max-width: 64px;
- max-height: 64px;
-}
-
-#detail-summary {
- margin-bottom: 2em;
-}
-
-#detail-name-container {
- font-size: 200%;
-}
-
-#detail-screenshot {
- -moz-margin-end: 2em;
- max-width: 300px;
- max-height: 300px;
-}
-
-#detail-screenshot[loading] {
- background-image: url("chrome://global/skin/icons/loading_16.png"),
- linear-gradient(rgba(255, 255, 255, 0.5), transparent);
- background-position: 50% 50%;
- background-repeat: no-repeat;
- border-radius: 3px;
-}
-
-#detail-screenshot[loading="error"] {
- background-image: url("chrome://global/skin/media/error.png"),
- linear-gradient(rgba(255, 255, 255, 0.5), transparent);
-}
-
-#detail-desc-container {
- margin-bottom: 2em;
-}
-
-#detail-desc, #detail-fulldesc {
- -moz-margin-start: 6px;
- /* This is necessary to fix layout issues with multi-line descriptions, see
- bug 592712*/
- outline: solid transparent;
- white-space: pre-wrap;
- min-width: 10em;
-}
-
-#detail-fulldesc {
- margin-top: 1em;
-}
-
-#detail-contributions {
- border-radius: 5px;
- border: 1px solid rgba(50, 65, 92, 0.3);
- margin-bottom: 2em;
- padding: 1em;
- background-color: rgba(255, 255, 255, 0.35);
-}
-
-#detail-contrib-description {
- font-style: italic;
- margin-bottom: 1em;
- color: #373D48;
-}
-
-#detail-contrib-suggested {
- color: grey;
- font-weight: bold;
-}
-
-#detail-contrib-btn {
- -moz-appearance: none;
- color: #FFF;
- border: 1px solid #3A4EEE;
- border-radius: 3px;
- list-style-image: url("chrome://mozapps/skin/extensions/heart.png");
- background-color: #2F73EF;
- background-image: linear-gradient(rgba(251, 252, 253, 0.70), rgba(246, 247, 248, 0.27) 49%,
- rgba(231, 232, 233, 0.25) 51%, rgba(225, 226, 229, 0.1));
-}
-
-#detail-contrib-btn .button-box {
- padding: 0 6px 1px 6px;
-}
-
-#detail-contrib-btn .button-icon {
- -moz-margin-end: 3px;
-}
-
-#detail-contrib-btn:not(:active):hover {
- border-color: #4271FF;
- background-color: #0459F7;
- box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1),
- 0 0 3.5px hsl(190, 90%, 80%);
- transition: background-color .4s ease-in,
- border-color .3s ease-in,
- box-shadow .3s ease-in;
-}
-
-#detail-contrib-btn:active:hover {
- background-color: #8FA1C1;
- border-color: rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5);
- box-shadow: 0 0 6.5px rgba(0, 0, 0, 0.4) inset,
- 0 0 2px rgba(0, 0, 0, 0.4) inset;
-}
-
-#detail-grid {
- margin-bottom: 2em;
-}
-
-#detail-grid > columns > column:first-child {
- min-width: 15em;
- max-width: 25em;
-}
-
-.detail-row[first-row="true"],
-.detail-row-complex[first-row="true"],
-setting[first-row="true"] {
- border-top: none;
-}
-
-.detail-row,
-.detail-row-complex,
-setting {
- border-top: 2px solid;
- -moz-border-top-colors: rgba(28, 31, 37, 0.2) rgba(255, 255, 255, 0.2);
- -moz-box-align: center;
- min-height: 30px;
-}
-
-#detail-controls {
- margin-bottom: 1em;
-}
-
-#detail-view[active="false"]:not([pending]):not([notification]) {
- background-image: linear-gradient(rgba(135, 135, 135, 0.1),
- rgba(135, 135, 135, 0));
-}
-
-setting[first-row="true"] {
- margin-top: 2em;
-}
-
-setting {
- -moz-box-align: start;
-}
-
-.preferences-alignment {
- min-height: 30px;
- -moz-box-align: center;
-}
-
-.preferences-description {
- font-size: 90.9%;
- color: graytext;
- margin-top: -2px;
- -moz-margin-start: 2em;
- white-space: pre-wrap;
-}
-
-.preferences-description:empty {
- display: none;
-}
-
-setting[type="radio"] > radiogroup {
- -moz-box-orient: horizontal;
-}
-
-
-/*** creator ***/
-
-.creator > label {
- -moz-margin-start: 0;
- -moz-margin-end: 0;
-}
-
-.creator > .text-link {
- margin-top: 1px;
- margin-bottom: 1px;
-}
-
-
-/*** rating ***/
-
-.meta-rating {
- -moz-margin-end: 0;
- margin-top: 2px;
+.download-progress {
+ margin-top: 3px;
+ margin-bottom: 3px;
}
.meta-rating > .star {
@@ -971,229 +70,3 @@ setting[type="radio"] > radiogroup {
.meta-rating > .star[on="true"] {
list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png");
}
-
-
-/*** download progress ***/
-
-.download-progress {
- background-image: linear-gradient(#DCDEE3, #CBCED6);
- border: 1px solid #858898;
- border-radius: 3px;
- box-shadow: inset #E3E8EC 0 1px 1px, @loweredShadow@;
- width: 200px;
- height: 21px;
- margin: 0 8px;
-}
-
-.download-progress[mode="undetermined"] .progress {
- -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined");
-}
-
-.download-progress[mode="undetermined"] {
- border-color: #2E773A;
-}
-
-.download-progress[mode="undetermined"] .status-container {
- padding: 0 2px;
-}
-
-.download-progress .start-cap,
-.download-progress[complete] .end-cap,
-.download-progress[mode="undetermined"] .end-cap,
-.download-progress .progress .progress-bar {
- -moz-appearance: none;
- background-image: linear-gradient(#6AC47E, #4FAC6A);
- margin-top: -1px;
- margin-bottom: -1px;
- border: 1px solid #2E773A;
-}
-
-.download-progress .start-cap {
- -moz-margin-start: -1px;
- -moz-border-end-width: 0;
-}
-
-.download-progress .end-cap {
- -moz-margin-end: -1px;
- -moz-border-start-width: 0px !important;
-}
-
-.download-progress .progress .progress-bar {
- border-left-width: 0;
- border-right-width: 0;
- min-height: 21px;
-}
-
-.download-progress .progress {
- -moz-appearance: none;
- background-color: transparent;
- padding: 0;
- margin: 0;
- border: none;
-}
-
-.download-progress .start-cap,
-.download-progress .end-cap {
- width: 4px;
-}
-
-.download-progress .start-cap:-moz-locale-dir(ltr),
-.download-progress .end-cap:-moz-locale-dir(rtl) {
- border-radius: 3px 0 0 3px;
-}
-
-.download-progress .end-cap:-moz-locale-dir(ltr),
-.download-progress .start-cap:-moz-locale-dir(rtl) {
- border-radius: 0 3px 3px 0;
-}
-
-.download-progress .cancel {
- -moz-appearance: none;
- background-color: rgba(255, 255, 255, 0.15);
- border: 1px solid rgba(0, 0, 0, 0.4);
- padding: 3px;
- border-radius: 3px;
- min-width: 0;
- margin: 3px;
-}
-
-.download-progress .cancel .button-text {
- display: none;
-}
-
-.download-progress .cancel .button-icon {
- -moz-margin-start: 0;
-}
-
-.download-progress .cancel {
- list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
-}
-
-.download-progress .status-container {
- -moz-box-align: center;
-}
-
-.download-progress .status {
- text-shadow: @loweredShadow@;
-}
-
-
-/*** install status ***/
-
-.install-status {
- -moz-box-align: center;
-}
-
-
-/*** check for updates ***/
-
-#updates-container {
- -moz-box-align: center;
-}
-
-#updates-installed,
-#updates-downloaded {
- color: #3C735C;
- font-weight: bold;
-}
-
-#update-selected {
- margin: 12px;
-}
-
-
-/*** buttons ***/
-
-.addon-control[disabled="true"]:not(.no-auto-hide) {
- display: none;
-}
-
-.no-auto-hide .addon-control {
- display: block !important;
-}
-
-.no-auto-hide > .menulist-dropmarker {
- -moz-padding-start: 0px !important;
-}
-
-button.button-link {
- -moz-appearance: none;
- background: transparent;
- border: none;
- box-shadow: none;
- text-decoration: underline;
- color: #0066CC;
- cursor: pointer;
- min-width: 0;
- margin: 0 6px;
-}
-
-.text-link {
- color: #3386D5;
-}
-
-.button-link:hover,
-.text-link:hover {
- color: #3DA1FF;
-}
-
-/* Needed to override normal button style from inContent.css */
-button.button-link:not([disabled="true"]):active:hover {
- background: transparent;
- border: none;
- box-shadow: none;
-}
-
-.header-button {
- -moz-appearance: none;
- padding: 0 4px;
- margin: 0;
- height: 22px;
- border: 1px solid rgba(60,73,97,0.5);
- border-radius: @toolbarbuttonCornerRadius@;
- box-shadow: inset 0 1px rgba(255,255,255,0.25), 0 1px rgba(255,255,255,0.25);
- background: linear-gradient(rgba(255,255,255,0.45), transparent);
- background-clip: padding-box;
-}
-
-.header-button .toolbarbutton-text {
- display: none;
-}
-
-.header-button[disabled="true"] .toolbarbutton-icon {
- opacity: 0.4;
-}
-
-.header-button:not([disabled="true"]):active:hover,
-.header-button[open="true"] {
- border-color: rgba(45,54,71,0.7);
- box-shadow: inset 0 0 4px rgb(45,54,71), 0 1px rgba(255,255,255,0.25);
- background-image: linear-gradient(rgba(45,54,71,0.6), transparent);
-}
-
-/*** telemetry experiments ***/
-
-#detail-experiment-container {
- font-size: 80%;
- margin-bottom: 1em;
-}
-
-#detail-experiment-bullet-container,
-#detail-experiment-state,
-#detail-experiment-time,
-.experiment-bullet-container,
-.experiment-state,
-.experiment-time {
- vertical-align: middle;
- display: inline-block;
-}
-
-.addon .experiment-bullet,
-#detail-experiment-bullet {
- fill: rgb(158, 158, 158);
-}
-
-.addon[active="true"] .experiment-bullet,
-#detail-view[active="true"] #detail-experiment-bullet {
- fill: rgb(106, 201, 20);
-}
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index 974776a0bca..9b1f5d14e6d 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -32,7 +32,7 @@ toolkit.jar:
skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg)
skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (extensions/toolbarbutton-dropmarker.png)
skin/classic/mozapps/extensions/heart.png (extensions/heart.png)
- skin/classic/mozapps/extensions/navigation.png (extensions/navigation.png)
+ skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png)
skin/classic/mozapps/extensions/stripes-warning.png (extensions/stripes-warning.png)
skin/classic/mozapps/extensions/stripes-error.png (extensions/stripes-error.png)
skin/classic/mozapps/extensions/stripes-info-positive.png (extensions/stripes-info-positive.png)
diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/extensions/extensions.inc.css
new file mode 100644
index 00000000000..440d04ee070
--- /dev/null
+++ b/toolkit/themes/shared/extensions/extensions.inc.css
@@ -0,0 +1,1023 @@
+%if 0
+/* 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/. */
+%endif
+@import url("chrome://global/skin/in-content/common.css");
+
+.main-content {
+ padding-top: 0;
+ -moz-padding-end: 0;
+}
+
+#nav-header {
+ min-height: 39px;
+ background-color: #424f5a;
+}
+
+.view-pane > .list > scrollbox {
+ -moz-padding-end: 48px;
+}
+
+
+/*** global warnings ***/
+
+.global-warning-container {
+ overflow-x: hidden;
+}
+
+.global-warning {
+ -moz-box-align: center;
+ padding: 0 8px;
+ color: #916D15;
+ font-weight: bold;
+}
+
+#addons-page[warning] .global-warning-container {
+ background-color: rgba(255, 255, 0, 0.1);
+ background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
+ background-repeat: repeat-x;
+}
+
+#detail-view .global-warning {
+ padding: 4px 12px;
+ border-bottom: 1px solid #c1c1c1;
+}
+
+@media (max-width: 600px) {
+ .global-warning-text {
+ display: none;
+ }
+
+ .global-warning .warning-icon {
+ background-color: #fff;
+ box-shadow: 0 0 2px 5px #fff;
+ border-radius: 10px;
+ }
+}
+
+/*** global informations ***/
+#addons-page .global-info-container {
+ background-color: #f3f7fb;
+ border-top-right-radius: 2px;
+ border-top-left-radius: 2px;
+}
+
+/* Plugins aren't yet disabled by safemode (bug 342333),
+ so don't show that warning when viewing plugins. */
+#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
+#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
+ background-color: inherit;
+ background-image: none;
+}
+
+
+/*** notification icons ***/
+
+.warning-icon,
+.error-icon,
+.pending-icon,
+.info-icon {
+ width: 16px;
+ margin: 3px 0;
+}
+
+
+/*** view alert boxes ***/
+
+.alert-container {
+ -moz-box-align: center;
+ -moz-margin-end: 48px;
+}
+
+.alert-spacer-before {
+ -moz-box-flex: 1;
+}
+
+.alert-spacer-after {
+ -moz-box-flex: 3;
+}
+
+.alert {
+ -moz-box-align: center;
+ padding: 10px;
+ color: #333;
+ border: 1px solid #c1c1c1;
+ border-radius: 2px;
+ background-color: #ebebeb;
+}
+
+.alert .alert-title {
+ font-weight: bold;
+ font-size: 200%;
+ margin-bottom: 15px;
+}
+
+.alert button {
+ margin: 1em 2em;
+}
+
+.loading {
+ list-style-image: url("chrome://global/skin/icons/loading_16.png");
+ padding-left: 20px;
+ padding-right: 20px;
+}
+
+
+/*** category selector ***/
+
+#categories {
+ padding-top: 0;
+}
+
+.category[disabled] {
+ overflow: hidden;
+ height: 0;
+ min-height: 0;
+ opacity: 0;
+ transition-property: min-height, opacity;
+ transition-duration: 1s, 0.8s;
+}
+
+.category:not([disabled]) {
+ min-height: 40px;
+ transition-property: min-height, opacity;
+ transition-duration: 1s, 0.8s;
+}
+
+/* Maximize the size of the viewport when the window is small */
+@media (max-width: 800px) {
+ .category-name {
+ display: none;
+ }
+}
+
+.category-badge {
+ background-color: #55D4FF;
+ padding: 2px 8px;
+ margin: 6px 0;
+ -moz-margin-start: 6px;
+ border-radius: 100%;
+ color: #FFF;
+ font-weight: bold;
+ text-align: center;
+}
+
+.category-badge[value="0"] {
+ display: none;
+}
+
+#category-search > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
+}
+#category-discover > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
+}
+#category-locale > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
+}
+#category-searchengine > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
+}
+#category-extension > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
+}
+#category-service > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
+}
+#category-theme > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
+}
+#category-plugin > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
+}
+#category-dictionary > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
+}
+#category-experiment > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
+}
+#category-availableUpdates > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
+}
+#category-recentUpdates > .category-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
+}
+
+
+/*** header ***/
+
+#header {
+ margin-top: 20px;
+ margin-bottom: 20px;
+ -moz-margin-end: 48px;
+}
+
+@media (max-width: 600px) {
+ #header-search {
+ width: 12em;
+ }
+}
+
+.view-header {
+ margin: 0;
+ -moz-margin-end: 48px;
+ border-bottom: 1px solid #c1c1c1;
+}
+
+#header-utils-btn {
+ height: 30px;
+ line-height: 20px;
+ border-color: #c1c1c1;
+ background-color: #fbfbfb;
+ padding-right: 10px;
+ padding-left: 10px;
+}
+
+#header-utils-btn:not([disabled="true"]):active:hover,
+#header-utils-btn[open="true"] {
+ background-color: #dadada;
+}
+
+.header-button {
+ -moz-appearance: none;
+ border: 1px solid;
+ border-radius: 2px;
+}
+
+.header-button[disabled="true"] > .toolbarbutton-icon {
+ opacity: 0.4;
+}
+
+.header-button:not([disabled="true"]):hover,
+#header-utils-btn:not([disabled="true"]):hover {
+ background-color: #ebebeb;
+ cursor: pointer;
+}
+
+.header-button > .toolbarbutton-text {
+ display: none;
+}
+
+.nav-button {
+ list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);
+ margin-top: 15px;
+ margin-bottom: 15px;
+ border-color: transparent;
+}
+
+.nav-button:not([disabled="true"]):hover {
+ border-color: #ebebeb;
+}
+
+#back-btn:-moz-locale-dir(ltr),
+#forward-btn:-moz-locale-dir(rtl) {
+ -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#back-btn:-moz-locale-dir(rtl),
+#forward-btn:-moz-locale-dir(ltr) {
+ -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+
+/*** sorters ***/
+
+.sort-controls {
+ -moz-appearance: none;
+}
+
+.sorter {
+ height: 35px;
+ border: none;
+ border-radius: 0;
+ background-color: transparent;
+ color: #536680;
+ margin: 0;
+ min-width: 12px !important;
+ -moz-box-direction: reverse;
+}
+
+.sorter .button-box {
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
+.sorter[checkState="1"],
+.sorter[checkState="2"] {
+ background-color: #ebebeb;
+ box-shadow: 0 -4px 0 0 #ff9500 inset;
+}
+
+.sorter .button-icon {
+ -moz-margin-start: 6px;
+}
+
+
+/*** discover view ***/
+
+.discover-spacer-before,
+.discover-spacer-after {
+ -moz-box-flex: 1;
+}
+
+#discover-error .alert {
+ max-width: 45em;
+ -moz-box-flex: 1;
+}
+
+.discover-logo {
+ list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
+ -moz-margin-end: 15px;
+}
+
+.discover-title {
+ font-weight: bold;
+ font-size: 24px;
+ font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
+ margin: 0 0 15px 0;
+}
+
+.discover-description {
+ text-align: justify;
+ margin: 0 0 15px 0;
+}
+
+.discover-footer {
+ text-align: justify;
+}
+
+
+/*** list ***/
+
+.list {
+ -moz-appearance: none;
+ margin: 0;
+ border-color: transparent;
+ background-color: transparent;
+}
+
+.addon {
+ color: #444;
+ border-bottom: 1px solid #c1c1c1;
+ padding: 5px;
+ background-origin: border-box;
+}
+
+.addon:not(:only-child):last-child {
+ border-bottom-width: 0;
+}
+
+.details {
+ cursor: pointer;
+ margin: 0;
+ -moz-margin-start: 10px;
+}
+
+.icon-container {
+ width: 48px;
+ height: 48px;
+ margin: 3px 7px;
+ -moz-box-align: center;
+ -moz-box-pack: center;
+}
+
+.icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+ max-width: 48px;
+ max-height: 48px;
+}
+
+.content-inner-container {
+ -moz-margin-end: 5px;
+}
+
+.addon[active="false"] .icon {
+ filter: grayscale(1);
+}
+
+.addon-view[type="theme"] .icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+.addon-view[type="locale"] .icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+.addon-view[type="plugin"] .icon {
+ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+.addon-view[type="dictionary"] .icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+.addon-view[type="experiment"] .icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
+}
+
+.name-container {
+ font-size: 150%;
+ font-weight: bold;
+ -moz-box-align: end;
+ -moz-box-flex: 1;
+}
+
+.creator {
+ font-weight: bold;
+}
+
+.description-container {
+ -moz-margin-start: 6px;
+ -moz-box-align: center;
+}
+
+.description {
+ margin: 0;
+}
+
+.warning,
+.pending,
+.error {
+ -moz-margin-start: 48px;
+ font-weight: bold;
+ -moz-box-align: center;
+}
+
+.content-container,
+.basicinfo-container {
+ -moz-box-align: start;
+}
+
+.addon[status="installing"] > .content-container {
+ -moz-box-align: stretch;
+}
+
+.update-info-container {
+ -moz-box-align: center;
+}
+
+.update-available {
+ -moz-box-align: end;
+}
+
+.install-status-container {
+ -moz-box-pack: end;
+ -moz-box-align: end;
+}
+
+.name-outer-container {
+ -moz-box-pack: center;
+}
+
+.relnotes-toggle-container,
+.icon-outer-container {
+ -moz-box-pack: start;
+}
+
+.status-container,
+.control-container {
+ -moz-box-pack: end;
+}
+
+.addon-view .warning {
+ color: #916d15;
+}
+
+.addon-view .error {
+ color: #d74345;
+}
+
+.addon-view .pending {
+ color: #1b7123;
+}
+
+.addon-view[pending="disable"] .pending,
+.addon-view[pending="uninstall"] .pending {
+ color: #62666e;
+}
+
+.addon .relnotes-container {
+ -moz-box-align: start;
+ -moz-margin-start: 6px;
+ height: 0;
+ overflow: hidden;
+ opacity: 0;
+ transition-property: height, opacity;
+ transition-duration: 0.5s, 0.5s;
+}
+
+.addon[show-relnotes] .relnotes-container {
+ opacity: 1;
+ transition-property: height, opacity;
+ transition-duration: 0.5s, 0.5s;
+}
+
+.addon .relnotes-header {
+ font-weight: bold;
+ margin: 10px 0;
+}
+
+.addon .relnotes-toggle {
+ -moz-appearance: none;
+ border: none;
+ background: transparent;
+ font-weight: bold;
+ cursor: pointer;
+}
+
+.addon .relnotes-toggle > .button-box > .button-icon {
+ -moz-padding-start: 4px;
+}
+
+.addon-view[notification="warning"] {
+ background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
+ linear-gradient(rgba(255, 255, 0, 0.04),
+ rgba(255, 255, 0, 0));
+ background-repeat: repeat-x;
+}
+
+.addon-view[notification="error"] {
+ background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
+ linear-gradient(rgba(255, 0, 0, 0.04),
+ rgba(255, 0, 0, 0));
+ background-repeat: repeat-x;
+}
+
+.addon-view[pending="enable"],
+.addon-view[pending="upgrade"],
+.addon-view[pending="install"] {
+ background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
+ linear-gradient(rgba(0, 255, 0, 0.04),
+ rgba(0, 255, 0, 0));
+ background-repeat: repeat-x;
+}
+
+.addon-view[pending="disable"],
+.addon-view[pending="uninstall"] {
+ background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
+ linear-gradient(rgba(128, 128, 128, 0.04),
+ rgba(128, 128, 128, 0));
+ background-repeat: repeat-x;
+}
+
+.addon[selected] {
+ background-color: #fafafa;
+ color: #333;
+ -moz-padding-start: 1px; /* compensate the 4px border */
+ -moz-border-start: solid 4px #ff9500;
+}
+
+.addon[active="false"] {
+ opacity: 0.5;
+}
+
+.addon[active="false"][selected] {
+ opacity: 0.7;
+}
+
+
+/*** item - uninstalled ***/
+
+.addon[status="uninstalled"] {
+ border: none;
+}
+
+.addon[status="uninstalled"] > .container {
+ -moz-box-align: center;
+ padding: 4px 20px;
+ background-color: #FDFFA8;
+ border-radius: 8px;
+ font-size: 120%;
+}
+
+.addon[status="uninstalled"][selected] {
+ background-color: transparent;
+}
+
+
+/*** search view ***/
+
+#search-filter {
+ padding: 5px 20px;
+ -moz-margin-end: 48px;
+ font-size: 120%;
+ border-bottom: 1px solid #c1c1c1;
+ overflow-x: hidden;
+}
+
+#search-filter-label {
+ font-weight: bold;
+ color: grey;
+ -moz-margin-end: 10px;
+}
+
+#search-allresults-link {
+ margin-top: 1em;
+ margin-bottom: 2em;
+}
+
+
+/*** detail view ***/
+
+#detail-view {
+ -moz-margin-end: 48px;
+}
+
+#detail-view .loading {
+ opacity: 0;
+}
+
+#detail-view[loading-extended] .loading {
+ opacity: 1;
+ transition-property: opacity;
+ transition-duration: 1s;
+}
+
+.detail-view-container {
+ -moz-padding-end: 2em;
+ padding-bottom: 2em;
+ font-size: 110%;
+ color: #333;
+}
+
+#detail-notifications {
+ margin-top: 1em;
+ margin-bottom: 2em;
+}
+
+#detail-notifications .warning,
+#detail-notifications .pending,
+#detail-notifications .error {
+ -moz-margin-start: 0;
+}
+
+#detail-icon-container {
+ width: 64px;
+ -moz-margin-end: 10px;
+ margin-top: 6px;
+}
+
+#detail-icon {
+ max-width: 64px;
+ max-height: 64px;
+}
+
+#detail-summary {
+ margin-bottom: 2em;
+}
+
+#detail-name-container {
+ font-size: 200%;
+}
+
+#detail-screenshot-box {
+ -moz-margin-end: 2em;
+ padding: 10px;
+ background-color: white;
+ box-shadow: 0 1px 2px #666;
+}
+
+#detail-screenshot {
+ max-width: 300px;
+ max-height: 300px;
+}
+
+#detail-screenshot[loading] {
+ background-image: url("chrome://global/skin/icons/loading_16.png"),
+ linear-gradient(rgba(255, 255, 255, 0.5), transparent);
+ background-position: 50% 50%;
+ background-repeat: no-repeat;
+ border-radius: 2px;
+}
+
+#detail-screenshot[loading="error"] {
+ background-image: url("chrome://global/skin/media/error.png"),
+ linear-gradient(rgba(255, 255, 255, 0.5), transparent);
+}
+
+#detail-desc-container {
+ margin-bottom: 2em;
+}
+
+#detail-desc, #detail-fulldesc {
+ -moz-margin-start: 6px;
+ /* This is necessary to fix layout issues with multi-line descriptions, see
+ bug 592712*/
+ outline: solid transparent;
+ white-space: pre-wrap;
+ min-width: 10em;
+}
+
+#detail-fulldesc {
+ margin-top: 1em;
+}
+
+#detail-contributions {
+ border-radius: 2px;
+ border: 1px solid #D2DBE8;
+ margin-bottom: 2em;
+ padding: 1em;
+ background-color: #F3F7FB;
+}
+
+#detail-contrib-description {
+ font-style: italic;
+ margin-bottom: 1em;
+ color: #373D48;
+}
+
+#detail-contrib-suggested {
+ color: grey;
+ font-weight: bold;
+}
+
+#detail-contrib-btn {
+ color: #FFF;
+ text-shadow: none;
+ border: 1px solid #0095dd;
+ list-style-image: url("chrome://mozapps/skin/extensions/heart.png");
+ background-color: #0095dd;
+}
+
+#detail-contrib-btn .button-icon {
+ -moz-margin-end: 5px;
+}
+
+#detail-contrib-btn:not(:active):hover {
+ border-color: #008acb;
+ background-color: #008acb;
+}
+
+#detail-contrib-btn:active:hover {
+ background-color: #006b9d;
+ border-color: #006b9d;
+}
+
+#detail-grid {
+ margin-bottom: 2em;
+}
+
+#detail-grid > columns > column:first-child {
+ min-width: 15em;
+ max-width: 25em;
+}
+
+.detail-row[first-row="true"],
+.detail-row-complex[first-row="true"],
+setting[first-row="true"] {
+ border-top: none;
+}
+
+.detail-row,
+.detail-row-complex,
+setting {
+ border-top: 1px solid #c1c1c1;
+ -moz-box-align: center;
+ min-height: 35px;
+ font-size: 1.25rem;
+ line-height: 20px;
+ text-shadow: 0 1px 1px #fefffe;
+}
+
+#detail-controls {
+ margin-bottom: 1em;
+}
+
+setting[first-row="true"] {
+ margin-top: 2em;
+}
+
+setting {
+ -moz-box-align: start;
+}
+
+.preferences-alignment {
+ min-height: 30px;
+ -moz-box-align: center;
+}
+
+.preferences-description {
+ font-size: 90.9%;
+ color: graytext;
+ margin-top: -2px;
+ -moz-margin-start: 2em;
+ white-space: pre-wrap;
+}
+
+.preferences-description:empty {
+ display: none;
+}
+
+setting[type="radio"] > radiogroup {
+ -moz-box-orient: horizontal;
+}
+
+
+/*** creator ***/
+
+.creator > label {
+ -moz-margin-start: 0;
+ -moz-margin-end: 0;
+}
+
+.creator > .text-link {
+ margin-top: 1px;
+ margin-bottom: 1px;
+}
+
+
+/*** rating ***/
+
+.meta-rating {
+ -moz-margin-end: 0;
+ padding-top: 2px;
+}
+
+
+/*** download progress ***/
+
+.download-progress {
+ border: 1px solid #c1c1c1;
+ border-radius: 2px;
+ background-color: #fbfbfb;
+ width: 200px;
+ height: 30px;
+ margin: 2px 4px;
+}
+
+.download-progress[mode="undetermined"] {
+ border-color: #0095dd;
+}
+
+.download-progress .start-cap,
+.download-progress[complete] .end-cap,
+.download-progress[mode="undetermined"] .end-cap,
+.download-progress .progress .progress-bar {
+ -moz-appearance: none;
+ background-color: #0095dd;
+}
+
+.download-progress .progress .progress-bar {
+ min-height: 28px;
+}
+
+.download-progress .progress {
+ -moz-appearance: none;
+ background-color: transparent;
+ padding: 0;
+ margin: 0;
+ border: none;
+}
+
+.download-progress .start-cap,
+.download-progress .end-cap {
+ width: 4px;
+}
+
+.download-progress .start-cap:-moz-locale-dir(ltr),
+.download-progress .end-cap:-moz-locale-dir(rtl) {
+ border-radius: 1px 0 0 1px;
+}
+
+.download-progress .end-cap:-moz-locale-dir(ltr),
+.download-progress .start-cap:-moz-locale-dir(rtl) {
+ border-radius: 0 1px 1px 0;
+}
+
+.download-progress .cancel {
+ -moz-appearance: none;
+ padding: 3px;
+ min-width: 0;
+ width: 20px;
+ height: 20px;
+ margin: 3px;
+}
+
+.download-progress .cancel .button-box {
+ /* override in-content/common.css !important rule */
+ padding: 0 !important;
+ border: none;
+}
+
+.download-progress .cancel .button-text {
+ display: none;
+}
+
+.download-progress .cancel .button-icon {
+ margin: 0;
+}
+
+.download-progress .cancel {
+ list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
+}
+
+.download-progress .status-container {
+ -moz-box-align: center;
+}
+
+.download-progress .status {
+ color: #333;
+ text-shadow: #fff 0 0 2px;
+}
+
+
+/*** install status ***/
+
+.install-status {
+ -moz-box-align: center;
+}
+
+
+/*** check for updates ***/
+
+#updates-container {
+ -moz-box-align: center;
+}
+
+#updates-container .button-link {
+ font-weight: bold;
+}
+
+#updates-installed,
+#updates-downloaded {
+ color: #00BB00;
+ font-weight: bold;
+}
+
+#update-selected {
+ margin: 12px;
+}
+
+
+/*** buttons ***/
+
+.addon-control[disabled="true"]:not(.no-auto-hide) {
+ display: none;
+}
+
+.no-auto-hide .addon-control {
+ display: block !important;
+}
+
+button.button-link {
+ -moz-appearance: none;
+ background: transparent;
+ border: none;
+ box-shadow: none;
+ text-decoration: underline;
+ color: #0095dd;
+ cursor: pointer;
+ min-width: 0;
+ height: 20px;
+ margin: 0 6px;
+}
+
+button.button-link:not(:-moz-focusring) > .button-box {
+ border-width: 0;
+ margin: 1px;
+}
+
+.text-link {
+ color: #0095dd;
+ font-size: inherit;
+}
+
+button.button-link:hover,
+.text-link:hover {
+ color: #4cb1ff;
+ background-color: transparent;
+}
+
+/* Needed to override normal button style from inContent.css */
+button.button-link:not([disabled="true"]):active:hover {
+ background-color: transparent;
+}
+
+
+/*** telemetry experiments ***/
+
+#detail-experiment-container {
+ font-size: 80%;
+ margin-bottom: 1em;
+}
+
+#detail-experiment-bullet-container,
+#detail-experiment-state,
+#detail-experiment-time,
+.experiment-bullet-container,
+.experiment-state,
+.experiment-time {
+ vertical-align: middle;
+ display: inline-block;
+}
+
+.addon .experiment-bullet,
+#detail-experiment-bullet {
+ fill: rgb(158, 158, 158);
+}
+
+.addon[active="true"] .experiment-bullet,
+#detail-view[active="true"] #detail-experiment-bullet {
+ fill: rgb(106, 201, 20);
+}
diff --git a/toolkit/themes/shared/extensions/navigation.png b/toolkit/themes/shared/extensions/navigation.png
new file mode 100644
index 00000000000..67ff3d9a76f
Binary files /dev/null and b/toolkit/themes/shared/extensions/navigation.png differ
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 533f0a87fd1..487e5dadd69 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -333,20 +333,30 @@ xul|button[type="menu"] > xul|menupopup xul|menuitem {
-moz-padding-end: 30px;
}
-xul|menulist > xul|menupopup > xul|menu[_moz-menuactive="true"],
-xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
+xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
color: #333;
background-color: rgba(0,149,221,0.25);
}
-xul|menulist > xul|menupopup > xul|menu[selected="true"],
-xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
+xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
color: #fff;
- background-color: #0095DD;
+ background-color: #0095dd;
+}
+
+xul|menulist > xul|menupopup > xul|menu[disabled="true"],
+xul|menulist > xul|menupopup > xul|menuitem[disabled="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu[disabled="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem[disabled="true"] {
+ color: #999;
+ /* override the [_moz-menuactive="true"] background color from
+ global/menu.css */
+ background-color: transparent;
}
xul|menulist > xul|menupopup xul|menuseparator,
diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css
index b1e0e942f7e..04dd4a7d7f5 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -2,336 +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/. */
-@import url("chrome://global/skin/inContentUI.css");
-
-
-.nav-button {
- list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);
-}
-
-#forward-btn {
- -moz-border-start: none;
-}
-
-#back-btn:-moz-locale-dir(ltr),
-#forward-btn:-moz-locale-dir(rtl) {
- -moz-image-region: rect(0, 18px, 18px, 0);
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-#back-btn:-moz-locale-dir(rtl),
-#forward-btn:-moz-locale-dir(ltr) {
- -moz-image-region: rect(0, 36px, 18px, 18px);
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-
-/*** global warnings ***/
-
-.global-warning-container {
- overflow-x: hidden;
-}
-
-.global-warning {
- -moz-box-align: center;
- padding: 0 8px;
- color: #916D15;
- font-weight: bold;
-}
-
-#addons-page[warning] .global-warning-container {
- background-color: rgba(255, 255, 0, 0.1);
- background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
- background-repeat: repeat-x;
-}
-
-#detail-view .global-warning {
- padding: 4px 12px;
- border-bottom: 1px solid #CAD4E0;
-}
-
-@media (max-width: 600px) {
- .global-warning-text {
- display: none;
- }
-
- .global-warning .warning-icon {
- background-color: #FFF;
- box-shadow: 0px 0px 2px 5px #FFF;
- border-radius: 10px;
- }
-}
-
-/*** global informations ***/
-#addons-page .global-info-container {
- background-color: #f3f7fb;
- border-top-right-radius: 5px;
- border-top-left-radius: 5px;
-}
-
-/* Plugins aren't yet disabled by safemode (bug 342333),
- so don't show that warning when viewing plugins. */
-#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
-#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
- background-color: inherit;
- background-image: none;
-}
-
-
-/*** notification icons ***/
-
-.warning-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-.error-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-.pending-icon,
-.info-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-.addon-view[pending="disable"] .pending-icon,
-.addon-view[pending="uninstall"] .pending-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
- width: 16px;
- height: 15px;
- margin: 3px 0;
-}
-
-
-/*** view alert boxes ***/
-
-.alert-container {
- -moz-box-align: center;
-}
-
-.alert-spacer-before {
- -moz-box-flex: 1;
-}
-
-.alert-spacer-after {
- -moz-box-flex: 3;
-}
-
-.alert {
- -moz-box-align: center;
- padding: 10px;
- color: #373D48;
- border: 1px solid #A8B8D1;
- border-radius: 8px;
- background-image: linear-gradient(#FFF, #ECF1F7);
- background-clip: padding-box;
- box-shadow: 2px 2px 4px #999;
-}
-
-.alert .alert-title {
- font-weight: bold;
- font-size: 200%;
- margin-bottom: 15px;
-}
-
-.alert button {
- margin: 1em 2em;
-}
-
-.loading {
- list-style-image: url("chrome://global/skin/icons/loading_16.png");
- padding-left: 20px;
- padding-right: 20px;
-}
-
-
-/*** category selector ***/
-
-#categories {
- -moz-appearance: none;
- border: none;
- -moz-margin-end: -1px;
- background-color: transparent;
- position: relative;
- margin-top: 31px;
-}
-
-.category {
- -moz-appearance: none;
- background-color: transparent;
- color: #252F3B;
- min-height: 0;
- padding: 10px 4px;
- border-width: 1px;
- border-style: solid;
- border-color: transparent;
- -moz-box-align: center;
- overflow: hidden;
-}
-
-%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
-%endif
- .category:-moz-locale-dir(ltr) {
- border-top-left-radius: 5px;
- border-bottom-left-radius: 5px;
- }
-
- .category:-moz-locale-dir(rtl) {
- border-top-right-radius: 5px;
- border-bottom-right-radius: 5px;
- }
-%ifdef XP_WIN
-}
-%endif
-
-.category[disabled] {
- border-top: 0;
- border-bottom: 0;
- height: 0;
- opacity: 0;
- transition-property: height, opacity;
- transition-duration: 1s, 0.8s;
-}
-
-.category:not([disabled]) {
- height: 52px;
- transition-property: height, opacity;
- transition-duration: 1s, 0.8s;
-}
-
-.category[selected] {
- background-color: rgba(255, 255, 255, 0.4);
- color: #252F3B;
- border-color: #C3CEDF;
- -moz-border-end-color: #E2E9F2;
-}
-
-.category-name {
- font-size: 150%;
-}
-
-/* Maximize the size of the viewport when the window is small */
-@media (max-width: 800px) {
- .category-name {
- display: none;
- }
-}
-
-.category-badge {
- background-color: #55D4FF;
- padding: 2px 8px;
- margin: 6px 0;
- border-radius: 10000px;
- color: #FFF;
- font-weight: bold;
- text-align: center;
-}
-
-.category-badge[value="0"] {
- visibility: hidden;
-}
-
-.category-icon {
- width: 32px;
- height: 32px;
- -moz-margin-start: 6px;
-}
-
-#category-search > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
-}
-#category-discover > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
-}
-#category-locale > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
-}
-#category-searchengine > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
-}
-#category-extension > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
-}
-#category-service > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
-}
-#category-theme > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
-}
-#category-plugin > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
-}
-#category-dictionary > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
-}
-#category-experiment > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
-}
-#category-availableUpdates > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
-}
-#category-recentUpdates > .category-icon {
- list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
-}
-
-
-/*** header ***/
-
-#header {
- margin-bottom: 18px;
-}
-
-#header-search {
- margin: 0;
-}
-
-@media (max-width: 600px) {
- #header-search {
- width: 12em;
- }
-}
-
-@media (-moz-windows-default-theme) {
- #header-search {
- -moz-appearance: none;
- border: 1px solid rgba(0, 0, 0, 0.32);
- padding-bottom: 2px;
- background-color: rgba(255, 255, 255, 0.4);
- }
-
-%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
-%endif
- #header-search {
- border-radius: 2.5px;
- }
-%ifdef XP_WIN
-}
-%endif
-
- #header-search:hover {
- background-color: rgba(255, 255, 255, .75);
- }
-
- #header-search[focused] {
- background-color: white;
- }
-}
+%include ../../../shared/extensions/extensions.inc.css
#header-utils-btn {
list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities");
@@ -344,42 +15,25 @@
}
}
-.view-header {
- background-color: rgba(251, 252, 253, 0.25);
- padding: 4px;
- margin: 0;
- min-height: 31px;
- border-bottom: 1px solid #CAD4E0;
+.warning-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
+ height: 15px;
}
-
-/*** sorters ***/
-
-.sort-controls {
- -moz-appearance: none;
+.error-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
+ height: 15px;
}
-.sorter {
- -moz-appearance: none;
- border: none;
- background-color: transparent;
- color: #536680;
- border-radius: 10000px;
- padding: 0 6px;
- margin: 0 6px;
- min-width: 12px !important;
- -moz-box-direction: reverse;
+.pending-icon,
+.info-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
+ height: 15px;
}
-.sorter .button-box {
- padding-top: 0;
- padding-bottom: 0;
-}
-
-.sorter[checkState="1"],
-.sorter[checkState="2"] {
- background-color: rgba(194, 200, 206, 0.4);
- box-shadow: 1px 1px 2px #B6BBC4 inset;
+.addon-view[pending="disable"] .pending-icon,
+.addon-view[pending="uninstall"] .pending-icon {
+ list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
}
.sorter[checkState="1"] {
@@ -390,584 +44,15 @@
list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
}
-.sorter .button-icon {
- -moz-margin-start: 4px;
-}
-
-
-/*** discover view ***/
-
-.discover-spacer-before,
-.discover-spacer-after {
- -moz-box-flex: 1;
-}
-
-#discover-error .alert {
- max-width: 45em;
- -moz-box-flex: 1;
-}
-
-.discover-logo {
- list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
- -moz-margin-end: 15px;
-}
-
-.discover-title {
- font-weight: bold;
- font-size: 24px;
- font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
- margin: 0 0 15px 0;
-}
-
-.discover-description {
- text-align: justify;
- margin: 0 0 15px 0;
-}
-
-.discover-footer {
- text-align: justify;
-}
-
-
-/*** list ***/
-
-.list {
- -moz-appearance: none;
- margin: 0;
- border: none;
- background-color: transparent;
-}
-
-.addon {
- color: black;
- border-top: 2px solid;
- -moz-border-top-colors: rgba(0, 0, 0, 0.1) rgba(255, 255, 255, 0.1);
- border-bottom: 1px solid;
- -moz-border-bottom-colors: rgba(255, 255, 255, 0.1);
- padding: 5px;
- background-origin: border-box;
-}
-
-.view-pane:not(#search-view) .addon:first-of-type,
-#search-view .addon[first] {
- border-top-width: 1px;
- -moz-border-top-colors: rgba(255, 255, 255, 0.1);
-}
-
-.view-pane:not(#search-view) .addon:last-of-type,
-#search-view .addon[last] {
- border-bottom-width: 2px;
- -moz-border-bottom-colors: rgba(0, 0, 0, 0.1) rgba(255, 255, 255, 0.1);
-}
-
-.details {
- cursor: pointer;
- margin: 0;
- -moz-margin-start: 10px;
-}
-
-.icon-container {
- width: 48px;
- height: 48px;
- margin: 3px 7px;
- -moz-box-align: center;
- -moz-box-pack: center;
-}
-
-.icon {
- list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
- max-width: 48px;
- max-height: 48px;
-}
-
-.addon[active="false"] .icon {
- filter: grayscale(1);
-}
-
-
-.addon-view[type="theme"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-view[type="locale"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-view[type="plugin"] .icon {
- list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-view[type="dictionary"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-.addon-view[type="experiment"] .icon {
- list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
-}
-
-.name-container {
- font-size: 150%;
- font-weight: bold;
- color: #3F3F3F;
- margin-bottom: 0;
- -moz-box-align: end;
- -moz-box-flex: 1;
-}
-
-.creator {
- font-weight: bold;
-}
-
-.creator .text-link {
- color: #0066CC;
-}
-
-.description-container {
- -moz-margin-start: 6px;
- -moz-box-align: center;
-}
-
-.description {
- margin: 0;
-}
-
-.warning,
-.pending,
-.error {
- -moz-margin-start: 48px;
- font-weight: bold;
- -moz-box-align: center;
-}
-
-.content-container,
-.basicinfo-container {
- -moz-box-align: start;
-}
-
-.addon[status="installing"] > .content-container {
- -moz-box-align: stretch;
-}
-
-.advancedinfo-container,
-.update-info-container {
- -moz-box-align: center;
-}
-
-.update-available {
- -moz-box-align: end;
-}
-
-.install-status-container {
- -moz-box-pack: end;
- -moz-box-align: end;
-}
-
-.name-outer-container {
- -moz-box-pack: center;
-}
-
-.relnotes-toggle-container,
-.icon-outer-container {
- -moz-box-pack: start;
-}
-
-.status-container,
-.control-container {
- -moz-box-pack: end;
-}
-
-.addon-view .warning {
- color: #916D15;
-}
-
-.addon-view .error {
- color: #864441;
-}
-
-.addon-view .pending {
- color: #1B7123;
-}
-
-.addon-view[pending="disable"] .pending,
-.addon-view[pending="uninstall"] .pending {
- color: #62666E;
-}
-
-.addon .relnotes-container {
- -moz-box-align: start;
- -moz-margin-start: 6px;
- height: 0;
- overflow: hidden;
- opacity: 0;
- transition-property: height, opacity;
- transition-duration: 0.5s, 0.5s;
-}
-
-.addon[show-relnotes] .relnotes-container {
- opacity: 1;
- transition-property: height, opacity;
- transition-duration: 0.5s, 0.5s;
-}
-
-.addon .relnotes-header {
- font-weight: bold;
- margin: 10px 0;
-}
-
.addon .relnotes-toggle {
- -moz-appearance: none;
- border: none;
- background: transparent;
- font-weight: bold;
-moz-box-direction: reverse;
- cursor: pointer;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
}
-.addon .relnotes-toggle > .button-box > .button-icon {
- -moz-padding-start: 4px;
-}
-
.addon[show-relnotes] .relnotes-toggle {
list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
}
-.addon[active="false"] {
- background-color: rgba(135, 135, 135, 0.1);
- background-image: linear-gradient(rgba(135, 135, 135, 0),
- rgba(135, 135, 135, 0.1));
-}
-
-.addon-view[active="false"],
-.addon-view[active="false"] .name-container {
- color: #888A8B;
-}
-
-.addon-view[notification="warning"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
- linear-gradient(rgba(255, 255, 0, 0.04),
- rgba(255, 255, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[notification="error"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
- linear-gradient(rgba(255, 0, 0, 0.04),
- rgba(255, 0, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
- linear-gradient(rgba(0, 255, 0, 0.04),
- rgba(0, 255, 0, 0));
- background-repeat: repeat-x;
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
- background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
- linear-gradient(rgba(128, 128, 128, 0.04),
- rgba(128, 128, 128, 0));
- background-repeat: repeat-x;
-}
-
-.addon[selected] {
- background-color: rgba(148, 172, 204, 0.39);
- color: black;
-}
-
-.addon[active="false"][selected] .name-container {
- color: #3F3F3F;
-}
-
-
-/*** item - uninstalled ***/
-
-.addon[status="uninstalled"] {
- border: none;
-}
-
-.addon[status="uninstalled"] > .container {
- -moz-box-align: center;
- padding: 4px 20px;
- background-color: #FDFFA8;
- border-radius: 8px;
- font-size: 120%;
-}
-
-.addon[status="uninstalled"][selected] {
- background-color: transparent;
-}
-
-
-
-/*** search view ***/
-
-#search-filter {
- padding: 5px 20px;
- font-size: 120%;
- border-bottom: 1px solid #CAD4E0;
- overflow-x: hidden;
-}
-
-#search-filter-label {
- font-weight: bold;
- color: grey;
-}
-
-.search-filter-radio {
- -moz-appearance: none;
- padding: 0 6px;
- margin: 0 3px;
- border-radius: 10000px;
-}
-
-.search-filter-radio[selected] {
- background-color: grey;
- color: white;
-}
-
-.search-filter-radio .radio-check-box1 {
- display: none;
-}
-
-.search-filter-radio .radio-icon {
- display: none;
-}
-
-#search-allresults-link {
- margin-top: 1em;
- margin-bottom: 2em;
-}
-
-/*** detail view ***/
-
-#detail-view .loading {
- opacity: 0;
-}
-
-#detail-view[loading-extended] .loading {
- opacity: 1;
- transition-property: opacity;
- transition-duration: 1s;
-}
-
-.detail-view-container {
- padding: 0 2em 2em 2em;
- font-size: 110%;
-}
-
-#detail-notifications {
- margin-top: 1em;
- margin-bottom: 2em;
-}
-
-#detail-notifications .warning,
-#detail-notifications .pending,
-#detail-notifications .error {
- -moz-margin-start: 0;
-}
-
-#detail-icon-container {
- width: 64px;
- -moz-margin-end: 10px;
- margin-top: 6px;
-}
-
-#detail-icon {
- max-width: 64px;
- max-height: 64px;
-}
-
-#detail-summary {
- margin-bottom: 2em;
-}
-
-#detail-name-container {
- font-size: 200%;
-}
-
-#detail-screenshot {
- -moz-margin-end: 2em;
- max-width: 300px;
- max-height: 300px;
-}
-
-#detail-screenshot[loading] {
- background-image: url("chrome://global/skin/icons/loading_16.png"),
- linear-gradient(rgba(255, 255, 255, 0.5), transparent);
- background-position: 50% 50%;
- background-repeat: no-repeat;
- border-radius: 3px;
-}
-
-#detail-screenshot[loading="error"] {
- background-image: url("chrome://global/skin/media/error.png"),
- linear-gradient(rgba(255, 255, 255, 0.5), transparent);
-}
-
-#detail-desc-container {
- margin-bottom: 2em;
-}
-
-#detail-desc, #detail-fulldesc {
- -moz-margin-start: 6px;
- /* This is necessary to fix layout issues with multi-line descriptions, see
- bug 592712*/
- outline: solid transparent;
- white-space: pre-wrap;
- min-width: 10em;
-}
-
-#detail-fulldesc {
- margin-top: 1em;
-}
-
-#detail-contributions {
- border-radius: 5px;
- border: 1px solid #D2DBE8;
- margin-bottom: 2em;
- padding: 1em;
- background-color: #F3F7FB;
-}
-
-#detail-contrib-description {
- font-style: italic;
- margin-bottom: 1em;
- color: #373D48;
-}
-
-#detail-contrib-suggested {
- color: grey;
- font-weight: bold;
-}
-
-#detail-contrib-btn {
- -moz-appearance: none;
- color: #FFF;
- border: 1px solid #3A4EEE;
- border-radius: 3px;
- list-style-image: url("chrome://mozapps/skin/extensions/heart.png");
- background-color: #2F73EF;
- background-image: linear-gradient(rgba(251, 252, 253, 0.70), rgba(246, 247, 248, 0.27) 49%,
- rgba(231, 232, 233, 0.25) 51%, rgba(225, 226, 229, 0.1));
-}
-
-#detail-contrib-btn .button-box {
- padding: 0 6px 1px 6px;
-}
-
-#detail-contrib-btn .button-icon {
- -moz-margin-end: 3px;
-}
-
-#detail-contrib-btn:not(:active):hover {
- border-color: #4271FF;
- background-color: #0459F7;
- box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1),
- 0 0 3.5px hsl(190, 90%, 80%);
- transition: background-color .4s ease-in,
- border-color .3s ease-in,
- box-shadow .3s ease-in;
-}
-
-#detail-contrib-btn:active:hover {
- background-color: #8FA1C1;
- border-color: rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5);
- box-shadow: 0 0 6.5px rgba(0, 0, 0, 0.4) inset,
- 0 0 2px rgba(0, 0, 0, 0.4) inset,
- 0 1px 0 rgba(255, 255, 255, 0.4);
-}
-
-#detail-grid {
- margin-bottom: 2em;
-}
-
-#detail-grid > columns > column:first-child {
- min-width: 15em;
- max-width: 25em;
-}
-
-.detail-row[first-row="true"],
-.detail-row-complex[first-row="true"],
-setting[first-row="true"] {
- border-top: none;
-}
-
-.detail-row,
-.detail-row-complex,
-setting {
- border-top: 2px solid;
- -moz-border-top-colors: rgba(28, 31, 37, 0.1) rgba(255, 255, 255, 0.1);
- -moz-box-align: center;
- min-height: 30px;
-}
-
-#detail-controls {
- margin-bottom: 1em;
-}
-
-#detail-view[active="false"]:not([pending]):not([notification]) {
- background-image: linear-gradient(rgba(135, 135, 135, 0.1),
- rgba(135, 135, 135, 0));
-}
-
-setting[first-row="true"] {
- margin-top: 2em;
-}
-
-setting {
- -moz-box-align: start;
-}
-
-.preferences-alignment {
- min-height: 30px;
- -moz-box-align: center;
-}
-
-.preferences-description {
- font-size: 90.9%;
- color: graytext;
- margin-top: -2px;
- -moz-margin-start: 2em;
- white-space: pre-wrap;
-}
-
-.preferences-description:empty {
- display: none;
-}
-
-setting[type="radio"] > radiogroup {
- -moz-box-orient: horizontal;
-}
-
-menulist { /* Fixes some styling inconsistencies */
- margin: 1px 5px 2px 5px;
-}
-
-/*** creator ***/
-
-.creator > label {
- -moz-margin-start: 0;
- -moz-margin-end: 0;
-}
-
-.creator > .text-link {
- margin-top: 1px;
- margin-bottom: 1px;
-}
-
-
-/*** rating ***/
-
-.meta-rating {
- -moz-margin-end: 0;
- padding-top: 2px;
-}
-
.meta-rating > .star {
list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png");
padding: 0 1px;
@@ -976,262 +61,3 @@ menulist { /* Fixes some styling inconsistencies */
.meta-rating > .star[on="true"] {
list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png");
}
-
-
-/*** download progress ***/
-
-.download-progress {
- background-color: rgba(151,152,153,.05);
- background-image: linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0.47) 49%,
- rgba(231, 232, 233, 0.45) 51%, rgba(225, 226, 229, 0.3));
- background-clip: padding-box;
- border-radius: 3px;
- border: 1px solid;
- border-color: rgba(0, 0, 0, 0.12) rgba(0, 0, 0, 0.19) rgba(0, 0, 0, 0.38);
- box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset,
- 0 0 0 2px rgba(255, 255, 255, 0.1) inset;
- width: 200px;
- height: 21px;
- margin: 0 8px;
-}
-
-.download-progress[mode="undetermined"] {
- border-color: #358942 #317F3D #2E773A;
-}
-
-.download-progress[mode="undetermined"] .status-container {
- padding: 0 2px;
-}
-
-.download-progress .start-cap,
-.download-progress[complete] .end-cap,
-.download-progress[mode="undetermined"] .end-cap,
-.download-progress .progress .progress-bar {
- -moz-appearance: none;
- background-image: linear-gradient(#92DDA0, #6FC483 49%, #5EB272 51%, #80CE91);
- margin-top: -1px;
- margin-bottom: -1px;
- border: 1px solid;
- border-color: #358942 #317F3D #2E773A;
-}
-
-.download-progress .start-cap {
- -moz-margin-start: -1px;
- -moz-border-end-width: 0;
-}
-
-.download-progress .end-cap {
- -moz-margin-end: -1px;
- -moz-border-start-width: 0px !important;
-}
-
-.download-progress .progress .progress-bar {
- border-left-width: 0;
- border-right-width: 0;
- min-height: 21px;
-}
-
-.download-progress .progress {
- -moz-appearance: none;
- background-color: transparent;
- padding: 0;
- margin: 0;
- border: none;
-}
-
-.download-progress .start-cap,
-.download-progress .end-cap {
- width: 4px;
-}
-
-.download-progress .start-cap:-moz-locale-dir(ltr),
-.download-progress .end-cap:-moz-locale-dir(rtl) {
- border-radius: 3px 0 0 3px;
-}
-
-.download-progress .end-cap:-moz-locale-dir(ltr),
-.download-progress .start-cap:-moz-locale-dir(rtl) {
- border-radius: 0 3px 3px 0;
-}
-
-.download-progress .cancel {
- -moz-appearance: none;
- background-color: rgba(255, 255, 255, 0.4);
- border: 1px solid rgba(0, 0, 0, 0.4);
- padding: 3px;
- border-radius: 3px;
- min-width: 0;
- margin: 3px;
-}
-
-.download-progress .cancel:hover {
- background-color: rgba(255, 255, 255, 0.6);
- border: 1px solid rgba(0, 0, 0, 0.8);
-}
-
-.download-progress .cancel:active:hover {
- box-shadow: inset rgba(0, 0, 0, 0.5) 1px 1px 2px;
-}
-
-.download-progress .cancel .button-box {
- padding: 0;
- border: none;
-}
-
-.download-progress .cancel .button-text {
- display: none;
-}
-
-.download-progress .cancel .button-icon {
- -moz-margin-start: 0;
-}
-
-.download-progress .cancel {
- list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
-}
-
-.download-progress .status-container {
- -moz-box-align: center;
-}
-
-.download-progress .status {
- text-shadow: #FFF 0 0 2px;
-}
-
-/*** install status ***/
-
-.install-status {
- -moz-box-align: center;
-}
-
-
-/*** check for updates ***/
-
-#updates-container {
- -moz-box-align: center;
-}
-
-#updates-container .button-link {
- font-weight: bold;
-}
-
-#updates-installed,
-#updates-downloaded {
- color: #00BB00;
- font-weight: bold;
-}
-
-#update-selected {
- margin: 12px;
-}
-
-
-/*** buttons ***/
-
-.addon-control[disabled="true"]:not(.no-auto-hide) {
- display: none;
-}
-
-.no-auto-hide .addon-control {
- display: block !important;
-}
-
-button.button-link {
- -moz-appearance: none;
- background: transparent;
- border: none;
- box-shadow: none;
- text-decoration: underline;
- color: #0066CC;
- cursor: pointer;
- min-width: 0;
- margin: 0 6px;
-}
-
-.text-link {
- color: #3386D5;
-}
-
-.button-link:hover,
-.text-link:hover {
- color: #3DA1FF;
-}
-
-/* Needed to override normal button style from inContent.css */
-button.button-link:not([disabled="true"]):active:hover {
- background: transparent;
- border: none;
- box-shadow: none;
-}
-
-.header-button {
- -moz-appearance: none;
- padding: 1px 3px;
- color: #444;
- text-shadow: 0 0 3px white;
- background: linear-gradient(rgba(251, 252, 253, 0.95), transparent 49%,
- rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3));
- background-clip: padding-box;
- border: 1px solid rgba(31, 64, 100, 0.4);
- border-top-color: rgba(31, 64, 100, 0.3);
- box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset,
- 0 0 2px 1px rgba(255, 255, 255, 0.25) inset;
-}
-
-%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
-%endif
- .header-button {
- border-radius: 2.5px;
- }
-%ifdef XP_WIN
-}
-%endif
-
-.header-button[disabled="true"] {
- opacity: 0.8;
-}
-
-.header-button[disabled="true"] > .toolbarbutton-icon {
- opacity: 0.4;
-}
-
-.header-button:not([disabled="true"]):active:hover,
-.header-button[open="true"] {
- background-color: rgba(61, 76, 92, 0.2);
- border-color: rgba(39, 53, 68, 0.5);
- box-shadow: 0 0 3px 1px rgba(39, 53, 68, 0.2) inset;
-}
-
-.header-button > .toolbarbutton-text {
- display: none;
-}
-
-/*** telemetry experiments ***/
-
-#detail-experiment-container {
- font-size: 80%;
- margin-bottom: 1em;
-}
-
-#detail-experiment-bullet-container,
-#detail-experiment-state,
-#detail-experiment-time,
-.experiment-bullet-container,
-.experiment-state,
-.experiment-time {
- vertical-align: middle;
- display: inline-block;
-}
-
-.addon .experiment-bullet,
-#detail-experiment-bullet {
- fill: rgb(158, 158, 158);
-}
-
-.addon[active="true"] .experiment-bullet,
-#detail-view[active="true"] #detail-experiment-bullet {
- fill: rgb(106, 201, 20);
-}
diff --git a/toolkit/themes/windows/mozapps/extensions/navigation.png b/toolkit/themes/windows/mozapps/extensions/navigation.png
deleted file mode 100644
index 8ff639127ab..00000000000
Binary files a/toolkit/themes/windows/mozapps/extensions/navigation.png and /dev/null differ
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 6a6c8d94725..31f067e640a 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -34,7 +34,7 @@ toolkit.jar:
skin/classic/mozapps/extensions/cancel.png (extensions/cancel.png)
skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg)
skin/classic/mozapps/extensions/heart.png (extensions/heart.png)
- skin/classic/mozapps/extensions/navigation.png (extensions/navigation.png)
+ skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png)
skin/classic/mozapps/extensions/stripes-warning.png (extensions/stripes-warning.png)
skin/classic/mozapps/extensions/stripes-error.png (extensions/stripes-error.png)
skin/classic/mozapps/extensions/stripes-info-positive.png (extensions/stripes-info-positive.png)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index c310213e854..78876a66c20 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -585,7 +585,7 @@ bool gSafeMode = false;
* singleton.
*/
class nsXULAppInfo : public nsIXULAppInfo,
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
public nsIObserver,
#endif
#ifdef XP_WIN
@@ -603,7 +603,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIXULAPPINFO
NS_DECL_NSIXULRUNTIME
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
NS_DECL_NSIOBSERVER
#endif
#ifdef MOZ_CRASHREPORTER
@@ -618,7 +618,7 @@ public:
NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULRuntime)
NS_INTERFACE_MAP_ENTRY(nsIXULRuntime)
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
NS_INTERFACE_MAP_ENTRY(nsIObserver)
#endif
#ifdef XP_WIN
@@ -824,7 +824,7 @@ static bool gBrowserTabsRemoteAutostart = false;
static nsString gBrowserTabsRemoteDisabledReason;
static bool gBrowserTabsRemoteAutostartInitialized = false;
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
NS_IMETHODIMP
nsXULAppInfo::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) {
if (!nsCRT::strcmp(aTopic, "getE10SBlocked")) {
@@ -4339,7 +4339,7 @@ XRE_IsParentProcess()
return XRE_GetProcessType() == GeckoProcessType_Default;
}
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
static void
LogE10sBlockedReason(const char *reason) {
gBrowserTabsRemoteDisabledReason.Assign(NS_ConvertASCIItoUTF16(reason));
@@ -4381,7 +4381,7 @@ mozilla::BrowserTabsRemoteAutostart()
} else {
status = kE10sDisabledByUser;
}
-#if !defined(NIGHTLY_BUILD)
+#if !defined(E10S_TESTING_ONLY)
// When running tests with 'layers.offmainthreadcomposition.testing.enabled' and
// autostart set to true, return enabled. These tests must be allowed to run
// remotely. Otherwise remote isn't allowed in non-nightly builds.
@@ -4445,7 +4445,7 @@ mozilla::BrowserTabsRemoteAutostart()
gBrowserTabsRemoteAutostart = false;
status = kE10sDisabledForMacGfx;
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
LogE10sBlockedReason("Hardware acceleration is disabled");
#endif
}