wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge fx-team to m-c a=merge

Browse Source
This commit is contained in:
Wes Kocher 2014-10-21 18:51:22 -07:00
commit c52349da1d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/customizableui/test/browser_880164_customization_context_menus.js
View File

@ -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 = [

2
toolkit/devtools/server/actors/webbrowser.js
View File

@ -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) {