<!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>[176806] 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/176806">176806</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-04 11:39:48 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify StorageManager callback functions
https://bugs.webkit.org/show_bug.cgi?id=139257
Reviewed by Antti Koivisto.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::getOrigins):
(WebKit::StorageManager::getStorageDetailsByOrigin):
(WebKit::callCallbackFunction): Deleted.
(WebKit::StorageManager::getOriginsInternal): Deleted.
(WebKit::StorageManager::getStorageDetailsByOriginInternal): Deleted.
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
(WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
(WebKit::didGetKeyValueStorageOrigins): Deleted.
(WebKit::didGetStorageDetailsByOrigin): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176805 => 176806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-04 19:22:35 UTC (rev 176805)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-04 19:39:48 UTC (rev 176806)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-04 Anders Carlsson <andersca@apple.com>
+
+ Simplify StorageManager callback functions
+ https://bugs.webkit.org/show_bug.cgi?id=139257
+
+ Reviewed by Antti Koivisto.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::getOrigins):
+ (WebKit::StorageManager::getStorageDetailsByOrigin):
+ (WebKit::callCallbackFunction): Deleted.
+ (WebKit::StorageManager::getOriginsInternal): Deleted.
+ (WebKit::StorageManager::getStorageDetailsByOriginInternal): Deleted.
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+ (WebKit::didGetKeyValueStorageOrigins): Deleted.
+ (WebKit::didGetStorageDetailsByOrigin): Deleted.
+
</ins><span class="cx"> 2014-12-04 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> URTBF after r176794.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (176805 => 176806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-04 19:22:35 UTC (rev 176805)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-04 19:39:48 UTC (rev 176806)
</span><span class="lines">@@ -418,14 +418,30 @@
</span><span class="cx"> m_queue->dispatch(bind(&StorageManager::invalidateConnectionInternal, this, RefPtr<IPC::Connection>(webProcessProxy->connection())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getOrigins(FunctionDispatcher& callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context))
</del><ins>+void StorageManager::getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler)
</ins><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::getOriginsInternal, this, RefPtr<FunctionDispatcher>(&callbackDispatcher), context, callback));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager, completionHandler] {
+ auto origins = storageManager->m_localStorageDatabaseTracker->origins();
+
+ RunLoop::main().dispatch([origins, completionHandler]() mutable {
+ completionHandler(WTF::move(origins));
+ });
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getStorageDetailsByOrigin(FunctionDispatcher& callbackDispatcher, void* context, void (*callback)(const Vector<LocalStorageDetails>& storageDetails, void* context))
</del><ins>+void StorageManager::getStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler)
</ins><span class="cx"> {
</span><del>- m_queue->dispatch(bind(&StorageManager::getStorageDetailsByOriginInternal, this, RefPtr<FunctionDispatcher>(&callbackDispatcher), context, callback));
</del><ins>+ RefPtr<StorageManager> storageManager(this);
+
+ m_queue->dispatch([storageManager, completionHandler] {
+ auto storageDetails = storageManager->m_localStorageDatabaseTracker->details();
+
+ RunLoop::main().dispatch([storageDetails, completionHandler]() mutable {
+ completionHandler(WTF::move(storageDetails));
+ });
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::deleteEntriesForOrigin(const SecurityOrigin& securityOrigin)
</span><span class="lines">@@ -665,24 +681,6 @@
</span><span class="cx"> return result.iterator->value.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin>>* securityOriginsPtr)
-{
- std::unique_ptr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins(securityOriginsPtr);
- callbackFunction(*securityOrigins, context);
-}
-
-void StorageManager::getOriginsInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context))
-{
- auto securityOrigins = std::make_unique<Vector<RefPtr<WebCore::SecurityOrigin>>>(m_localStorageDatabaseTracker->origins());
- dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.release()));
-}
-
-void StorageManager::getStorageDetailsByOriginInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<LocalStorageDetails>& storageDetails, void* context))
-{
- Vector<LocalStorageDetails> storageDetails = m_localStorageDatabaseTracker->details();
- dispatcher->dispatch(bind(callbackFunction, WTF::move(storageDetails), context));
-}
-
</del><span class="cx"> void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrigin)
</span><span class="cx"> {
</span><span class="cx"> for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (176805 => 176806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-04 19:22:35 UTC (rev 176805)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-04 19:39:48 UTC (rev 176806)
</span><span class="lines">@@ -60,10 +60,8 @@
</span><span class="cx"> void processWillCloseConnection(WebProcessProxy*);
</span><span class="cx"> void applicationWillTerminate();
</span><span class="cx">
</span><del>- // FIXME: Instead of a context + C function, this should take a WTF::Function, but we currently don't
- // support arguments in functions.
- void getOrigins(FunctionDispatcher& callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>&, void* context));
- void getStorageDetailsByOrigin(FunctionDispatcher& callbackDispatcher, void* context, void (*callback)(const Vector<LocalStorageDetails>&, void* context));
</del><ins>+ void getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler);
+ void getStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler);
</ins><span class="cx"> void deleteEntriesForOrigin(const WebCore::SecurityOrigin&);
</span><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span><span class="lines">@@ -99,8 +97,6 @@
</span><span class="cx"> class LocalStorageNamespace;
</span><span class="cx"> LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
</span><span class="cx">
</span><del>- void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>&, void* context));
- void getStorageDetailsByOriginInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<LocalStorageDetails>&, void* context));
</del><span class="cx"> void deleteEntriesForOriginInternal(WebCore::SecurityOrigin*);
</span><span class="cx"> void deleteAllEntriesInternal();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (176805 => 176806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-12-04 19:22:35 UTC (rev 176805)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-12-04 19:39:48 UTC (rev 176806)
</span><span class="lines">@@ -86,51 +86,41 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void didGetKeyValueStorageOrigins(const Vector<RefPtr<SecurityOrigin>>& securityOrigins, void* context)
</del><ins>+void WebKeyValueStorageManager::getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context));
</del><ins>+ context()->storageManager().getOrigins([callbackFunction](Vector<RefPtr<SecurityOrigin>> securityOrigins) {
+ Vector<RefPtr<API::Object>> webSecurityOrigins;
+ webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
+ for (auto& origin : securityOrigins)
+ webSecurityOrigins.uncheckedAppend(WebSecurityOrigin::create(WTF::move(origin)));
</ins><span class="cx">
</span><del>- Vector<RefPtr<API::Object>> webSecurityOrigins;
- webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
-
- for (unsigned i = 0; i < securityOrigins.size(); ++i)
- webSecurityOrigins.uncheckedAppend(WebSecurityOrigin::create(securityOrigins[i]));
-
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(webSecurityOrigins)).get());
</del><ins>+ callbackFunction(API::Array::create(WTF::move(webSecurityOrigins)).get(), CallbackBase::Error::None);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebKeyValueStorageManager::getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebKeyValueStorageManager::getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- context()->storageManager().getOrigins(RunLoop::main(), ArrayCallback::create(WTF::move(callbackFunction)).leakRef(), didGetKeyValueStorageOrigins);
-}
-
-static void didGetStorageDetailsByOrigin(const Vector<LocalStorageDetails>& storageDetails, void* context)
-{
- RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context));
-
- Vector<RefPtr<API::Object>> result;
- result.reserveInitialCapacity(storageDetails.size());
-
- for (const LocalStorageDetails& originDetails : storageDetails) {
</del><ins>+ context()->storageManager().getStorageDetailsByOrigin([callbackFunction](Vector<LocalStorageDetails> storageDetails) {
</ins><span class="cx"> HashMap<String, RefPtr<API::Object>> detailsMap;
</span><ins>+ Vector<RefPtr<API::Object>> result;
+ result.reserveInitialCapacity(storageDetails.size());
</ins><span class="cx">
</span><del>- RefPtr<API::Object> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier));
</del><ins>+ for (const LocalStorageDetails& originDetails : storageDetails) {
+ HashMap<String, RefPtr<API::Object>> detailsMap;
</ins><span class="cx">
</span><del>- detailsMap.set(WebKeyValueStorageManager::originKey(), origin);
- if (originDetails.creationTime)
- detailsMap.set(WebKeyValueStorageManager::creationTimeKey(), API::Double::create(originDetails.creationTime.valueOr(0)));
- if (originDetails.modificationTime)
- detailsMap.set(WebKeyValueStorageManager::modificationTimeKey(), API::Double::create(originDetails.modificationTime.valueOr(0)));
</del><ins>+ RefPtr<API::Object> origin = WebSecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originDetails.originIdentifier));
</ins><span class="cx">
</span><del>- result.uncheckedAppend(ImmutableDictionary::create(WTF::move(detailsMap)));
- }
</del><ins>+ detailsMap.set(WebKeyValueStorageManager::originKey(), origin);
+ if (originDetails.creationTime)
+ detailsMap.set(WebKeyValueStorageManager::creationTimeKey(), API::Double::create(originDetails.creationTime.valueOr(0)));
+ if (originDetails.modificationTime)
+ detailsMap.set(WebKeyValueStorageManager::modificationTimeKey(), API::Double::create(originDetails.modificationTime.valueOr(0)));
</ins><span class="cx">
</span><del>- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(result)).get());
-}
</del><ins>+ result.uncheckedAppend(ImmutableDictionary::create(WTF::move(detailsMap)));
</ins><span class="cx">
</span><del>-void WebKeyValueStorageManager::getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- context()->storageManager().getStorageDetailsByOrigin(RunLoop::main(), ArrayCallback::create(WTF::move(callbackFunction)).leakRef(), didGetStorageDetailsByOrigin);
</del><ins>+ callbackFunction(API::Array::create(WTF::move(result)).get(), CallbackBase::Error::None);
+ }
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebKeyValueStorageManager::deleteEntriesForOrigin(WebSecurityOrigin* origin)
</span></span></pre>
</div>
</div>
</body>
</html>