mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backout 12ca455a3f09 and 580de0df77e9 for rc failures
This commit is contained in:
Brian Nicholson
parent
84cac0677c
commit
c6337712ed
@ -3910,8 +3910,6 @@ Tab.prototype = {
|
||||
if (BrowserApp.getBrowserForWindow(contentWin) == null)
|
||||
return;
|
||||
|
||||
Services.obs.notifyObservers(null, "Session:StoreTab", this.id);
|
||||
|
||||
this._hostChanged = true;
|
||||
|
||||
let fixedURI = aLocationURI;
|
||||
|
||||
@ -43,7 +43,6 @@ SessionStore.prototype = {
|
||||
_lastSaveTime: 0,
|
||||
_interval: 10000,
|
||||
_maxTabsUndo: 1,
|
||||
_pendingWrite: false,
|
||||
|
||||
init: function ss_init() {
|
||||
// Get file references
|
||||
@ -78,8 +77,6 @@ SessionStore.prototype = {
|
||||
observerService.addObserver(this, "domwindowclosed", true);
|
||||
observerService.addObserver(this, "browser:purge-session-history", true);
|
||||
observerService.addObserver(this, "Session:Restore", true);
|
||||
observerService.addObserver(this, "Session:StoreTab", true);
|
||||
observerService.addObserver(this, "application-background", true);
|
||||
break;
|
||||
case "final-ui-startup":
|
||||
observerService.removeObserver(this, "final-ui-startup");
|
||||
@ -105,7 +102,7 @@ SessionStore.prototype = {
|
||||
|
||||
if (this._loadState == STATE_RUNNING) {
|
||||
// Save the purged state immediately
|
||||
this.saveState();
|
||||
this.saveStateNow();
|
||||
}
|
||||
|
||||
Services.obs.notifyObservers(null, "sessionstore-state-purge-complete", "");
|
||||
@ -113,12 +110,9 @@ SessionStore.prototype = {
|
||||
case "timer-callback":
|
||||
// Timer call back for delayed saving
|
||||
this._saveTimer = null;
|
||||
if (this._pendingWrite) {
|
||||
this.saveState();
|
||||
}
|
||||
this.saveState();
|
||||
break;
|
||||
case "Session:Restore": {
|
||||
Services.obs.removeObserver(this, "Session:Restore");
|
||||
if (aData) {
|
||||
// Be ready to handle any restore failures by making sure we have a valid tab opened
|
||||
let window = Services.wm.getMostRecentWindow("navigator:browser");
|
||||
@ -149,19 +143,6 @@ SessionStore.prototype = {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "Session:StoreTab": {
|
||||
let window = Services.wm.getMostRecentWindow("navigator:browser");
|
||||
let tab = window.BrowserApp.getTabForId(aData);
|
||||
this.onTabLoad(window, tab.browser);
|
||||
break;
|
||||
}
|
||||
case "application-background":
|
||||
// We receive this notification when Android's onPause callback is
|
||||
// executed. After onPause, the application may be terminated at any
|
||||
// point without notice; therefore, we must synchronously write out any
|
||||
// pending save state to ensure that this data does not get lost.
|
||||
this.flushPendingState();
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
@ -184,6 +165,13 @@ SessionStore.prototype = {
|
||||
this.onTabSelect(window, browser);
|
||||
break;
|
||||
}
|
||||
case "pageshow": {
|
||||
let browser = aEvent.currentTarget;
|
||||
// Top-level changes only
|
||||
if (aEvent.originalTarget == browser.contentDocument)
|
||||
this.onTabLoad(window, browser, aEvent.persisted);
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -247,12 +235,15 @@ SessionStore.prototype = {
|
||||
},
|
||||
|
||||
onTabAdd: function ss_onTabAdd(aWindow, aBrowser, aNoNotification) {
|
||||
aBrowser.addEventListener("pageshow", this, true);
|
||||
if (!aNoNotification)
|
||||
this.saveStateDelayed();
|
||||
this._updateCrashReportURL(aWindow);
|
||||
},
|
||||
|
||||
onTabRemove: function ss_onTabRemove(aWindow, aBrowser, aNoNotification) {
|
||||
aBrowser.removeEventListener("pageshow", this, true);
|
||||
|
||||
// If this browser is being restored, skip any session save activity
|
||||
if (aBrowser.__SS_restore)
|
||||
return;
|
||||
@ -280,7 +271,7 @@ SessionStore.prototype = {
|
||||
}
|
||||
},
|
||||
|
||||
onTabLoad: function ss_onTabLoad(aWindow, aBrowser) {
|
||||
onTabLoad: function ss_onTabLoad(aWindow, aBrowser, aPersisted) {
|
||||
// If this browser is being restored, skip any session save activity
|
||||
if (aBrowser.__SS_restore)
|
||||
return;
|
||||
@ -291,26 +282,32 @@ SessionStore.prototype = {
|
||||
|
||||
let history = aBrowser.sessionHistory;
|
||||
|
||||
// Serialize the tab data
|
||||
let entries = [];
|
||||
let index = history.index + 1;
|
||||
for (let i = 0; i < history.count; i++) {
|
||||
let historyEntry = history.getEntryAtIndex(i, false);
|
||||
// Don't try to restore wyciwyg URLs
|
||||
if (historyEntry.URI.schemeIs("wyciwyg")) {
|
||||
// Adjust the index to account for skipped history entries
|
||||
if (i <= history.index)
|
||||
index--;
|
||||
continue;
|
||||
if (aPersisted && aBrowser.__SS_data) {
|
||||
// Loading from the cache; just update the index
|
||||
aBrowser.__SS_data.index = history.index + 1;
|
||||
this.saveStateDelayed();
|
||||
} else {
|
||||
// Serialize the tab data
|
||||
let entries = [];
|
||||
let index = history.index + 1;
|
||||
for (let i = 0; i < history.count; i++) {
|
||||
let historyEntry = history.getEntryAtIndex(i, false);
|
||||
// Don't try to restore wyciwyg URLs
|
||||
if (historyEntry.URI.schemeIs("wyciwyg")) {
|
||||
// Adjust the index to account for skipped history entries
|
||||
if (i <= history.index)
|
||||
index--;
|
||||
continue;
|
||||
}
|
||||
let entry = this._serializeHistoryEntry(historyEntry);
|
||||
entries.push(entry);
|
||||
}
|
||||
let entry = this._serializeHistoryEntry(historyEntry);
|
||||
entries.push(entry);
|
||||
}
|
||||
let data = { entries: entries, index: index };
|
||||
let data = { entries: entries, index: index };
|
||||
|
||||
delete aBrowser.__SS_data;
|
||||
this._collectTabData(aWindow, aBrowser, data);
|
||||
this.saveStateDelayed();
|
||||
delete aBrowser.__SS_data;
|
||||
this._collectTabData(aWindow, aBrowser, data);
|
||||
this.saveStateNow();
|
||||
}
|
||||
|
||||
this._updateCrashReportURL(aWindow);
|
||||
},
|
||||
@ -345,7 +342,6 @@ SessionStore.prototype = {
|
||||
// If we have to wait, set a timer, otherwise saveState directly
|
||||
let delay = Math.max(minimalDelay, 2000);
|
||||
if (delay > 0) {
|
||||
this._pendingWrite = true;
|
||||
this._saveTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
|
||||
this._saveTimer.init(this, delay, Ci.nsITimer.TYPE_ONE_SHOT);
|
||||
} else {
|
||||
@ -354,25 +350,16 @@ SessionStore.prototype = {
|
||||
}
|
||||
},
|
||||
|
||||
saveState: function ss_saveState() {
|
||||
this._pendingWrite = true;
|
||||
this._saveState(true);
|
||||
},
|
||||
|
||||
// Immediately and synchronously writes any pending state to disk.
|
||||
flushPendingState: function ss_flushPendingState() {
|
||||
if (this._pendingWrite) {
|
||||
this._saveState(false);
|
||||
}
|
||||
},
|
||||
|
||||
_saveState: function ss_saveState(aAsync) {
|
||||
saveStateNow: function ss_saveStateNow() {
|
||||
// Kill any queued timer and save immediately
|
||||
if (this._saveTimer) {
|
||||
this._saveTimer.cancel();
|
||||
this._saveTimer = null;
|
||||
}
|
||||
this.saveState();
|
||||
},
|
||||
|
||||
saveState: function ss_saveState() {
|
||||
let data = this._getCurrentState();
|
||||
let normalData = { windows: [] };
|
||||
let privateData = { windows: [] };
|
||||
@ -401,7 +388,7 @@ SessionStore.prototype = {
|
||||
}
|
||||
|
||||
// Write only non-private data to disk
|
||||
this._writeFile(this._sessionFile, JSON.stringify(normalData), aAsync);
|
||||
this._writeFile(this._sessionFile, JSON.stringify(normalData));
|
||||
|
||||
// If we have private data, send it to Java; otherwise, send null to
|
||||
// indicate that there is no private data
|
||||
@ -477,7 +464,7 @@ SessionStore.prototype = {
|
||||
}
|
||||
},
|
||||
|
||||
_writeFile: function ss_writeFile(aFile, aData, aAsync) {
|
||||
_writeFile: function ss_writeFile(aFile, aData) {
|
||||
let stateString = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString);
|
||||
stateString.data = aData;
|
||||
Services.obs.notifyObservers(stateString, "sessionstore-state-write", "");
|
||||
@ -486,23 +473,11 @@ SessionStore.prototype = {
|
||||
if (!stateString.data)
|
||||
return;
|
||||
|
||||
if (aAsync) {
|
||||
let array = new TextEncoder().encode(aData);
|
||||
OS.File.writeAtomic(aFile.path, array, { tmpPath: aFile.path + ".tmp" }).then(function onSuccess() {
|
||||
this._pendingWrite = false;
|
||||
Services.obs.notifyObservers(null, "sessionstore-state-write-complete", "");
|
||||
}.bind(this));
|
||||
} else {
|
||||
this._pendingWrite = false;
|
||||
let foStream = Cc["@mozilla.org/network/file-output-stream;1"].
|
||||
createInstance(Ci.nsIFileOutputStream);
|
||||
foStream.init(aFile, 0x02 | 0x08 | 0x20, 0666, 0);
|
||||
let converter = Cc["@mozilla.org/intl/converter-output-stream;1"].
|
||||
createInstance(Ci.nsIConverterOutputStream);
|
||||
converter.init(foStream, "UTF-8", 0, 0);
|
||||
converter.writeString(aData);
|
||||
converter.close();
|
||||
}
|
||||
// Asynchronously copy the data to the file.
|
||||
let array = new TextEncoder().encode(aData);
|
||||
OS.File.writeAtomic(aFile.path, array, { tmpPath: aFile.path + ".tmp" }).then(function onSuccess() {
|
||||
Services.obs.notifyObservers(null, "sessionstore-state-write-complete", "");
|
||||
});
|
||||
},
|
||||
|
||||
_updateCrashReportURL: function ss_updateCrashReportURL(aWindow) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user