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

Backed out changeset 6ea78f586fdc (bug 972797) for browser-chrome failures

Browse Source
This commit is contained in:
Ed Morley 2014-02-18 16:52:15 +00:00
parent 5cb15f19ee
commit e25f3268a0
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
browser/components/sessionstore/src/SessionStore.jsm
View File

@ -2011,7 +2011,6 @@ let SessionStoreInternal = {
var activeWindow = this._getMostRecentBrowserWindow();
TelemetryStopwatch.start("FX_SESSION_RESTORE_COLLECT_ALL_WINDOWS_DATA_MS");
if (this._loadState == STATE_RUNNING) {
// update the data for all windows with activities since the last save operation
this._forEachBrowserWindow(function(aWindow) {
@ -2026,7 +2025,6 @@ let SessionStoreInternal = {
});
DirtyWindows.clear();
}
TelemetryStopwatch.stop("FX_SESSION_RESTORE_COLLECT_ALL_WINDOWS_DATA_MS");
// An array that at the end will hold all current window data.
var total = [];
@ -2045,10 +2043,7 @@ let SessionStoreInternal = {
if (!this._windows[ix].isPopup)
nonPopupCount++;
}
TelemetryStopwatch.start("FX_SESSION_RESTORE_COLLECT_COOKIES_MS");
SessionCookies.update(total);
TelemetryStopwatch.stop("FX_SESSION_RESTORE_COLLECT_COOKIES_MS");
// collect the data for all windows yet to be restored
for (ix in this._statesToRestore) {
@ -2094,7 +2089,7 @@ let SessionStoreInternal = {
};
// get open Scratchpad window states too
let scratchpads = ScratchpadManager.getSessionState();
var scratchpads = ScratchpadManager.getSessionState();
let state = {
windows: total,
@ -2143,7 +2138,6 @@ let SessionStoreInternal = {
_collectWindowData: function ssi_collectWindowData(aWindow) {
if (!this._isWindowLoaded(aWindow))
return;
TelemetryStopwatch.start("FX_SESSION_RESTORE_COLLECT_SINGLE_WINDOW_DATA_MS");
let tabbrowser = aWindow.gBrowser;
let tabs = tabbrowser.tabs;
@ -2165,7 +2159,6 @@ let SessionStoreInternal = {
aWindow.__SS_lastSessionWindowID;
DirtyWindows.remove(aWindow);
TelemetryStopwatch.stop("FX_SESSION_RESTORE_COLLECT_SINGLE_WINDOW_DATA_MS");
},
/* ........ Restoring Functionality .............. */

24
toolkit/components/telemetry/Histograms.json
View File

@ -3293,30 +3293,6 @@
"extended_statistics_ok": true,
"description": "Widget: Time it takes for the message before a UI message (ms)"
},
"FX_SESSION_RESTORE_COLLECT_ALL_WINDOWS_DATA_MS": {
"expires_in_version": "never",
"kind": "exponential",
"high": "30000",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "Session restore: Time to collect all window data (ms)"
},
"FX_SESSION_RESTORE_COLLECT_SINGLE_WINDOW_DATA_MS": {
"expires_in_version": "never",
"kind": "exponential",
"high": "30000",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "Session restore: Time to collect the data of a single window (ms)"
},
"FX_SESSION_RESTORE_COLLECT_COOKIES_MS": {
"expires_in_version": "never",
"kind": "exponential",
"high": "30000",
"n_buckets": 10,
"extended_statistics_ok": true,
"description": "Session restore: Time to collect cookies (ms)"
},
"FX_SESSION_RESTORE_COLLECT_DATA_MS": {
"expires_in_version": "never",
"kind": "exponential",