forked from mirrors/gecko-dev
d8b7fb22e3
Summary: This moves the load of favicons into the content process. We use the same logic for finding favicons (based on waiting until none have shown up for a short time) but then load the favicon and convert it to a data uri which we then dispatch to the parent process. Along the way this fixes asssociating the load with the tab for WebExtension and devtools, fixes CSP usage for the load, fixes expiry detection of the favicon and stops us from loading the same resource twice. This change also merges the prefs browser.chrome.site_icons and browser.chrome.favicons leaving just the former controlling favicon loading. It adds the pref browser.chrome.guess_favicon to allow disabling guessing where a favicon might be located for a site (at <hostname>/favicon.ico). This is mainly to allow disabling this in tests where those additional yet automatic requests are uninteresting for the test. There are multiple clean-ups that can follow this but this is a first step along that path. MozReview-Commit-ID: E0Cs59UnxaF Reviewers: mak Tags: #secure-revision Bug #: 1453751 Differential Revision: https://phabricator.services.mozilla.com/D1672 Differential Revision: https://phabricator.services.mozilla.com/D1673 Differential Revision: https://phabricator.services.mozilla.com/D1674 Differential Revision: https://phabricator.services.mozilla.com/D1850 Differential Revision: https://phabricator.services.mozilla.com/D1869 --HG-- rename : browser/base/content/test/general/browser_bug408415.js => browser/base/content/test/favicons/browser_bug408415.js rename : browser/base/content/test/general/browser_bug550565.js => browser/base/content/test/favicons/browser_bug550565.js rename : browser/base/content/test/general/browser_favicon_change.js => browser/base/content/test/favicons/browser_favicon_change.js rename : browser/base/content/test/general/browser_favicon_change_not_in_document.js => browser/base/content/test/favicons/browser_favicon_change_not_in_document.js rename : browser/base/content/test/general/browser_subframe_favicons_not_used.js => browser/base/content/test/favicons/browser_subframe_favicons_not_used.js rename : browser/base/content/test/general/file_bug970276_favicon1.ico => browser/base/content/test/favicons/file_bug970276_favicon1.ico rename : browser/base/content/test/general/file_bug970276_favicon1.ico => browser/base/content/test/favicons/file_bug970276_favicon2.ico rename : browser/base/content/test/general/file_bug970276_popup1.html => browser/base/content/test/favicons/file_bug970276_popup1.html rename : browser/base/content/test/general/file_bug970276_popup2.html => browser/base/content/test/favicons/file_bug970276_popup2.html rename : browser/base/content/test/general/file_favicon_change.html => browser/base/content/test/favicons/file_favicon_change.html rename : browser/base/content/test/general/file_favicon_change_not_in_document.html => browser/base/content/test/favicons/file_favicon_change_not_in_document.html rename : browser/base/content/test/general/file_bug970276_favicon1.ico => browser/base/content/test/favicons/file_generic_favicon.ico rename : browser/base/content/test/general/file_with_favicon.html => browser/base/content/test/favicons/file_with_favicon.html extra : rebase_source : 6372b2681a59d267f966e9fa2ca9a54e3ff0cea0 extra : intermediate-source : b11aa832c41ac5beef9065f804d11fb7c9887990 extra : source : 638eb8a41245f6d9932861afda21edd5e0b2618a
78 lines
2.8 KiB
JavaScript
78 lines
2.8 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
/**
|
|
* This test makes sure that we correctly preserve tab attributes when storing
|
|
* and restoring tabs. It also ensures that we skip special attributes like
|
|
* 'image', 'muted', and 'pending' that need to be
|
|
* handled differently or internally.
|
|
*/
|
|
|
|
const PREF = "browser.sessionstore.restore_on_demand";
|
|
|
|
add_task(async function test() {
|
|
Services.prefs.setBoolPref(PREF, true);
|
|
registerCleanupFunction(() => Services.prefs.clearUserPref(PREF));
|
|
|
|
// Add a new tab with a nice icon.
|
|
let tab = BrowserTestUtils.addTab(gBrowser, "about:robots");
|
|
await promiseBrowserLoaded(tab.linkedBrowser);
|
|
|
|
// Because there is debounce logic in ContentLinkHandler.jsm to reduce the
|
|
// favicon loads, we have to wait some time before checking that icon was
|
|
// stored properly.
|
|
await BrowserTestUtils.waitForCondition(() => {
|
|
return gBrowser.getIcon(tab) != null;
|
|
}, "wait for favicon load to finish", 100, 5);
|
|
|
|
// Check that the tab has an 'image' attribute.
|
|
ok(tab.hasAttribute("image"), "tab.image exists");
|
|
|
|
tab.toggleMuteAudio();
|
|
// Check that the tab has a 'muted' attribute.
|
|
ok(tab.hasAttribute("muted"), "tab.muted exists");
|
|
|
|
// Make sure we do not persist 'image' and 'muted' attributes.
|
|
ss.persistTabAttribute("image");
|
|
ss.persistTabAttribute("muted");
|
|
let {attributes} = JSON.parse(ss.getTabState(tab));
|
|
ok(!("image" in attributes), "'image' attribute not saved");
|
|
ok(!("muted" in attributes), "'muted' attribute not saved");
|
|
ok(!("custom" in attributes), "'custom' attribute not saved");
|
|
|
|
// Test persisting a custom attribute.
|
|
tab.setAttribute("custom", "foobar");
|
|
ss.persistTabAttribute("custom");
|
|
|
|
({attributes} = JSON.parse(ss.getTabState(tab)));
|
|
is(attributes.custom, "foobar", "'custom' attribute is correct");
|
|
|
|
// Make sure we're backwards compatible and restore old 'image' attributes.
|
|
let state = {
|
|
entries: [{url: "about:mozilla", triggeringPrincipal_base64 }],
|
|
attributes: {custom: "foobaz"},
|
|
image: gBrowser.getIcon(tab)
|
|
};
|
|
|
|
// Prepare a pending tab waiting to be restored.
|
|
let promise = promiseTabRestoring(tab);
|
|
ss.setTabState(tab, JSON.stringify(state));
|
|
await promise;
|
|
|
|
ok(tab.hasAttribute("pending"), "tab is pending");
|
|
is(gBrowser.getIcon(tab), state.image, "tab has correct icon");
|
|
ok(!state.attributes.image, "'image' attribute not saved");
|
|
|
|
// Let the pending tab load.
|
|
gBrowser.selectedTab = tab;
|
|
await promiseTabRestored(tab);
|
|
|
|
// Ensure no 'image' or 'pending' attributes are stored.
|
|
({attributes} = JSON.parse(ss.getTabState(tab)));
|
|
ok(!("image" in attributes), "'image' attribute not saved");
|
|
ok(!("pending" in attributes), "'pending' attribute not saved");
|
|
is(attributes.custom, "foobaz", "'custom' attribute is correct");
|
|
|
|
// Clean up.
|
|
gBrowser.removeTab(tab);
|
|
});
|