Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 846013 - Get rid of about:blank subframe entries in session restore. r=bnicholson

Browse Source
This commit is contained in:
Margaret Leibovic 2013-02-28 18:31:55 -08:00
parent 0c9f5b4949
commit 7bc516f93d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/android/components/SessionStore.js
View File

@ -655,19 +655,21 @@ SessionStore.prototype = {
return entry;
if (aEntry.childCount > 0) {
entry.children = [];
let children = [];
for (let i = 0; i < aEntry.childCount; i++) {
let child = aEntry.GetChildAt(i);
if (child)
entry.children.push(this._serializeHistoryEntry(child));
else // to maintain the correct frame order, insert a dummy entry
entry.children.push({ url: "about:blank" });
// don't try to restore framesets containing wyciwyg URLs (cf. bug 424689 and bug 450595)
if (/^wyciwyg:\/\//.test(entry.children[i].url)) {
delete entry.children;
break;
if (child) {
// don't try to restore framesets containing wyciwyg URLs (cf. bug 424689 and bug 450595)
if (child.URI.schemeIs("wyciwyg")) {
children = [];
break;
}
children.push(this._serializeHistoryEntry(child));
}
if (children.length)
entry.children = children;
}
}