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 mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Ed Morley 2012-02-03 16:50:13 +00:00
commit b7014c3aad
4 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/devtools/webconsole/test/browser_gcli_helpers.js
View File

@ -5,7 +5,9 @@
// - https://github.com/mozilla/gcli/blob/master/docs/index.md
// - https://wiki.mozilla.org/DevTools/Features/GCLI
Components.utils.import("resource:///modules/gcli.jsm");
let tmp = {};
Components.utils.import("resource:///modules/gcli.jsm", tmp);
let gcli = tmp.gcli;
let hud;
let gcliterm;

2
configure.in
View File

@ -4616,6 +4616,7 @@ MOZ_SAFE_BROWSING=
MOZ_HELP_VIEWER=
MOZ_SPELLCHECK=1
MOZ_JAVA_COMPOSITOR=
MOZ_ONLY_TOUCH_EVENTS=
MOZ_SVG_DLISTS=
MOZ_TOOLKIT_SEARCH=1
MOZ_UI_LOCALE=en-US
@ -8463,6 +8464,7 @@ AC_SUBST(MOZ_UNIVERSALCHARDET)
AC_SUBST(ACCESSIBILITY)
AC_SUBST(MOZ_SPELLCHECK)
AC_SUBST(MOZ_JAVA_COMPOSITOR)
AC_SUBST(MOZ_ONLY_TOUCH_EVENTS)
AC_SUBST(MOZ_USER_DIR)
AC_SUBST(MOZ_CRASHREPORTER)
AC_SUBST(MOZ_MAINTENANCE_SERVICE)

42
testing/mochitest/browser-test.js
View File

@ -88,11 +88,43 @@ Tester.prototype = {
start: function Tester_start() {
//if testOnLoad was not called, then gConfig is not defined
if(!gConfig)
if (!gConfig)
gConfig = readConfig();
this.repeat = gConfig.repeat;
this.dumper.dump("*** Start BrowserChrome Test Results ***\n");
this._cs.registerListener(this);
this._globalProperties = Object.keys(window);
this._globalPropertyWhitelist = ["navigator", "constructor", "Application",
"__SS_tabsToRestore", "webConsoleCommandController",
// Temporarily added to whitelist for Fennec tests:
"AddonUpdateChecker",
"PlacesAggregatedTransaction",
"PlacesCreateFolderTransaction",
"PlacesCreateBookmarkTransaction",
"PlacesCreateSeparatorTransaction",
"PlacesCreateLivemarkTransaction",
"PlacesMoveItemTransaction",
"PlacesRemoveItemTransaction",
"PlacesEditItemTitleTransaction",
"PlacesEditBookmarkURITransaction",
"PlacesSetItemAnnotationTransaction",
"PlacesSetPageAnnotationTransaction",
"PlacesEditBookmarkKeywordTransaction",
"PlacesEditBookmarkPostDataTransaction",
"PlacesEditLivemarkSiteURITransaction",
"PlacesEditLivemarkFeedURITransaction",
"PlacesEditItemDateAddedTransaction",
"PlacesEditItemLastModifiedTransaction",
"PlacesSortFolderByNameTransaction",
"PlacesTagURITransaction",
"PlacesUntagURITransaction",
"DownloadUtils",
"AddonRepository",
"LocaleRepository",
"Contacts",
"VKBstateHasChanged"
];
if (this.tests.length)
this.nextTest();
@ -214,6 +246,14 @@ Tester.prototype = {
this.currentTest.addResult(new testResult(false, "expectUncaughtException was called but no uncaught exception was detected!", "", false));
}
Object.keys(window).forEach(function (prop) {
if (this._globalProperties.indexOf(prop) == -1) {
this._globalProperties.push(prop);
if (this._globalPropertyWhitelist.indexOf(prop) == -1)
this.currentTest.addResult(new testResult(false, "leaked window property: " + prop, "", false));
}
}, this);
// Clear document.popupNode. The test could have set it to a custom value
// for its own purposes, nulling it out it will go back to the default
// behavior of returning the last opened popup.

4
toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js
View File

@ -4,7 +4,9 @@
// Tests that the metadata request includes startup time measurements
Components.utils.import("resource://gre/modules/AddonRepository.jsm");
let tmp = {};
Components.utils.import("resource://gre/modules/AddonRepository.jsm", tmp);
let AddonRepository = tmp.AddonRepository;
var gManagerWindow;
var gProvider;