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

Bug 1445100 - Remove pageReport property from browser binding. r=Paolo

Browse Source
This commit is contained in:
Tim Nguyen 2018-03-15 17:56:48 +00:00
parent 4472289127
commit f74cd699cc
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser.js
View File

@ -1282,7 +1282,7 @@ var gBrowserInit = {
},
onLoad() {
gBrowser.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver);
gBrowser.addEventListener("DOMUpdateBlockedPopups", gPopupBlockerObserver);
Services.obs.addObserver(gPluginHandler.NPAPIPluginCrashed, "plugin-crashed");

2
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_popupblocker.js
View File

@ -15,7 +15,7 @@ add_task(async function test() {
function testPopupBlockerMenuItem(aExpectedDisabled, aWindow, aCallback) {
aWindow.gBrowser.addEventListener("DOMUpdatePageReport", function() {
aWindow.gBrowser.addEventListener("DOMUpdateBlockedPopups", function() {
executeSoon(function() {
let notification = aWindow.gBrowser.getNotificationBox().getNotificationWithValue("popup-blocked");
ok(notification, "The notification box should be displayed");

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

@ -4798,7 +4798,7 @@ var BrowserEventHandler = {
init: function init() {
BrowserApp.deck.addEventListener("touchend", this, true);
BrowserApp.deck.addEventListener("DOMUpdatePageReport", PopupBlockerObserver.onUpdatePageReport);
BrowserApp.deck.addEventListener("DOMUpdateBlockedPopups", PopupBlockerObserver.onUpdateBlockedPopups);
BrowserApp.deck.addEventListener("MozMouseHittest", this, true);
BrowserApp.deck.addEventListener("OpenMediaWithExternalApp", this, true);
@ -5252,15 +5252,15 @@ var XPInstallObserver = {
};
/**
* Handler for blocked popups, triggered by DOMUpdatePageReport events in browser.xml
* Handler for blocked popups, triggered by DOMUpdateBlockedPopups events in browser.xml
*/
var PopupBlockerObserver = {
onUpdatePageReport: function onUpdatePageReport(aEvent) {
onUpdateBlockedPopups: function onUpdateBlockedPopups(aEvent) {
let browser = BrowserApp.selectedBrowser;
if (aEvent.originalTarget != browser)
return;
if (!browser.pageReport)
if (!browser.blockedPopups)
return;
let result = Services.perms.testExactPermission(BrowserApp.selectedBrowser.currentURI, "popup");
@ -5270,10 +5270,10 @@ var PopupBlockerObserver = {
// Only show the notification again if we've not already shown it. Since
// notifications are per-browser, we don't need to worry about re-adding
// it.
if (!browser.pageReport.reported) {
if (!browser.blockedPopups.reported) {
if (Services.prefs.getBoolPref("privacy.popups.showBrowserMessage")) {
let brandShortName = Strings.brand.GetStringFromName("brandShortName");
let popupCount = browser.pageReport.length;
let popupCount = browser.blockedPopups.length;
let strings = Strings.browser;
let message = PluralForm.get(popupCount, strings.GetStringFromName("popup.message"))
@ -5306,7 +5306,7 @@ var PopupBlockerObserver = {
}
// Record the fact that we've reported this blocked popup, so we don't
// show it again.
browser.pageReport.reported = true;
browser.blockedPopups.reported = true;
}
},
@ -5320,12 +5320,12 @@ var PopupBlockerObserver = {
showPopupsForSite: function showPopupsForSite() {
let uri = BrowserApp.selectedBrowser.currentURI;
let pageReport = BrowserApp.selectedBrowser.pageReport;
if (pageReport) {
for (let i = 0; i < pageReport.length; ++i) {
let popupURIspec = pageReport[i].popupWindowURIspec;
let {blockedPopups} = BrowserApp.selectedBrowser;
if (blockedPopups) {
for (let i = 0; i < blockedPopups.length; ++i) {
let popupURIspec = blockedPopups[i].popupWindowURIspec;
// Sometimes the popup URI that we get back from the pageReport
// Sometimes the popup URI that we get back from blockedPopups
// isn't useful (for instance, netscape.com's popup URI ends up
// being "http://www.netscape.com", which isn't really the URI of
// the popup they're trying to show). This isn't going to be
@ -5333,8 +5333,8 @@ var PopupBlockerObserver = {
if (popupURIspec == "" || popupURIspec == "about:blank" || popupURIspec == uri.spec)
continue;
let popupFeatures = pageReport[i].popupWindowFeatures;
let popupName = pageReport[i].popupWindowName;
let popupFeatures = blockedPopups[i].popupWindowFeatures;
let popupName = blockedPopups[i].popupWindowName;
let parent = BrowserApp.selectedTab;
let isPrivate = PrivateBrowsingUtils.isBrowserPrivate(parent.browser);

7
toolkit/content/widgets/browser.xml
View File

@ -688,7 +688,7 @@
<body>
<![CDATA[
let event = document.createEvent("Events");
event.initEvent("DOMUpdatePageReport", true, true);
event.initEvent("DOMUpdateBlockedPopups", true, true);
this.dispatchEvent(event);
]]>
</body>
@ -722,11 +722,6 @@
<field name="blockedPopups">null</field>
<!-- Obsolete name for blockedPopups. Used by android. -->
<property name="pageReport"
onget="return this.blockedPopups;"
readonly="true"/>
<method name="audioPlaybackStarted">
<body>
<![CDATA[