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 743646 - Plugin doorhanger appears for unsupported plugin embeds (and hidden embeds that are enabled by default). r=mfinkle

Browse Source
This commit is contained in:
Margaret Leibovic 2012-04-12 12:34:58 -07:00
parent c497ac6e70
commit a118c20d4e
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mobile/android/chrome/content/browser.js
View File

@ -1487,7 +1487,6 @@ function Tab(aURL, aParams) {
this.contentDocumentIsDisplayed = true;
this.clickToPlayPluginDoorhangerShown = false;
this.clickToPlayPluginsActivated = false;
this.loadEventProcessed = false;
}
Tab.prototype = {
@ -1540,7 +1539,6 @@ Tab.prototype = {
this.browser.sessionHistory.addSHistoryListener(this);
this.browser.addEventListener("DOMContentLoaded", this, true);
this.browser.addEventListener("load", this, true);
this.browser.addEventListener("DOMLinkAdded", this, true);
this.browser.addEventListener("DOMTitleChanged", this, true);
this.browser.addEventListener("DOMWindowClose", this, true);
@ -1585,7 +1583,6 @@ Tab.prototype = {
this.browser.removeProgressListener(this);
this.browser.removeEventListener("DOMContentLoaded", this, true);
this.browser.removeEventListener("load", this, true);
this.browser.removeEventListener("DOMLinkAdded", this, true);
this.browser.removeEventListener("DOMTitleChanged", this, true);
this.browser.removeEventListener("DOMWindowClose", this, true);
@ -1820,25 +1817,6 @@ Tab.prototype = {
break;
}
case "load": {
this.loadEventProcessed = true;
// Show a plugin doorhanger if there are no clickable overlays showing
let contentWindow = this.browser.contentWindow;
let cwu = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
// XXX not sure if we should enable plugins for the parent documents...
let plugins = cwu.plugins;
let isAnyPluginVisible = false;
for (let plugin of plugins) {
let overlay = plugin.ownerDocument.getAnonymousElementByAttribute(plugin, "class", "mainBox");
if (overlay && !PluginHelper.isTooSmall(plugin, overlay))
isAnyPluginVisible = true;
}
if (plugins && plugins.length && !isAnyPluginVisible)
PluginHelper.showDoorHanger(this);
break;
}
case "DOMLinkAdded": {
let target = aEvent.originalTarget;
if (!target.href || target.disabled)
@ -1953,11 +1931,10 @@ Tab.prototype = {
return;
}
// If the overlay is too small, hide the overlay and act like this
// is a hidden plugin object
// If the plugin is hidden, or if the overlay is too small, show a doorhanger notification
let overlay = plugin.ownerDocument.getAnonymousElementByAttribute(plugin, "class", "mainBox");
if (!overlay || PluginHelper.isTooSmall(plugin, overlay)) {
if (this.loadEventProcessed && !this.clickToPlayPluginDoorhangerShown)
if (!this.clickToPlayPluginDoorhangerShown)
PluginHelper.showDoorHanger(this);
if (!overlay)
@ -2047,7 +2024,6 @@ Tab.prototype = {
// Reset state of click-to-play plugin notifications.
this.clickToPlayPluginDoorhangerShown = false;
this.clickToPlayPluginsActivated = false;
this.loadEventProcessed = false;
let message = {
gecko: {