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

Backed out changeset 741a654c2f4c (bug 1478823) for mochithest failures at toolkit/components/extensions/test/mochitest/test_ext_webrequest_filter.html

Browse Source
This commit is contained in:
Coroiu Cristina 2018-08-04 01:41:43 +03:00
parent 18e4e4ce63
commit e06d05c8d9
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/test/favicons/browser_missing_favicon.js
View File

@ -12,7 +12,6 @@ add_task(async () => {
let faviconPromise = waitForLinkAvailable(browser);
BrowserTestUtils.loadURI(browser, testPath + "file_with_favicon.html");
await BrowserTestUtils.browserLoaded(browser);
let iconURI = await faviconPromise;
is(iconURI, expectedIcon, "Got correct icon.");

32
browser/modules/ContentLinkHandler.jsm
View File

@ -294,10 +294,11 @@ function guessType(icon) {
/*
* Selects the best rich icon and tab icon from a list of IconInfo objects.
*
* @param {Document} document The document to select icons for.
* @param {Array} iconInfos A list of IconInfo objects.
* @param {integer} preferredWidth The preferred width for tab icons.
*/
function selectIcons(iconInfos, preferredWidth) {
function selectIcons(document, iconInfos, preferredWidth) {
if (iconInfos.length == 0) {
return {
richIcon: null,
@ -449,7 +450,6 @@ class ContentLinkHandler {
chromeGlobal.addEventListener("DOMLinkChanged", this);
chromeGlobal.addEventListener("pageshow", this);
chromeGlobal.addEventListener("pagehide", this);
chromeGlobal.addEventListener("DOMHeadElementParsed", this);
// For every page we attempt to find a rich icon and a tab icon. These
// objects take care of the load process for each.
@ -461,7 +461,8 @@ class ContentLinkHandler {
loadIcons() {
let preferredWidth = PREFERRED_WIDTH * Math.ceil(this.chromeGlobal.content.devicePixelRatio);
let { richIcon, tabIcon } = selectIcons(this.iconInfos, preferredWidth);
let { richIcon, tabIcon } = selectIcons(this.chromeGlobal.content.document,
this.iconInfos, preferredWidth);
this.iconInfos = [];
if (richIcon) {
@ -485,9 +486,8 @@ class ContentLinkHandler {
this.iconTask.arm();
}
onHeadParsed(event) {
let document = this.chromeGlobal.content.document;
if (event.target.ownerDocument != document) {
onPageShow(event) {
if (event.target != this.chromeGlobal.content.document) {
return;
}
@ -497,7 +497,7 @@ class ContentLinkHandler {
// Inject the default icon. Use documentURIObject so that we do the right
// thing with about:-style error pages. See bug 453442
let baseURI = document.documentURIObject;
let baseURI = this.chromeGlobal.content.document.documentURIObject;
if (baseURI.schemeIs("http") || baseURI.schemeIs("https")) {
let iconUri = baseURI.mutate().setPathQueryRef("/favicon.ico").finalize();
this.addIcon({
@ -505,7 +505,7 @@ class ContentLinkHandler {
width: -1,
isRichIcon: false,
type: TYPE_ICO,
node: document,
node: this.chromeGlobal.content.document,
});
}
}
@ -517,19 +517,6 @@ class ContentLinkHandler {
}
}
onPageShow(event) {
if (event.target != this.chromeGlobal.content.document) {
return;
}
// If we've seen any additional icons since the start of the body element
// load them now.
if (this.iconTask.isArmed) {
this.iconTask.disarm();
this.loadIcons();
}
}
onPageHide(event) {
if (event.target != this.chromeGlobal.content.document) {
return;
@ -631,9 +618,6 @@ class ContentLinkHandler {
case "pagehide":
this.onPageHide(event);
break;
case "DOMHeadElementParsed":
this.onHeadParsed(event);
break;
default:
this.onLinkEvent(event);
}