mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 05:39:41 +02:00
The browser.contentPrincpal will report a null prinicpal instead of the actual content principal if the tab is not loaded. So the SessionStore will collect a wrong principal for the 'iconLoadingPrincipal', and it will use this wrong principal to load favicon when session restoring. To fix this problem, this patch makes the TabState.jsm to collect 'iconLoadingPrincipal' from browser.mIconLoadingPrincipal which will be the correct principal for loading favicon. MozReview-Commit-ID: AYUbHFKaG8v --HG-- extra : rebase_source : 3e2333f18c221d415bd0e26bc416a841344cef2c
198 lines
6.1 KiB
JavaScript
198 lines
6.1 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
"use strict";
|
|
|
|
this.EXPORTED_SYMBOLS = ["TabState"];
|
|
|
|
const Cu = Components.utils;
|
|
|
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
|
|
|
|
XPCOMUtils.defineLazyModuleGetter(this, "PrivacyFilter",
|
|
"resource:///modules/sessionstore/PrivacyFilter.jsm");
|
|
XPCOMUtils.defineLazyModuleGetter(this, "TabStateCache",
|
|
"resource:///modules/sessionstore/TabStateCache.jsm");
|
|
XPCOMUtils.defineLazyModuleGetter(this, "TabAttributes",
|
|
"resource:///modules/sessionstore/TabAttributes.jsm");
|
|
XPCOMUtils.defineLazyModuleGetter(this, "Utils",
|
|
"resource://gre/modules/sessionstore/Utils.jsm");
|
|
|
|
/**
|
|
* Module that contains tab state collection methods.
|
|
*/
|
|
this.TabState = Object.freeze({
|
|
update(browser, data) {
|
|
TabStateInternal.update(browser, data);
|
|
},
|
|
|
|
collect(tab) {
|
|
return TabStateInternal.collect(tab);
|
|
},
|
|
|
|
clone(tab) {
|
|
return TabStateInternal.clone(tab);
|
|
},
|
|
|
|
copyFromCache(browser, tabData, options) {
|
|
TabStateInternal.copyFromCache(browser, tabData, options);
|
|
},
|
|
});
|
|
|
|
var TabStateInternal = {
|
|
/**
|
|
* Processes a data update sent by the content script.
|
|
*/
|
|
update(browser, {data}) {
|
|
TabStateCache.update(browser, data);
|
|
},
|
|
|
|
/**
|
|
* Collect data related to a single tab, synchronously.
|
|
*
|
|
* @param tab
|
|
* tabbrowser tab
|
|
*
|
|
* @returns {TabData} An object with the data for this tab. If the
|
|
* tab has not been invalidated since the last call to
|
|
* collect(aTab), the same object is returned.
|
|
*/
|
|
collect(tab) {
|
|
return this._collectBaseTabData(tab);
|
|
},
|
|
|
|
/**
|
|
* Collect data related to a single tab, including private data.
|
|
* Use with caution.
|
|
*
|
|
* @param tab
|
|
* tabbrowser tab
|
|
*
|
|
* @returns {object} An object with the data for this tab. This data is never
|
|
* cached, it will always be read from the tab and thus be
|
|
* up-to-date.
|
|
*/
|
|
clone(tab) {
|
|
return this._collectBaseTabData(tab, {includePrivateData: true});
|
|
},
|
|
|
|
/**
|
|
* Collects basic tab data for a given tab.
|
|
*
|
|
* @param tab
|
|
* tabbrowser tab
|
|
* @param options (object)
|
|
* {includePrivateData: true} to always include private data
|
|
*
|
|
* @returns {object} An object with the basic data for this tab.
|
|
*/
|
|
_collectBaseTabData(tab, options) {
|
|
let tabData = { entries: [], lastAccessed: tab.lastAccessed };
|
|
let browser = tab.linkedBrowser;
|
|
|
|
if (tab.pinned) {
|
|
tabData.pinned = true;
|
|
}
|
|
|
|
tabData.hidden = tab.hidden;
|
|
|
|
if (browser.audioMuted) {
|
|
tabData.muted = true;
|
|
tabData.muteReason = tab.muteReason;
|
|
}
|
|
|
|
// Save tab attributes.
|
|
tabData.attributes = TabAttributes.get(tab);
|
|
|
|
if (tab.__SS_extdata) {
|
|
tabData.extData = tab.__SS_extdata;
|
|
}
|
|
|
|
// Copy data from the tab state cache only if the tab has fully finished
|
|
// restoring. We don't want to overwrite data contained in __SS_data.
|
|
this.copyFromCache(browser, tabData, options);
|
|
|
|
// After copyFromCache() was called we check for properties that are kept
|
|
// in the cache only while the tab is pending or restoring. Once that
|
|
// happened those properties will be removed from the cache and will
|
|
// be read from the tab/browser every time we collect data.
|
|
|
|
// Store the tab icon.
|
|
if (!("image" in tabData)) {
|
|
let tabbrowser = tab.ownerGlobal.gBrowser;
|
|
tabData.image = tabbrowser.getIcon(tab);
|
|
}
|
|
|
|
// Store the serialized contentPrincipal of this tab to use for the icon.
|
|
if (!("iconLoadingPrincipal" in tabData)) {
|
|
tabData.iconLoadingPrincipal = Utils.serializePrincipal(browser.mIconLoadingPrincipal);
|
|
}
|
|
|
|
// If there is a userTypedValue set, then either the user has typed something
|
|
// in the URL bar, or a new tab was opened with a URI to load.
|
|
// If so, we also track whether we were still in the process of loading something.
|
|
if (!("userTypedValue" in tabData) && browser.userTypedValue) {
|
|
tabData.userTypedValue = browser.userTypedValue;
|
|
// We always used to keep track of the loading state as an integer, where
|
|
// '0' indicated the user had typed since the last load (or no load was
|
|
// ongoing), and any positive value indicated we had started a load since
|
|
// the last time the user typed in the URL bar. Mimic this to keep the
|
|
// session store representation in sync, even though we now represent this
|
|
// more explicitly:
|
|
tabData.userTypedClear = browser.didStartLoadSinceLastUserTyping() ? 1 : 0;
|
|
}
|
|
|
|
return tabData;
|
|
},
|
|
|
|
/**
|
|
* Copy data for the given |browser| from the cache to |tabData|.
|
|
*
|
|
* @param browser (xul:browser)
|
|
* The browser belonging to the given |tabData| object.
|
|
* @param tabData (object)
|
|
* The tab data belonging to the given |tab|.
|
|
* @param options (object)
|
|
* {includePrivateData: true} to always include private data
|
|
*/
|
|
copyFromCache(browser, tabData, options = {}) {
|
|
let data = TabStateCache.get(browser);
|
|
if (!data) {
|
|
return;
|
|
}
|
|
|
|
// The caller may explicitly request to omit privacy checks.
|
|
let includePrivateData = options && options.includePrivateData;
|
|
|
|
for (let key of Object.keys(data)) {
|
|
let value = data[key];
|
|
|
|
// Filter sensitive data according to the current privacy level.
|
|
if (!includePrivateData) {
|
|
if (key === "storage") {
|
|
value = PrivacyFilter.filterSessionStorageData(value);
|
|
} else if (key === "formdata") {
|
|
value = PrivacyFilter.filterFormData(value);
|
|
}
|
|
}
|
|
|
|
if (key === "history") {
|
|
// Make a shallow copy of the entries array. We (currently) don't update
|
|
// entries in place, so we don't have to worry about performing a deep
|
|
// copy.
|
|
tabData.entries = [...value.entries];
|
|
|
|
if (value.hasOwnProperty("userContextId")) {
|
|
tabData.userContextId = value.userContextId;
|
|
}
|
|
|
|
if (value.hasOwnProperty("index")) {
|
|
tabData.index = value.index;
|
|
}
|
|
} else {
|
|
tabData[key] = value;
|
|
}
|
|
}
|
|
}
|
|
};
|