Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset c6c6535fb6c2 (bug 844530) for Marionette failures on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-02-27 17:32:56 -05:00
parent b477756bf1
commit 9f8f095966
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dom/browser-element/BrowserElementPromptService.jsm
View File

@ -457,7 +457,6 @@ AuthPromptWrapper.prototype = {
};
function BrowserElementPromptFactory(toWrap) {
// this._wrapped may be null.
this._wrapped = toWrap;
}
@ -465,8 +464,17 @@ BrowserElementPromptFactory.prototype = {
classID: Components.ID("{24f3d0cf-e417-4b85-9017-c9ecf8bb1299}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory]),
_mayUseNativePrompt: function() {
try {
return Services.prefs.getBoolPref("browser.prompt.allowNative");
} catch (e) {
// This properity is default to true.
return true;
}
},
_getNativePromptIfAllowed: function(win, iid, err) {
if (this._wrapped)
if (this._mayUseNativePrompt())
return this._wrapped.getPrompt(win, iid);
else {
// Not allowed, throw an exception.
@ -509,7 +517,7 @@ BrowserElementPromptFactory.prototype = {
// it doesn't mean that we should fallback. It is possible that we can
// get the BrowserElementParent from nsIChannel that passed to
// functions of nsIAuthPrompt2.
if (this._wrapped) {
if (this._mayUseNativePrompt()) {
return new AuthPromptWrapper(
this._wrapped.getPrompt(win, iid),
new BrowserElementAuthPrompt().QueryInterface(iid))
@ -539,15 +547,6 @@ this.BrowserElementPromptService = {
_initialized: false,
_mayUseNativePrompt: function() {
try {
return Services.prefs.getBoolPref("browser.prompt.allowNative");
} catch (e) {
// This properity defaults to true.
return true;
}
},
_init: function() {
if (this._initialized) {
return;
@ -566,27 +565,21 @@ this.BrowserElementPromptService = {
var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
os.addObserver(this, "outer-window-destroyed", /* ownsWeak = */ true);
var oldPromptFactory = null;
// Wrap the existing @mozilla.org/prompter;1 implementation.
var contractID = "@mozilla.org/prompter;1";
var oldCID = Cm.contractIDToCID(contractID);
var newCID = BrowserElementPromptFactory.prototype.classID;
if (this._mayUseNativePrompt()) {
// Wrap the existing @mozilla.org/prompter;1 implementation. (Don't even
// try to get the prompter;1 if we may not use the native prompter. We
// won't need it, and merely getting it is causing bug 844530.)
var contractID = "@mozilla.org/prompter;1";
var oldCID = Cm.contractIDToCID(contractID);
var oldFactory = Cm.getClassObject(Cc[contractID], Ci.nsIFactory);
var oldFactory = Cm.getClassObject(Cc[contractID], Ci.nsIFactory);
if (oldCID == newCID) {
debug("WARNING: Wrapped prompt factory is already installed!");
return;
}
Cm.unregisterFactory(oldCID, oldFactory);
oldPromptFactory = oldFactory.createInstance(null, Ci.nsIPromptFactory);
if (oldCID == newCID) {
debug("WARNING: Wrapped prompt factory is already installed!");
return;
}
var newInstance = new BrowserElementPromptFactory(oldPromptFactory);
Cm.unregisterFactory(oldCID, oldFactory);
var oldInstance = oldFactory.createInstance(null, Ci.nsIPromptFactory);
var newInstance = new BrowserElementPromptFactory(oldInstance);
var newFactory = {
createInstance: function(outer, iid) {