Modified: trunk/Source/WebKit2/ChangeLog (170686 => 170687)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 01:24:17 UTC (rev 170686)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 01:27:55 UTC (rev 170687)
@@ -1,3 +1,14 @@
+2014-07-01 Anders Carlsson <[email protected]>
+
+ Don't encode/decode the snapshot UUID
+ https://bugs.webkit.org/show_bug.cgi?id=134532
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::encodeSessionHistory):
+ (WebKit::decodeSessionHistoryEntry):
+
2014-07-01 Commit Queue <[email protected]>
Unreviewed, rolling out r170608.
Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170686 => 170687)
--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-02 01:24:17 UTC (rev 170686)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-02 01:27:55 UTC (rev 170687)
@@ -52,7 +52,6 @@
static const CFStringRef sessionHistoryEntryURLKey = CFSTR("SessionHistoryEntryURL");
static CFStringRef sessionHistoryEntryTitleKey = CFSTR("SessionHistoryEntryTitle");
static CFStringRef sessionHistoryEntryOriginalURLKey = CFSTR("SessionHistoryEntryOriginalURL");
-static CFStringRef sessionHistoryEntrySnapshotUUIDKey = CFSTR("SessionHistoryEntrySnapshotUUID");
static CFStringRef sessionHistoryEntryDataKey = CFSTR("SessionHistoryEntryData");
// Session history entry data.
@@ -437,7 +436,7 @@
auto originalURL = item.pageState.mainFrameState.originalURLString.createCFString();
auto data = ""
- auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryOriginalURLKey, originalURL.get() }, { sessionHistoryEntryDataKey, data.get() }, { sessionHistoryEntrySnapshotUUIDKey, item.snapshotUUID.createCFString().get() }});
+ auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryOriginalURLKey, originalURL.get() }, { sessionHistoryEntryDataKey, data.get() } });
CFArrayAppendValue(entries.get(), entryDictionary.get());
}
@@ -954,9 +953,6 @@
if (!decodeSessionHistoryEntryData(historyEntryData, backForwardListItemState.pageState.mainFrameState))
return false;
- if (auto snapshotUUID = WTF::dynamic_cf_cast<CFStringRef>(CFDictionaryGetValue(entryDictionary, sessionHistoryEntrySnapshotUUIDKey)))
- backForwardListItemState.snapshotUUID = snapshotUUID;
-
backForwardListItemState.pageState.title = title;
backForwardListItemState.pageState.mainFrameState.urlString = urlString;
backForwardListItemState.pageState.mainFrameState.originalURLString = originalURLString;
