From 4b7e4ef69660d315a6c88225a8eece03407ccd69 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 20 Oct 2014 14:00:00 -0400 Subject: [PATCH 1/2] Bug 1084509 - gBrowser might not be available on all windows. r=ochameau --- toolkit/devtools/server/actors/webbrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/devtools/server/actors/webbrowser.js b/toolkit/devtools/server/actors/webbrowser.js index fb2e1c13b44..dff420ba5c0 100644 --- a/toolkit/devtools/server/actors/webbrowser.js +++ b/toolkit/devtools/server/actors/webbrowser.js @@ -285,7 +285,7 @@ BrowserTabList.prototype._getBrowsers = function*() { }; BrowserTabList.prototype._getChildren = function(aWindow) { - return aWindow.gBrowser.browsers; + return aWindow.gBrowser ? aWindow.gBrowser.browsers : []; }; BrowserTabList.prototype._isRemoteBrowser = function(browser) { From c1b8b5990ffdc2ffb284264e90d3400fdf079072 Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Tue, 21 Oct 2014 08:57:02 -0700 Subject: [PATCH 2/2] Bug 1085628 - Fix browser_880164_customization_context_menus.js against smaller toolbars by synthesizing context menu event on first pixel instead of last one. r=Gijs --- .../test/browser_880164_customization_context_menus.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/customizableui/test/browser_880164_customization_context_menus.js b/browser/components/customizableui/test/browser_880164_customization_context_menus.js index 7c03b483a67..6a4ef5bf51c 100644 --- a/browser/components/customizableui/test/browser_880164_customization_context_menus.js +++ b/browser/components/customizableui/test/browser_880164_customization_context_menus.js @@ -116,7 +116,7 @@ add_task(function() { let urlBarContainer = document.getElementById("urlbar-container"); // Need to make sure not to click within an edit field. let urlbarRect = urlBarContainer.getBoundingClientRect(); - EventUtils.synthesizeMouse(urlBarContainer, 100, urlbarRect.height - 1, {type: "contextmenu", button: 2 }); + EventUtils.synthesizeMouse(urlBarContainer, 100, 1, {type: "contextmenu", button: 2 }); yield shownPromise; let expectedEntries = [