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

Bug 703230 - Remove mochitest waitForFocus() debug output. r=jmaher

Browse Source
This commit is contained in:
Cameron McCormack 2011-11-18 08:12:30 +11:00
parent aa938452a2
commit 93c3a054f6
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
testing/mochitest/tests/SimpleTest/SimpleTest.js
View File

@ -499,21 +499,7 @@ SimpleTest.waitForFocus = function (callback, targetWindow, expectBlankPage) {
return SpecialPowers.getPrivilegedProps(aWindow, 'location.href');
}
function debugFocusLog(prefix) {
info(prefix + " -- loaded: " + targetWindow.document.readyState +
" active window: " +
(SpecialPowers.activeWindow() ? "(" + SpecialPowers.activeWindow() + ") " + getHref(SpecialPowers.activeWindow()) : "<no window active>") +
" focused window: " +
(SpecialPowers.focusedWindow() ? "(" + SpecialPowers.focusedWindow() + ") " + getHref(SpecialPowers.focusedWindow()) : "<no window focused>") +
" desired window: (" + targetWindow + ") " + getHref(targetWindow) +
" child window: (" + childTargetWindow + ") " + getHref(childTargetWindow));
}
debugFocusLog("before wait for focus");
function maybeRunTests() {
debugFocusLog("maybe run tests <load:" +
SimpleTest.waitForFocus_loaded + ", focus:" + SimpleTest.waitForFocus_focused + ">");
if (SimpleTest.waitForFocus_loaded &&
SimpleTest.waitForFocus_focused &&
!SimpleTest.waitForFocus_started) {
@ -524,8 +510,6 @@ SimpleTest.waitForFocus = function (callback, targetWindow, expectBlankPage) {
function waitForEvent(event) {
try {
debugFocusLog("waitForEvent called <type:" + event.type + ", target" + event.target + ">");
// Check to make sure that this isn't a load event for a blank or
// non-blank page that wasn't desired.
if (event.type == "load" && (expectBlankPage != (event.target.location == "about:blank")))
@ -564,7 +548,6 @@ SimpleTest.waitForFocus = function (callback, targetWindow, expectBlankPage) {
// If this is a child frame, ensure that the frame is focused.
SimpleTest.waitForFocus_focused = (focusedChildWindow == childTargetWindow);
if (SimpleTest.waitForFocus_focused) {
info("already focused");
// If the frame is already focused and loaded, call the callback directly.
maybeRunTests();
}