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 856638 - Allow passing PopupNotification options to _showPrompt in nsBrowserGlue.js [r=dolske]

Browse Source 
Add an options parameter and use that variable for the existing pointerLock options. Update existing callers to pass in null.

--HG--
extra : rebase_source : e453cf66b75eeda03feb31aeeb0a2c1cf0871ef5
This commit is contained in:
Edward Lee 2013-04-01 10:38:36 -07:00
parent 7a9993a105
commit d26975f41e
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
browser/components/nsBrowserGlue.js
View File

@ -1637,9 +1637,10 @@ ContentPermissionPrompt.prototype = {
* Permission is granted if action is null or ALLOW_ACTION.
* @param aNotificationId The id of the PopupNotification.
* @param aAnchorId The id for the PopupNotification anchor.
* @param aOptions Options for the PopupNotification
*/
_showPrompt: function CPP_showPrompt(aRequest, aMessage, aPermission, aActions,
aNotificationId, aAnchorId) {
aNotificationId, aAnchorId, aOptions) {
function onFullScreen() {
popup.remove();
}
@ -1692,24 +1693,25 @@ ContentPermissionPrompt.prototype = {
var mainAction = popupNotificationActions.length ?
popupNotificationActions[0] : null;
var secondaryActions = popupNotificationActions.splice(1);
var options = null;
if (aRequest.type == "pointerLock") {
// If there's no mainAction, this is the autoAllow warning prompt.
let autoAllow = !mainAction;
options = { removeOnDismissal: autoAllow,
eventCallback: function (type) {
if (type == "removed") {
browser.removeEventListener("mozfullscreenchange", onFullScreen, true);
if (autoAllow)
aRequest.allow();
}
},
};
aOptions = {
removeOnDismissal: autoAllow,
eventCallback: type => {
if (type == "removed") {
browser.removeEventListener("mozfullscreenchange", onFullScreen, true);
if (autoAllow) {
aRequest.allow();
}
}
},
};
}
var popup = chromeWin.PopupNotifications.show(browser, aNotificationId, aMessage, aAnchorId,
mainAction, secondaryActions, options);
mainAction, secondaryActions, aOptions);
if (aRequest.type == "pointerLock") {
// pointerLock is automatically allowed in fullscreen mode (and revoked
// upon exit), so if the page enters fullscreen mode after requesting
@ -1771,7 +1773,8 @@ ContentPermissionPrompt.prototype = {
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_GEOLOCATION_REQUEST);
this._showPrompt(aRequest, message, "geo", actions, "geolocation", "geo-notification-icon");
this._showPrompt(aRequest, message, "geo", actions, "geolocation",
"geo-notification-icon", null);
},
_promptWebNotifications : function(aRequest) {
@ -1804,7 +1807,7 @@ ContentPermissionPrompt.prototype = {
this._showPrompt(aRequest, message, "desktop-notification", actions,
"web-notifications",
"web-notifications-notification-icon");
"web-notifications-notification-icon", null);
},
_promptPointerLock: function CPP_promtPointerLock(aRequest, autoAllow) {
@ -1842,7 +1845,8 @@ ContentPermissionPrompt.prototype = {
];
}
this._showPrompt(aRequest, message, "pointerLock", actions, "pointerLock", "pointerLock-notification-icon");
this._showPrompt(aRequest, message, "pointerLock", actions, "pointerLock",
"pointerLock-notification-icon", null);
},
prompt: function CPP_prompt(request) {