Changeset 170671 in webkit

Timestamp:

Jul 1, 2014, 3:34:10 PM (12 years ago)

Author:

andersca@apple.com

Message:

Use the new legacy session state coding in WKPageCopySessionState
​https://bugs.webkit.org/show_bug.cgi?id=134516

Reviewed by Tim Horton.

• UIProcess/API/C/WKPage.cpp:

(WKPageCopySessionState):
Call encodeLegacySessionState.

• UIProcess/mac/LegacySessionStateCoding.cpp:

(WebKit::encodeSessionHistoryEntryData):
Use leakPtr() so we won't attempt to double-free the buffer.

(WebKit::createDictionary):
Fix a typo.

(WebKit::encodeLegacySessionState):
Don't encode the provisional URL if it's empty.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (3 diffs)
• UIProcess/mac/LegacySessionStateCoding.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-01  Anders Carlsson  <andersca@apple.com>
+
+        Use the new legacy session state coding in WKPageCopySessionState
+        https://bugs.webkit.org/show_bug.cgi?id=134516
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageCopySessionState):
+        Call encodeLegacySessionState.
+
+        * UIProcess/mac/LegacySessionStateCoding.cpp:
+        (WebKit::encodeSessionHistoryEntryData):
+        Use leakPtr() so we won't attempt to double-free the buffer.
+
+        (WebKit::createDictionary):
+        Fix a typo.
+
+        (WebKit::encodeLegacySessionState):
+        Don't encode the provisional URL if it's empty.
+
 2014-07-01  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -35 +35 @@
 #include "APIUIClient.h"
 #include "ImmutableDictionary.h"
+#include "LegacySessionStateCoding.h"
 #include "NativeWebKeyboardEvent.h"
 #include "NativeWebWheelEvent.h"
@@ -352 +353 @@
 WKDataRef WKPageCopySessionState(WKPageRef pageRef, void *context, WKPageSessionStateFilterCallback filter)
 {
-    return toAPI(toImpl(pageRef)->sessionStateData([pageRef, context, filter](WebBackForwardListItem& item) {
+    auto sessionState = toImpl(pageRef)->sessionState([pageRef, context, filter](WebBackForwardListItem& item) {
         if (filter) {
             if (!filter(pageRef, WKPageGetSessionBackForwardListItemValueType(), toAPI(&item), context))
@@ -362 +363 @@
 
         return true;
-    }).leakRef());
+    });
+
+    return toAPI(encodeLegacySessionState(sessionState).release().leakRef());
 }
 

trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp

@@ -402 +402 @@
     auto buffer = encodeSessionHistoryEntryData(frameState, bufferSize);
 
-    return adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, buffer.get(), bufferSize, fastMallocDeallocator));
+    return adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, buffer.leakPtr(), bufferSize, fastMallocDeallocator));
 }
 
@@ -415 +415 @@
     for (const auto& keyValuePair : keyValuePairs) {
         keys.uncheckedAppend(keyValuePair.first);
-        keys.uncheckedAppend(keyValuePair.second);
+        values.uncheckedAppend(keyValuePair.second);
     }
 
@@ -452 +452 @@
 {
     auto sessionHistoryDictionary = encodeSessionHistory(sessionState.backForwardListState);
-    auto provisionalURLString = sessionState.provisionalURL.string().createCFString();
+    auto provisionalURLString = sessionState.provisionalURL.isNull() ? nullptr : sessionState.provisionalURL.string().createCFString();
 
     RetainPtr<CFDictionaryRef> stateDictionary;