<!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>[169674] trunk/Source/WebCore</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/169674">169674</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-06-07 06:10:23 -0700 (Sat, 07 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass C++11 lambdas to callOnMainThread() calls in IconDatabase
https://bugs.webkit.org/show_bug.cgi?id=133374
Reviewed by Darin Adler.
Use C++11 lambads to inline the main thread tasks into the calling code,
modernizing the look of the code and removing a few static methods and
classes that were used as helpers.
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::scheduleOrDeferSyncTimer):
(WebCore::IconDatabase::performURLImport):
(WebCore::IconDatabase::dispatchDidImportIconURLForPageURLOnMainThread):
(WebCore::IconDatabase::dispatchDidImportIconDataForPageURLOnMainThread):
(WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread):
(WebCore::IconDatabase::dispatchDidFinishURLImportOnMainThread):
(WebCore::IconDatabase::notifyPendingLoadDecisionsOnMainThread): Deleted.
(WebCore::IconDatabase::performScheduleOrDeferSyncTimer): Deleted.
(WebCore::IconDatabase::performScheduleOrDeferSyncTimerOnMainThread): Deleted.
(WebCore::ClientWorkItem::ClientWorkItem): Deleted.
(WebCore::ClientWorkItem::~ClientWorkItem): Deleted.
(WebCore::ImportedIconURLForPageURLWorkItem::ImportedIconURLForPageURLWorkItem): Deleted.
(WebCore::ImportedIconURLForPageURLWorkItem::~ImportedIconURLForPageURLWorkItem): Deleted.
(WebCore::ImportedIconURLForPageURLWorkItem::performWork): Deleted.
(WebCore::ImportedIconDataForPageURLWorkItem::ImportedIconDataForPageURLWorkItem): Deleted.
(WebCore::ImportedIconDataForPageURLWorkItem::~ImportedIconDataForPageURLWorkItem): Deleted.
(WebCore::ImportedIconDataForPageURLWorkItem::performWork): Deleted.
(WebCore::RemovedAllIconsWorkItem::RemovedAllIconsWorkItem): Deleted.
(WebCore::RemovedAllIconsWorkItem::performWork): Deleted.
(WebCore::FinishedURLImport::FinishedURLImport): Deleted.
(WebCore::FinishedURLImport::performWork): Deleted.
(WebCore::performWorkItem): Deleted.
* loader/icon/IconDatabase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabasecpp">trunk/Source/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabaseh">trunk/Source/WebCore/loader/icon/IconDatabase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169673 => 169674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-07 13:06:47 UTC (rev 169673)
+++ trunk/Source/WebCore/ChangeLog 2014-06-07 13:10:23 UTC (rev 169674)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2014-06-07 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Pass C++11 lambdas to callOnMainThread() calls in IconDatabase
+ https://bugs.webkit.org/show_bug.cgi?id=133374
+
+ Reviewed by Darin Adler.
+
+ Use C++11 lambads to inline the main thread tasks into the calling code,
+ modernizing the look of the code and removing a few static methods and
+ classes that were used as helpers.
+
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::scheduleOrDeferSyncTimer):
+ (WebCore::IconDatabase::performURLImport):
+ (WebCore::IconDatabase::dispatchDidImportIconURLForPageURLOnMainThread):
+ (WebCore::IconDatabase::dispatchDidImportIconDataForPageURLOnMainThread):
+ (WebCore::IconDatabase::dispatchDidRemoveAllIconsOnMainThread):
+ (WebCore::IconDatabase::dispatchDidFinishURLImportOnMainThread):
+ (WebCore::IconDatabase::notifyPendingLoadDecisionsOnMainThread): Deleted.
+ (WebCore::IconDatabase::performScheduleOrDeferSyncTimer): Deleted.
+ (WebCore::IconDatabase::performScheduleOrDeferSyncTimerOnMainThread): Deleted.
+ (WebCore::ClientWorkItem::ClientWorkItem): Deleted.
+ (WebCore::ClientWorkItem::~ClientWorkItem): Deleted.
+ (WebCore::ImportedIconURLForPageURLWorkItem::ImportedIconURLForPageURLWorkItem): Deleted.
+ (WebCore::ImportedIconURLForPageURLWorkItem::~ImportedIconURLForPageURLWorkItem): Deleted.
+ (WebCore::ImportedIconURLForPageURLWorkItem::performWork): Deleted.
+ (WebCore::ImportedIconDataForPageURLWorkItem::ImportedIconDataForPageURLWorkItem): Deleted.
+ (WebCore::ImportedIconDataForPageURLWorkItem::~ImportedIconDataForPageURLWorkItem): Deleted.
+ (WebCore::ImportedIconDataForPageURLWorkItem::performWork): Deleted.
+ (WebCore::RemovedAllIconsWorkItem::RemovedAllIconsWorkItem): Deleted.
+ (WebCore::RemovedAllIconsWorkItem::performWork): Deleted.
+ (WebCore::FinishedURLImport::FinishedURLImport): Deleted.
+ (WebCore::FinishedURLImport::performWork): Deleted.
+ (WebCore::performWorkItem): Deleted.
+ * loader/icon/IconDatabase.h:
+
+2014-06-07 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Replace uses of CrossThreadTask in DefaultSharedWorkerRepository, WorkerMessagingProxy with C++11 lambdas
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133375
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (169673 => 169674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-06-07 13:06:47 UTC (rev 169673)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2014-06-07 13:10:23 UTC (rev 169674)
</span><span class="lines">@@ -804,11 +804,6 @@
</span><span class="cx"> ASSERT(!isOpen());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IconDatabase::notifyPendingLoadDecisionsOnMainThread(void* context)
-{
- static_cast<IconDatabase*>(context)->notifyPendingLoadDecisions();
-}
-
</del><span class="cx"> void IconDatabase::notifyPendingLoadDecisions()
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_SYNC_THREAD();
</span><span class="lines">@@ -838,17 +833,6 @@
</span><span class="cx"> m_syncCondition.signal();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IconDatabase::performScheduleOrDeferSyncTimer()
-{
- m_syncTimer.startOneShot(updateTimerDelay);
- m_scheduleOrDeferSyncTimerRequested = false;
-}
-
-void IconDatabase::performScheduleOrDeferSyncTimerOnMainThread(void* context)
-{
- static_cast<IconDatabase*>(context)->performScheduleOrDeferSyncTimer();
-}
-
</del><span class="cx"> void IconDatabase::scheduleOrDeferSyncTimer()
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_SYNC_THREAD();
</span><span class="lines">@@ -860,7 +844,10 @@
</span><span class="cx"> m_disableSuddenTerminationWhileSyncTimerScheduled = std::make_unique<SuddenTerminationDisabler>();
</span><span class="cx">
</span><span class="cx"> m_scheduleOrDeferSyncTimerRequested = true;
</span><del>- callOnMainThread(performScheduleOrDeferSyncTimerOnMainThread, this);
</del><ins>+ callOnMainThread([this] {
+ m_syncTimer.startOneShot(updateTimerDelay);
+ m_scheduleOrDeferSyncTimerRequested = false;
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::syncTimerFired(Timer<IconDatabase>&)
</span><span class="lines">@@ -1337,7 +1324,9 @@
</span><span class="cx"> dispatchDidFinishURLImportOnMainThread();
</span><span class="cx">
</span><span class="cx"> // Notify all DocumentLoaders that were waiting for an icon load decision on the main thread
</span><del>- callOnMainThread(notifyPendingLoadDecisionsOnMainThread, this);
</del><ins>+ callOnMainThread([this] {
+ notifyPendingLoadDecisions();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::syncThreadMainLoop()
</span><span class="lines">@@ -2077,130 +2066,42 @@
</span><span class="cx"> SQLiteStatement(m_syncDB, "INSERT INTO IconDatabaseInfo (key, value) VALUES ('ExcludedFromBackup', 1)").executeCommand();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class ClientWorkItem {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- ClientWorkItem(IconDatabaseClient* client)
- : m_client(client)
- { }
- virtual void performWork() = 0;
- virtual ~ClientWorkItem() { }
-
-protected:
- IconDatabaseClient* m_client;
-};
-
-class ImportedIconURLForPageURLWorkItem : public ClientWorkItem {
-public:
- ImportedIconURLForPageURLWorkItem(IconDatabaseClient* client, const String& pageURL)
- : ClientWorkItem(client)
- , m_pageURL(new String(pageURL.isolatedCopy()))
- { }
-
- virtual ~ImportedIconURLForPageURLWorkItem()
- {
- delete m_pageURL;
- }
-
- virtual void performWork()
- {
- ASSERT(m_client);
- m_client->didImportIconURLForPageURL(*m_pageURL);
- m_client = 0;
- }
-
-private:
- String* m_pageURL;
-};
-
-class ImportedIconDataForPageURLWorkItem : public ClientWorkItem {
-public:
- ImportedIconDataForPageURLWorkItem(IconDatabaseClient* client, const String& pageURL)
- : ClientWorkItem(client)
- , m_pageURL(new String(pageURL.isolatedCopy()))
- { }
-
- virtual ~ImportedIconDataForPageURLWorkItem()
- {
- delete m_pageURL;
- }
-
- virtual void performWork()
- {
- ASSERT(m_client);
- m_client->didImportIconDataForPageURL(*m_pageURL);
- m_client = 0;
- }
-
-private:
- String* m_pageURL;
-};
-
-class RemovedAllIconsWorkItem : public ClientWorkItem {
-public:
- RemovedAllIconsWorkItem(IconDatabaseClient* client)
- : ClientWorkItem(client)
- { }
-
- virtual void performWork()
- {
- ASSERT(m_client);
- m_client->didRemoveAllIcons();
- m_client = 0;
- }
-};
-
-class FinishedURLImport : public ClientWorkItem {
-public:
- FinishedURLImport(IconDatabaseClient* client)
- : ClientWorkItem(client)
- { }
-
- virtual void performWork()
- {
- ASSERT(m_client);
- m_client->didFinishURLImport();
- m_client = 0;
- }
-};
-
-static void performWorkItem(void* context)
-{
- ClientWorkItem* item = static_cast<ClientWorkItem*>(context);
- item->performWork();
- delete item;
-}
-
</del><span class="cx"> void IconDatabase::dispatchDidImportIconURLForPageURLOnMainThread(const String& pageURL)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><span class="cx">
</span><del>- ImportedIconURLForPageURLWorkItem* work = new ImportedIconURLForPageURLWorkItem(m_client, pageURL);
- callOnMainThread(performWorkItem, work);
</del><ins>+ String pageURLCopy = pageURL.isolatedCopy();
+ callOnMainThread([this, pageURLCopy] {
+ m_client->didImportIconURLForPageURL(pageURLCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::dispatchDidImportIconDataForPageURLOnMainThread(const String& pageURL)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><span class="cx">
</span><del>- ImportedIconDataForPageURLWorkItem* work = new ImportedIconDataForPageURLWorkItem(m_client, pageURL);
- callOnMainThread(performWorkItem, work);
</del><ins>+ String pageURLCopy = pageURL.isolatedCopy();
+ callOnMainThread([this, pageURLCopy] {
+ m_client->didImportIconDataForPageURL(pageURLCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::dispatchDidRemoveAllIconsOnMainThread()
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><span class="cx">
</span><del>- RemovedAllIconsWorkItem* work = new RemovedAllIconsWorkItem(m_client);
- callOnMainThread(performWorkItem, work);
</del><ins>+ callOnMainThread([this] {
+ m_client->didRemoveAllIcons();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IconDatabase::dispatchDidFinishURLImportOnMainThread()
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ICON_SYNC_THREAD();
</span><span class="cx">
</span><del>- FinishedURLImport* work = new FinishedURLImport(m_client);
- callOnMainThread(performWorkItem, work);
</del><ins>+ callOnMainThread([this] {
+ m_client->didFinishURLImport();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (169673 => 169674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-06-07 13:06:47 UTC (rev 169673)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-06-07 13:10:23 UTC (rev 169674)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> private:
</span><span class="cx"> friend IconDatabaseBase& iconDatabase();
</span><span class="cx">
</span><del>- static void notifyPendingLoadDecisionsOnMainThread(void*);
</del><span class="cx"> void notifyPendingLoadDecisions();
</span><span class="cx">
</span><span class="cx"> void wakeSyncThread();
</span><span class="lines">@@ -126,9 +125,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IconRecord> m_defaultIconRecord;
</span><span class="cx">
</span><del>- static void performScheduleOrDeferSyncTimerOnMainThread(void*);
- void performScheduleOrDeferSyncTimer();
-
</del><span class="cx"> bool m_scheduleOrDeferSyncTimerRequested;
</span><span class="cx"> std::unique_ptr<SuddenTerminationDisabler> m_disableSuddenTerminationWhileSyncTimerScheduled;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>