Title: [149300] trunk/Source/WebCore
- Revision
- 149300
- Author
- [email protected]
- Date
- 2013-04-29 11:26:29 -0700 (Mon, 29 Apr 2013)
Log Message
Add a StorageSyncManager::dispatch helper function
https://bugs.webkit.org/show_bug.cgi?id=115365
Reviewed by Andreas Kling.
* storage/StorageSyncManager.cpp:
(WebCore::StorageSyncManager::dispatch):
(WebCore):
(WebCore::StorageSyncManager::close):
(WebCore::StorageSyncManager::scheduleImport):
(WebCore::StorageSyncManager::scheduleSync):
(WebCore::StorageSyncManager::scheduleDeleteEmptyDatabase):
* storage/StorageSyncManager.h:
(StorageSyncManager):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149299 => 149300)
--- trunk/Source/WebCore/ChangeLog 2013-04-29 18:19:16 UTC (rev 149299)
+++ trunk/Source/WebCore/ChangeLog 2013-04-29 18:26:29 UTC (rev 149300)
@@ -1,5 +1,22 @@
2013-04-29 Anders Carlsson <[email protected]>
+ Add a StorageSyncManager::dispatch helper function
+ https://bugs.webkit.org/show_bug.cgi?id=115365
+
+ Reviewed by Andreas Kling.
+
+ * storage/StorageSyncManager.cpp:
+ (WebCore::StorageSyncManager::dispatch):
+ (WebCore):
+ (WebCore::StorageSyncManager::close):
+ (WebCore::StorageSyncManager::scheduleImport):
+ (WebCore::StorageSyncManager::scheduleSync):
+ (WebCore::StorageSyncManager::scheduleDeleteEmptyDatabase):
+ * storage/StorageSyncManager.h:
+ (StorageSyncManager):
+
+2013-04-29 Anders Carlsson <[email protected]>
+
Re-indent StorageSyncManager and remove SecurityOrigin forward declaration.
Rubber-stamped by Andreas Kling.
Modified: trunk/Source/WebCore/storage/StorageSyncManager.cpp (149299 => 149300)
--- trunk/Source/WebCore/storage/StorageSyncManager.cpp 2013-04-29 18:19:16 UTC (rev 149299)
+++ trunk/Source/WebCore/storage/StorageSyncManager.cpp 2013-04-29 18:26:29 UTC (rev 149300)
@@ -71,39 +71,40 @@
return pathByAppendingComponent(m_path, databaseIdentifier + ".localstorage");
}
+void StorageSyncManager::dispatch(const Function<void ()>& function)
+{
+ ASSERT(isMainThread());
+ ASSERT(m_thread);
+
+ if (m_thread)
+ m_thread->dispatch(function);
+}
+
void StorageSyncManager::close()
{
ASSERT(isMainThread());
if (m_thread) {
m_thread->terminate();
- m_thread.clear();
+ m_thread = nullptr;
}
}
bool StorageSyncManager::scheduleImport(PassRefPtr<StorageAreaSync> area)
{
- ASSERT(isMainThread());
- ASSERT(m_thread);
- if (m_thread)
- m_thread->dispatch(bind(&StorageAreaSync::performImport, area));
+ dispatch(bind(&StorageAreaSync::performImport, area));
+
return m_thread;
}
void StorageSyncManager::scheduleSync(PassRefPtr<StorageAreaSync> area)
{
- ASSERT(isMainThread());
- ASSERT(m_thread);
- if (m_thread)
- m_thread->dispatch(bind(&StorageAreaSync::performSync, area));
+ dispatch(bind(&StorageAreaSync::performSync, area));
}
void StorageSyncManager::scheduleDeleteEmptyDatabase(PassRefPtr<StorageAreaSync> area)
{
- ASSERT(isMainThread());
- ASSERT(m_thread);
- if (m_thread)
- m_thread->dispatch(bind(&StorageAreaSync::deleteEmptyDatabase, area));
+ dispatch(bind(&StorageAreaSync::deleteEmptyDatabase, area));
}
} // namespace WebCore
Modified: trunk/Source/WebCore/storage/StorageSyncManager.h (149299 => 149300)
--- trunk/Source/WebCore/storage/StorageSyncManager.h 2013-04-29 18:19:16 UTC (rev 149299)
+++ trunk/Source/WebCore/storage/StorageSyncManager.h 2013-04-29 18:26:29 UTC (rev 149300)
@@ -26,6 +26,7 @@
#ifndef StorageSyncManager_h
#define StorageSyncManager_h
+#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/OwnPtr.h>
@@ -45,6 +46,7 @@
void scheduleSync(PassRefPtr<StorageAreaSync>);
void scheduleDeleteEmptyDatabase(PassRefPtr<StorageAreaSync>);
+ void dispatch(const Function<void ()>&);
void close();
private:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
