<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170644] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170644">170644</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-01 10:04:30 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListh">trunk/Source/WebKit2/UIProcess/WebBackForwardList.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesscfWebBackForwardListCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesscfWebPageProxyCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-07-01 Rohit Kumar <kumar.rohit@samsung.com>
</span><span class="cx">
</span><span class="cx"> Clean up the WebKit build from unused parameter warning in Webkit2/UIProcess module
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -351,7 +351,15 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKPageCopySessionState(WKPageRef pageRef, void *context, WKPageSessionStateFilterCallback filter)
</span><span class="cx"> {
</span><del>- return toAPI(toImpl(pageRef)->sessionStateData(filter, context).leakRef());
</del><ins>+ 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());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -1560,7 +1560,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSData *)_sessionState
</span><span class="cx"> {
</span><del>- return [wrapper(*_page->sessionStateData(nullptr, nullptr).leakRef()) autorelease];
</del><ins>+ return [wrapper(*_page->sessionStateData(nullptr).leakRef()) autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void releaseNSData(unsigned char*, const void* data)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> PassRefPtr<API::Array> forwardListAsAPIArrayWithLimit(unsigned limit) const;
</span><span class="cx">
</span><span class="cx"> #if USE(CF)
</span><del>- CFDictionaryRef createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback, void* context) const;
</del><ins>+ CFDictionaryRef createCFDictionaryRepresentation(std::function<bool (WebBackForwardListItem&)>) const;
</ins><span class="cx"> bool restoreFromCFDictionaryRepresentation(CFDictionaryRef);
</span><span class="cx"> bool restoreFromV0CFDictionaryRepresentation(CFDictionaryRef);
</span><span class="cx"> bool restoreFromV1CFDictionaryRepresentation(CFDictionaryRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -1834,7 +1834,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(CF)
</span><del>-PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* /*context*/) const
</del><ins>+PassRefPtr<API::Data> WebPageProxy::sessionStateData(std::function<bool (WebBackForwardListItem&)>) const
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Return session state data for saving Page state.
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -550,8 +550,7 @@
</span><span class="cx">
</span><span class="cx"> void terminateProcess();
</span><span class="cx">
</span><del>- typedef bool (*WebPageProxySessionStateFilterCallback)(WKPageRef, WKStringRef type, WKTypeRef object, void* context);
- PassRefPtr<API::Data> sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const;
</del><ins>+ PassRefPtr<API::Data> sessionStateData(std::function<bool (WebBackForwardListItem&)>) const;
</ins><span class="cx"> void restoreFromSessionStateData(API::Data*);
</span><span class="cx"> void restoreFromState(SessionState);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebBackForwardListCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> return CFDictionaryCreate(0, keys, values, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CFDictionaryRef WebBackForwardList::createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback filter, void* context) const
</del><ins>+CFDictionaryRef WebBackForwardList::createCFDictionaryRepresentation(std::function<bool (WebBackForwardListItem&)> filter) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
</span><span class="cx">
</span><span class="lines">@@ -86,13 +86,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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;
- }
</del><ins>+ if (filter && !filter(*m_entries[i])) {
+ if (i <= m_currentIndex)
+ currentIndex--;
+ continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFStringRef> url = m_entries[i]->url().createCFString();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebPageProxyCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (170643 => 170644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2014-07-01 17:04:30 UTC (rev 170644)
</span><span class="lines">@@ -46,13 +46,13 @@
</span><span class="cx">
</span><span class="cx"> static const UInt32 CurrentSessionStateDataVersion = 2;
</span><span class="cx">
</span><del>-PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback filter, void* context) const
</del><ins>+PassRefPtr<API::Data> WebPageProxy::sessionStateData(std::function<bool (WebBackForwardListItem&)> filter) const
</ins><span class="cx"> {
</span><span class="cx"> const void* keys[2];
</span><span class="cx"> const void* values[2];
</span><span class="cx"> CFIndex numValues = 0;
</span><span class="cx">
</span><del>- RetainPtr<CFDictionaryRef> sessionHistoryDictionary = adoptCF(m_backForwardList->createCFDictionaryRepresentation(filter, context));
</del><ins>+ RetainPtr<CFDictionaryRef> sessionHistoryDictionary = adoptCF(m_backForwardList->createCFDictionaryRepresentation(std::move(filter)));
</ins><span class="cx"> if (sessionHistoryDictionary) {
</span><span class="cx"> keys[numValues] = sessionHistoryKey;
</span><span class="cx"> values[numValues] = sessionHistoryDictionary.get();
</span></span></pre>
</div>
</div>
</body>
</html>