Changeset 170644 in webkit

Timestamp:

Jul 1, 2014, 10:04:30 AM (12 years ago)

Author:

andersca@apple.com

Message:

Use an std::function for filtering session state data
​https://bugs.webkit.org/show_bug.cgi?id=134481

Reviewed by Sam Weinig.

• UIProcess/API/C/WKPage.cpp:

(WKPageCopySessionState):

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _sessionState]):

• UIProcess/WebBackForwardList.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::sessionStateData):

• UIProcess/WebPageProxy.h:
• UIProcess/cf/WebBackForwardListCF.cpp:

(WebKit::WebBackForwardList::createCFDictionaryRepresentation):

• UIProcess/cf/WebPageProxyCF.cpp:

(WebKit::WebPageProxy::sessionStateData):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/WebBackForwardList.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/cf/WebBackForwardListCF.cpp (modified) (2 diffs)
• UIProcess/cf/WebPageProxyCF.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-30  Anders Carlsson  <andersca@apple.com>
+
+        Use an std::function for filtering session state data
+        https://bugs.webkit.org/show_bug.cgi?id=134481
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageCopySessionState):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _sessionState]):
+        * UIProcess/WebBackForwardList.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::sessionStateData):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/cf/WebBackForwardListCF.cpp:
+        (WebKit::WebBackForwardList::createCFDictionaryRepresentation):
+        * UIProcess/cf/WebPageProxyCF.cpp:
+        (WebKit::WebPageProxy::sessionStateData):
+
 2014-07-01  Rohit Kumar  <kumar.rohit@samsung.com>
 

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

@@ -352 +352 @@
 WKDataRef WKPageCopySessionState(WKPageRef pageRef, void *context, WKPageSessionStateFilterCallback filter)
 {
-    return toAPI(toImpl(pageRef)->sessionStateData(filter, context).leakRef());
+    return toAPI(toImpl(pageRef)->sessionStateData([pageRef, context, filter](WebBackForwardListItem& item) {
+        if (!filter(pageRef, WKPageGetSessionBackForwardListItemValueType(), toAPI(&item), context))
+            return false;
+
+        if (!filter(pageRef, WKPageGetSessionHistoryURLValueType(), toURLRef(item.originalURL().impl()), context))
+            return false;
+
+        return true;
+    }).leakRef());
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1561 +1561 @@
 - (NSData *)_sessionState
 {
-    return [wrapper(*_page->sessionStateData(nullptr, nullptr).leakRef()) autorelease];
+    return [wrapper(*_page->sessionStateData(nullptr).leakRef()) autorelease];
 }
 

trunk/Source/WebKit2/UIProcess/WebBackForwardList.h

@@ -74 +74 @@
 
 #if USE(CF)
-    CFDictionaryRef createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback, void* context) const;
+    CFDictionaryRef createCFDictionaryRepresentation(std::function<bool (WebBackForwardListItem&)>) const;
     bool restoreFromCFDictionaryRepresentation(CFDictionaryRef);
     bool restoreFromV0CFDictionaryRepresentation(CFDictionaryRef);

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1835 +1835 @@
 
 #if !USE(CF)
-PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* /*context*/) const
+PassRefPtr<API::Data> WebPageProxy::sessionStateData(std::function<bool (WebBackForwardListItem&)>) const
 {
     // FIXME: Return session state data for saving Page state.

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -551 +551 @@
     void terminateProcess();
 
-    typedef bool (*WebPageProxySessionStateFilterCallback)(WKPageRef, WKStringRef type, WKTypeRef object, void* context);
-    PassRefPtr<API::Data> sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const;
+    PassRefPtr<API::Data> sessionStateData(std::function<bool (WebBackForwardListItem&)>) const;
     void restoreFromSessionStateData(API::Data*);
     void restoreFromState(SessionState);

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

@@ -64 +64 @@
 }
 
-CFDictionaryRef WebBackForwardList::createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback filter, void* context) const
+CFDictionaryRef WebBackForwardList::createCFDictionaryRepresentation(std::function<bool (WebBackForwardListItem&)> filter) const
 {
     ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
@@ -87 +87 @@
         }
 
-        if (filter) {
-            if (!filter(toAPI(m_page), WKPageGetSessionBackForwardListItemValueType(), toAPI(m_entries[i].get()), context)
-                || !filter(toAPI(m_page), WKPageGetSessionHistoryURLValueType(), toURLRef(m_entries[i]->originalURL().impl()), context)) {
-                if (i <= m_currentIndex)
-                    currentIndex--;
-                continue;
-            }
+        if (filter && !filter(*m_entries[i])) {
+            if (i <= m_currentIndex)
+                currentIndex--;
+            continue;
         }
         

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

@@ -47 +47 @@
 static const UInt32 CurrentSessionStateDataVersion = 2;
 
-PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback filter, void* context) const
+PassRefPtr<API::Data> WebPageProxy::sessionStateData(std::function<bool (WebBackForwardListItem&)> filter) const
 {
     const void* keys[2];
@@ -53 +53 @@
     CFIndex numValues = 0;
 
-    RetainPtr<CFDictionaryRef> sessionHistoryDictionary = adoptCF(m_backForwardList->createCFDictionaryRepresentation(filter, context));
+    RetainPtr<CFDictionaryRef> sessionHistoryDictionary = adoptCF(m_backForwardList->createCFDictionaryRepresentation(std::move(filter)));
     if (sessionHistoryDictionary) {
         keys[numValues] = sessionHistoryKey;