Merge mozilla-central and fx-team

This commit is contained in:
Ed Morley 2013-07-23 14:01:57 +01:00
commit a86cc4ab9a

View File

@ -67,9 +67,22 @@ function testBreakOnAll()
});
gThreadClient.resume(function() {
gInput.focus();
// Make sure that the focus is not on the input box so that a focus event
// will be triggered.
window.focus();
gBrowser.selectedBrowser.focus();
gButton.focus();
// Focus the element and wait for focus event.
gInput.addEventListener("focus", function onfocus() {
gInput.removeEventListener("focus", onfocus, false);
executeSoon(function() {
EventUtils.synthesizeKey("e", { shiftKey: 1 }, content);
});
}, false);
gInput.focus();
});
});
});
@ -94,9 +107,22 @@ function testBreakOnDisabled()
testBreakOnNone();
}, false);
gInput.focus();
// Make sure that the focus is not on the input box so that a focus event
// will be triggered.
window.focus();
gBrowser.selectedBrowser.focus();
gButton.focus();
// Focus the element and wait for focus event.
gInput.addEventListener("focus", function onfocus() {
gInput.removeEventListener("focus", onfocus, false);
executeSoon(function() {
EventUtils.synthesizeKey("e", { shiftKey: 1 }, content);
});
}, false);
gInput.focus();
});
}
// Test that specifying an empty event array clears all hidden breakpoints.
@ -117,9 +143,22 @@ function testBreakOnNone()
testBreakOnClick();
}, false);
gInput.focus();
// Make sure that the focus is not on the input box so that a focus event
// will be triggered.
window.focus();
gBrowser.selectedBrowser.focus();
gButton.focus();
// Focus the element and wait for focus event.
gInput.addEventListener("focus", function onfocus() {
gInput.removeEventListener("focus", onfocus, false);
executeSoon(function() {
EventUtils.synthesizeKey("g", { shiftKey: 1 }, content);
});
}, false);
gInput.focus();
});
}
function unexpectedListener(event, packet, callback) {