diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 411f850c9323..af7753fab03f 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -4,6 +4,7 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
+@namespace svg url("http://www.w3.org/2000/svg");
#main-window:not([chromehidden~="toolbar"]) {
%ifdef XP_MACOSX
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 7d211ccabdd0..fb908c3946cb 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -404,14 +404,9 @@
-
-#ifdef XP_UNIX
- &syncStartPanel.subTitleUnix;
-#else
- &syncStartPanel.subTitle;
-#endif
-
+ value="&syncStartPanel2.heading;"/>
+
diff --git a/browser/base/content/highlighter.css b/browser/base/content/highlighter.css
index 6b9f5d27e4a6..cb29d4119626 100644
--- a/browser/base/content/highlighter.css
+++ b/browser/base/content/highlighter.css
@@ -6,25 +6,15 @@
pointer-events: none;
}
-.highlighter-outline-container {
- overflow: hidden;
- position: relative;
-}
-
-.highlighter-outline {
- position: absolute;
-}
-
-.highlighter-outline[hidden] {
- opacity: 0;
- pointer-events: none;
- display: -moz-box;
-}
-
-.highlighter-outline:not([disable-transitions]) {
- transition-property: opacity, top, left, width, height;
- transition-duration: 0.1s;
- transition-timing-function: linear;
+/*
+ * Box model highlighter
+ */
+svg|svg.box-model-root[hidden],
+svg|line.box-model-guide-top[hidden],
+svg|line.box-model-guide-right[hidden],
+svg|line.box-model-guide-left[hidden],
+svg|line.box-model-guide-bottom[hidden] {
+ display: none;
}
/*
@@ -45,13 +35,6 @@
display: -moz-box;
}
-.highlighter-nodeinfobar-positioner:not([disable-transitions]),
-.highlighter-nodeinfobar-positioner[disable-transitions][force-transitions] {
- transition-property: transform, opacity, top, left;
- transition-duration: 0.1s;
- transition-timing-function: linear;
-}
-
.highlighter-nodeinfobar-text {
overflow: hidden;
white-space: nowrap;
diff --git a/browser/base/content/socialmarks.xml b/browser/base/content/socialmarks.xml
index 60baee9fd737..5ca27a42f159 100644
--- a/browser/base/content/socialmarks.xml
+++ b/browser/base/content/socialmarks.xml
@@ -220,10 +220,11 @@
}
if (aResetOnClose) {
let evName = inMenuPanel ? "ViewHiding": "popuphidden";
- panel.addEventListener(evName, function _hidden() {
+ let _hidden = () => {
panel.removeEventListener(evName, _hidden);
this.update();
- }.bind(this), false);
+ };
+ panel.addEventListener(evName, _hidden, false);
}
]]>
@@ -282,12 +283,13 @@
if (!this.inMenuPanel)
sizeSocialPanelToContent(this.panel, this.content);
} else {
- this.content.addEventListener("load", function panelBrowserOnload(e) {
+ let panelBrowserOnload = (e) => {
this.content.removeEventListener("load", panelBrowserOnload, true);
this.dispatchPanelEvent("socialFrameShow");
if (!this.inMenuPanel)
sizeSocialPanelToContent(this.panel, this.content);
- }.bind(this), true);
+ };
+ this.content.addEventListener("load", panelBrowserOnload, true);
}
]]>
diff --git a/browser/base/content/test/general/domplate_test.js b/browser/base/content/test/general/domplate_test.js
index 75f2b25e2a52..b340b22ed61d 100644
--- a/browser/base/content/test/general/domplate_test.js
+++ b/browser/base/content/test/general/domplate_test.js
@@ -46,6 +46,6 @@ function test()
waitForFocus(createDocument, content);
}, true);
- content.location = "data:text/html,basic domplate tests";
+ content.location = "data:text/html;charset=utf-8,domplate_test.js";
}
diff --git a/browser/base/content/test/general/mochitest.ini b/browser/base/content/test/general/mochitest.ini
index 13acd7a6c5f6..caccc6f7f848 100644
--- a/browser/base/content/test/general/mochitest.ini
+++ b/browser/base/content/test/general/mochitest.ini
@@ -1,5 +1,5 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || e10s
support-files =
audio.ogg
bug364677-data.xml
diff --git a/browser/components/feeds/test/mochitest.ini b/browser/components/feeds/test/mochitest.ini
index c3ce5c0fcc2a..46725466ec33 100644
--- a/browser/components/feeds/test/mochitest.ini
+++ b/browser/components/feeds/test/mochitest.ini
@@ -1,5 +1,5 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || e10s
support-files =
bug368464-data.xml
bug408328-data.xml
diff --git a/browser/devtools/app-manager/test/head.js b/browser/devtools/app-manager/test/head.js
index 61f3228f5271..30870b62feea 100644
--- a/browser/devtools/app-manager/test/head.js
+++ b/browser/devtools/app-manager/test/head.js
@@ -19,6 +19,11 @@ const HOSTED_APP_MANIFEST = TEST_BASE + "hosted_app.manifest";
const PACKAGED_APP_DIR_PATH = getTestFilePath(".");
+gDevTools.testing = true;
+SimpleTest.registerCleanupFunction(() => {
+ gDevTools.testing = false;
+});
+
function addTab(url, targetWindow = window) {
info("Adding tab: " + url);
diff --git a/browser/devtools/commandline/test/head.js b/browser/devtools/commandline/test/head.js
index 40762de18dd1..646752238932 100644
--- a/browser/devtools/commandline/test/head.js
+++ b/browser/devtools/commandline/test/head.js
@@ -10,6 +10,11 @@ let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
Services.scriptloader.loadSubScript(testDir + "/mockCommands.js", this);
+gDevTools.testing = true;
+SimpleTest.registerCleanupFunction(() => {
+ gDevTools.testing = false;
+});
+
function whenDelayedStartupFinished(aWindow, aCallback) {
Services.obs.addObserver(function observer(aSubject, aTopic) {
if (aWindow == aSubject) {
diff --git a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js
index 56fe91ee8fb6..e48f38a7b40b 100644
--- a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js
@@ -45,7 +45,7 @@ function test() {
.then(testWindowClosed)
.then(removeTabB)
.then(checkSingleTab)
- .then(finish);
+ .then(finishUp);
}
function checkSingleTab() {
@@ -208,3 +208,8 @@ function removeTabB() {
removeTab(gTabB);
return deferred.promise;
}
+
+function finishUp() {
+ gTabList = gFirstActor = gActorA = gTabA = gTabB = gTabC = gNewWindow = null;
+ finish();
+}
diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js b/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js
index e11f17325b47..96b2f48f9e77 100644
--- a/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js
+++ b/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js
@@ -207,4 +207,5 @@ registerCleanupFunction(function() {
gDebuggee = null;
gPanel = null;
gDebugger = null;
+ gVariables = null;
});
diff --git a/browser/devtools/debugger/test/head.js b/browser/devtools/debugger/test/head.js
index 3ce51dfe49a7..2472a024b732 100644
--- a/browser/devtools/debugger/test/head.js
+++ b/browser/devtools/debugger/test/head.js
@@ -27,6 +27,11 @@ let Toolbox = devtools.Toolbox;
const EXAMPLE_URL = "http://example.com/browser/browser/devtools/debugger/test/";
+gDevTools.testing = true;
+SimpleTest.registerCleanupFunction(() => {
+ gDevTools.testing = false;
+});
+
// All tests are asynchronous.
waitForExplicitFinish();
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector.js b/browser/devtools/fontinspector/test/browser_fontinspector.js
index 2ab140040e83..c198938e53d5 100644
--- a/browser/devtools/fontinspector/test/browser_fontinspector.js
+++ b/browser/devtools/fontinspector/test/browser_fontinspector.js
@@ -16,6 +16,11 @@ function test() {
let viewDoc;
let inspector;
+ gDevTools.testing = true;
+ SimpleTest.registerCleanupFunction(() => {
+ gDevTools.testing = false;
+ });
+
gBrowser.selectedTab = gBrowser.addTab();
gBrowser.selectedBrowser.addEventListener("load", function onload() {
gBrowser.selectedBrowser.removeEventListener("load", onload, true);
diff --git a/browser/devtools/framework/gDevTools.jsm b/browser/devtools/framework/gDevTools.jsm
index e90c39cd3a26..8a593b11c28f 100644
--- a/browser/devtools/framework/gDevTools.jsm
+++ b/browser/devtools/framework/gDevTools.jsm
@@ -32,6 +32,8 @@ this.DevTools = function DevTools() {
this.destroy = this.destroy.bind(this);
this._teardown = this._teardown.bind(this);
+ this._testing = false;
+
EventEmitter.decorate(this);
Services.obs.addObserver(this._teardown, "devtools-unloaded", false);
@@ -39,6 +41,29 @@ this.DevTools = function DevTools() {
}
DevTools.prototype = {
+ /**
+ * When the testing flag is set we take appropriate action to prevent race
+ * conditions in our testing environment. This means setting
+ * dom.send_after_paint_to_content to false to prevent infinite MozAfterPaint
+ * loops and not autohiding the highlighter.
+ */
+ get testing() {
+ return this._testing;
+ },
+
+ set testing(state) {
+ this._testing = state;
+
+ if (state) {
+ // dom.send_after_paint_to_content is set to true (non-default) in
+ // testing/profiles/prefs_general.js so lets set it to the same as it is
+ // in a default browser profile for the duration of the test.
+ Services.prefs.setBoolPref("dom.send_after_paint_to_content", false);
+ } else {
+ Services.prefs.setBoolPref("dom.send_after_paint_to_content", true);
+ }
+ },
+
/**
* Register a new developer tool.
*
diff --git a/browser/devtools/framework/selection.js b/browser/devtools/framework/selection.js
index be8b3778874b..f01ce77a794e 100644
--- a/browser/devtools/framework/selection.js
+++ b/browser/devtools/framework/selection.js
@@ -160,20 +160,22 @@ Selection.prototype = {
setNodeFront: function(value, reason="unknown") {
this.reason = reason;
- if (value !== this._nodeFront) {
- let rawValue = null;
- if (value && value.isLocal_toBeDeprecated()) {
- rawValue = value.rawNode();
- }
- this.emit("before-new-node", rawValue, reason);
- this.emit("before-new-node-front", value, reason);
- let previousNode = this._node;
- let previousFront = this._nodeFront;
- this._node = rawValue;
- this._nodeFront = value;
- this.emit("new-node", previousNode, this.reason);
- this.emit("new-node-front", value, this.reason);
+
+ // We used to return here if the node had not changed but we now need to
+ // set the node even if it is already set otherwise it is not possible to
+ // e.g. highlight the same node twice.
+ let rawValue = null;
+ if (value && value.isLocal_toBeDeprecated()) {
+ rawValue = value.rawNode();
}
+ this.emit("before-new-node", rawValue, reason);
+ this.emit("before-new-node-front", value, reason);
+ let previousNode = this._node;
+ let previousFront = this._nodeFront;
+ this._node = rawValue;
+ this._nodeFront = value;
+ this.emit("new-node", previousNode, this.reason);
+ this.emit("new-node-front", value, this.reason);
},
get documentFront() {
diff --git a/browser/devtools/framework/test/head.js b/browser/devtools/framework/test/head.js
index c586a168b255..a07c621a5a01 100644
--- a/browser/devtools/framework/test/head.js
+++ b/browser/devtools/framework/test/head.js
@@ -13,6 +13,11 @@ let promise = tempScope.Promise;
let {devtools} = Components.utils.import("resource://gre/modules/devtools/Loader.jsm", {});
let TargetFactory = devtools.TargetFactory;
+gDevTools.testing = true;
+SimpleTest.registerCleanupFunction(() => {
+ gDevTools.testing = false;
+});
+
/**
* Open a new tab at a URL and call a callback on load
*/
diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index f803021a5897..e0ef96441387 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -73,6 +73,8 @@ function Toolbox(target, selectedTool, hostType, hostOptions) {
this._splitConsoleOnKeypress = this._splitConsoleOnKeypress.bind(this)
this.destroy = this.destroy.bind(this);
this.highlighterUtils = new ToolboxHighlighterUtils(this);
+ this._highlighterReady = this._highlighterReady.bind(this);
+ this._highlighterHidden = this._highlighterHidden.bind(this);
this._target.on("close", this.destroy);
@@ -1097,8 +1099,14 @@ Toolbox.prototype = {
this._inspector = InspectorFront(this._target.client, this._target.form);
this._walker = yield this._inspector.getWalker();
this._selection = new Selection(this._walker);
+
if (this.highlighterUtils.isRemoteHighlightable) {
- this._highlighter = yield this._inspector.getHighlighter();
+ let autohide = !gDevTools.testing;
+
+ this.walker.on("highlighter-ready", this._highlighterReady);
+ this.walker.on("highlighter-hide", this._highlighterHidden);
+
+ this._highlighter = yield this._inspector.getHighlighter(autohide);
}
}.bind(this));
}
@@ -1110,6 +1118,10 @@ Toolbox.prototype = {
* Returns a promise that resolves when the fronts are destroyed
*/
destroyInspector: function() {
+ if (this._destroying) {
+ return this._destroying;
+ }
+
if (!this._inspector) {
return promise.resolve();
}
@@ -1125,6 +1137,11 @@ Toolbox.prototype = {
this._selection.destroy();
}
+ if (this.walker) {
+ this.walker.off("highlighter-ready", this._highlighterReady);
+ this.walker.off("highlighter-hide", this._highlighterHidden);
+ }
+
this._inspector = null;
this._highlighter = null;
this._selection = null;
@@ -1135,7 +1152,9 @@ Toolbox.prototype = {
// Releasing the walker (if it has been created)
// This can fail, but in any case, we want to continue destroying the
// inspector/highlighter/selection
- let walker = this._walker ? this._walker.release() : promise.resolve();
+ let walker = (this._destroying = this._walker) ?
+ this._walker.release() :
+ promise.resolve();
return walker.then(outstanding, outstanding);
},
@@ -1224,7 +1243,15 @@ Toolbox.prototype = {
this._host = null;
this._toolPanels.clear();
}).then(null, console.error);
- }
+ },
+
+ _highlighterReady: function() {
+ this.emit("highlighter-ready");
+ },
+
+ _highlighterHidden: function() {
+ this.emit("highlighter-hide");
+ },
};
/**
@@ -1284,6 +1311,7 @@ ToolboxHighlighterUtils.prototype = {
let deferred = promise.defer();
let done = () => {
+ this._isPicking = true;
this.toolbox.emit("picker-started");
this.toolbox.on("select", this.stopPicker);
deferred.resolve();
@@ -1293,20 +1321,20 @@ ToolboxHighlighterUtils.prototype = {
this.toolbox.initInspector(),
this.toolbox.selectTool("inspector")
]).then(() => {
- this._isPicking = true;
this.toolbox._pickerButton.setAttribute("checked", "true");
if (this.isRemoteHighlightable) {
- this.toolbox.highlighter.pick().then(done);
-
this.toolbox.walker.on("picker-node-hovered", this._onPickerNodeHovered);
this.toolbox.walker.on("picker-node-picked", this._onPickerNodePicked);
+
+ this.toolbox.highlighter.pick().then(done);
} else {
- this.toolbox.walker.pick().then(node => {
- this.toolbox.selection.setNodeFront(node, "picker-node-picked");
- this.stopPicker();
+ return this.toolbox.walker.pick().then(node => {
+ this.toolbox.selection.setNodeFront(node, "picker-node-picked").then(() => {
+ this.stopPicker();
+ done();
+ });
});
- done();
}
});
@@ -1404,11 +1432,16 @@ ToolboxHighlighterUtils.prototype = {
* Hide the highlighter.
* @return a promise that resolves when the highlighter is hidden
*/
- unhighlight: function() {
+ unhighlight: function(forceHide=false) {
if (this.isRemoteHighlightable) {
// If the remote highlighter exists on the target, use it
return this.toolbox.initInspector().then(() => {
- return this.toolbox.highlighter.hideBoxModel();
+ let autohide = forceHide || !gDevTools.testing;
+
+ if (autohide) {
+ return this.toolbox.highlighter.hideBoxModel();
+ }
+ return promise.resolve();
});
} else {
// If not, no need to unhighlight as the older highlight method uses a
diff --git a/browser/devtools/inspector/breadcrumbs.js b/browser/devtools/inspector/breadcrumbs.js
index dec6f5a09c5e..0ec7fce177db 100644
--- a/browser/devtools/inspector/breadcrumbs.js
+++ b/browser/devtools/inspector/breadcrumbs.js
@@ -699,7 +699,7 @@ HTMLBreadcrumbs.prototype = {
this.selectionGuardEnd(err);
});
}
-}
+};
XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
diff --git a/browser/devtools/inspector/test/browser_inspector_basic_highlighter.js b/browser/devtools/inspector/test/browser_inspector_basic_highlighter.js
index bc3eabddbd03..7132c04fad26 100644
--- a/browser/devtools/inspector/test/browser_inspector_basic_highlighter.js
+++ b/browser/devtools/inspector/test/browser_inspector_basic_highlighter.js
@@ -18,24 +18,21 @@ function test() {
waitForFocus(setupTest, content);
}, true);
- content.location = "data:text/html,