Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1191428 - Crash when restoring tab with no session data #865

Merged
merged 3 commits into from Aug 6, 2015
Merged

Bug 1191428 - Crash when restoring tab with no session data #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22cc5d7
Bug 1191428 - Don't create a RemoteTab if history is empty
thebnich Aug 5, 2015
79f326c
Bug 1191428 - Fail SavedTab init if Browser has no history
thebnich Aug 5, 2015
749f85b
Bug 1191428 - SessionData docs and assertions
thebnich Aug 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Client/Frontend/Browser/Browser.swift
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ class Browser: NSObject {
history: history,
lastUsed: NSDate.now(),
icon: nil)
} else if let sessionData = browser.sessionData {
} else if let sessionData = browser.sessionData where !sessionData.urls.isEmpty {
let history = sessionData.urls.reverse()
return RemoteTab(clientGUID: nil,
URL: history[0],
Expand Down
11 changes: 11 additions & 0 deletions Client/Frontend/Browser/SessionData.swift
View file
Open in desktop
Expand Up @@ -11,10 +11,21 @@ class SessionData: NSObject, NSCoding {
let urls: [NSURL]
let lastUsedTime: Timestamp

/**
Creates a new SessionData object representing a serialized tab.

:param: currentPage The active page index. Must be in the range of (-N, 0],
where 1-N is the first page in history, and 0 is the last.
:param: urls The sequence of URLs in this tab's session history.
:param: lastUsedTime The last time this tab was modified.
**/
init(currentPage: Int, urls: [NSURL], lastUsedTime: Timestamp) {
self.currentPage = currentPage
self.urls = urls
self.lastUsedTime = lastUsedTime

assert(urls.count > 0, "Session has at least one entry")
assert(currentPage > -urls.count && currentPage <= 0, "Session index is valid")
}

required init(coder: NSCoder) {
Expand Down
26 changes: 14 additions & 12 deletions Client/Frontend/Browser/TabManager.swift
View file
Open in desktop
Expand Up @@ -287,25 +287,27 @@ extension TabManager {
var sessionData: SessionData?

init?(browser: Browser, isSelected: Bool) {
let currentItem = browser.webView?.backForwardList.currentItem
self.screenshot = browser.screenshot
self.isSelected = isSelected
super.init()

let currentItem: WKBackForwardListItem! = browser.webView?.backForwardList.currentItem

// Freshly created web views won't have any history entries at all.
// If we have no history, abort.
if currentItem == nil {
return nil
}

if browser.sessionData == nil {
let backList = browser.webView?.backForwardList.backList as? [WKBackForwardListItem] ?? []
let forwardList = browser.webView?.backForwardList.forwardList as? [WKBackForwardListItem] ?? []
let currentList = (currentItem != nil) ? [currentItem!] : []
var urlList = backList + currentList + forwardList
var updatedUrlList = [NSURL]()
for url in urlList {
updatedUrlList.append(url.URL)
}
let urls = (backList + [currentItem] + forwardList).map { $0.URL }
var currentPage = -forwardList.count
self.sessionData = SessionData(currentPage: currentPage, urls: updatedUrlList, lastUsedTime: browser.lastExecutedTime ?? NSDate.now())
self.sessionData = SessionData(currentPage: currentPage, urls: urls, lastUsedTime: browser.lastExecutedTime ?? NSDate.now())
} else {
self.sessionData = browser.sessionData
}
self.screenshot = browser.screenshot
self.isSelected = isSelected

super.init()
}

required init(coder: NSCoder) {
Expand Down