Changeset 164381 in webkit

Timestamp:

Feb 19, 2014 12:44:45 PM (10 years ago)

Author:

timothy_horton@apple.com

Message:

[wk2] REGRESSION (r162710): Open tab urls not restored after switching to new Safari build
​https://bugs.webkit.org/show_bug.cgi?id=128536
<rdar://problem/15911839>

Reviewed by Dan Bernstein.

• UIProcess/cf/WebBackForwardListCF.cpp:

(WebKit::extractBackForwardListEntriesFromArray):
Don't fail to extract an entry if it doesn't have a snapshot UUID.

• UIProcess/cf/WebPageProxyCF.cpp:

It turns out that this was the wrong version to bump, and we don't support
reading different versions of the session state data.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/cf/WebBackForwardListCF.cpp (modified) (2 diffs)
• UIProcess/cf/WebPageProxyCF.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-19  Tim Horton  <timothy_horton@apple.com>
+
+        [wk2] REGRESSION (r162710): Open tab urls not restored after switching to new Safari build
+        https://bugs.webkit.org/show_bug.cgi?id=128536
+        <rdar://problem/15911839>
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/cf/WebBackForwardListCF.cpp:
+        (WebKit::extractBackForwardListEntriesFromArray):
+        Don't fail to extract an entry if it doesn't have a snapshot UUID.
+
+        * UIProcess/cf/WebPageProxyCF.cpp:
+        It turns out that this was the wrong version to bump, and we don't support
+        reading different versions of the session state data.
+
 2014-02-19  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp

@@ -312 +312 @@
         }
 
-        CFStringRef snapshotUUID = (CFStringRef)CFDictionaryGetValue(entryDictionary, sessionHistoryEntrySnapshotUUIDKey);
-        if (!snapshotUUID || CFGetTypeID(snapshotUUID) != CFStringGetTypeID()) {
-            LOG(SessionState, "WebBackForwardList entry at index %i does not have a valid snapshot UUID", (int)i);
-            return false;
-        }
-
         CFDataRef backForwardData = (CFDataRef)CFDictionaryGetValue(entryDictionary, sessionHistoryEntryDataKey);
         if (!backForwardData || CFGetTypeID(backForwardData) != CFDataGetTypeID()) {
@@ -325 +319 @@
 
         auto item = WebBackForwardListItem::create(originalURL, entryURL, entryTitle, CFDataGetBytePtr(backForwardData), CFDataGetLength(backForwardData), generateWebBackForwardItemID());
-        item->setSnapshotUUID(snapshotUUID);
+
+        CFStringRef snapshotUUID = (CFStringRef)CFDictionaryGetValue(entryDictionary, sessionHistoryEntrySnapshotUUIDKey);
+        if (snapshotUUID && CFGetTypeID(snapshotUUID) == CFStringGetTypeID())
+            item->setSnapshotUUID(snapshotUUID);
+
         entries.append(item);
     }

trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp

@@ -45 +45 @@
 static CFStringRef provisionalURLKey = CFSTR("ProvisionalURL");
 
-static const UInt32 CurrentSessionStateDataVersion = 3;
+static const UInt32 CurrentSessionStateDataVersion = 2;
 
 PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback filter, void* context) const