Title: [149402] trunk/Source/WebCore
- Revision
- 149402
- Author
- [email protected]
- Date
- 2013-04-30 15:05:50 -0700 (Tue, 30 Apr 2013)
Log Message
More StorageTracker cleanup
https://bugs.webkit.org/show_bug.cgi?id=115435
Reviewed by Andreas Kling.
Use bind instead of "onMainThread" helper functions.
* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::deleteEmptyDatabase):
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::syncImportOriginIdentifiers):
(WebCore::StorageTracker::syncFileSystemAndTrackerDatabase):
(WebCore::StorageTracker::deleteOriginWithIdentifier):
* storage/StorageTracker.h:
(StorageTracker):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149401 => 149402)
--- trunk/Source/WebCore/ChangeLog 2013-04-30 21:55:43 UTC (rev 149401)
+++ trunk/Source/WebCore/ChangeLog 2013-04-30 22:05:50 UTC (rev 149402)
@@ -1,3 +1,21 @@
+2013-04-30 Anders Carlsson <[email protected]>
+
+ More StorageTracker cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=115435
+
+ Reviewed by Andreas Kling.
+
+ Use bind instead of "onMainThread" helper functions.
+
+ * storage/StorageAreaSync.cpp:
+ (WebCore::StorageAreaSync::deleteEmptyDatabase):
+ * storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::syncImportOriginIdentifiers):
+ (WebCore::StorageTracker::syncFileSystemAndTrackerDatabase):
+ (WebCore::StorageTracker::deleteOriginWithIdentifier):
+ * storage/StorageTracker.h:
+ (StorageTracker):
+
2013-04-30 Geoffrey Garen <[email protected]>
Objective-C _javascript_Core API should publicly support bridging to C
Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (149401 => 149402)
--- trunk/Source/WebCore/storage/StorageAreaSync.cpp 2013-04-30 21:55:43 UTC (rev 149401)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp 2013-04-30 22:05:50 UTC (rev 149402)
@@ -509,7 +509,7 @@
query.finalize();
m_database.close();
if (StorageTracker::tracker().isActive())
- StorageTracker::tracker().deleteOrigin(m_databaseIdentifier);
+ StorageTracker::tracker().deleteOriginWithIdentifier(m_databaseIdentifier);
else {
String databaseFilename = m_syncManager->fullDatabaseFilename(m_databaseIdentifier);
if (!SQLiteFileSystem::deleteDatabaseFile(databaseFilename))
Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (149401 => 149402)
--- trunk/Source/WebCore/storage/StorageTracker.cpp 2013-04-30 21:55:43 UTC (rev 149401)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2013-04-30 22:05:50 UTC (rev 149402)
@@ -170,11 +170,6 @@
m_thread->dispatch(bind(&StorageTracker::syncImportOriginIdentifiers, this));
}
-void StorageTracker::notifyFinishedImportingOriginIdentifiersOnMainThread(void*)
-{
- tracker().finishedImportingOriginIdentifiers();
-}
-
void StorageTracker::finishedImportingOriginIdentifiers()
{
MutexLocker locker(m_databaseMutex);
@@ -232,7 +227,7 @@
}
}
- callOnMainThread(notifyFinishedImportingOriginIdentifiersOnMainThread, 0);
+ callOnMainThread(bind(&StorageTracker::finishedImportingOriginIdentifiers, this));
}
void StorageTracker::syncFileSystemAndTrackerDatabase()
@@ -278,8 +273,7 @@
if (foundOrigins.contains(originIdentifier))
continue;
- RefPtr<StringImpl> originIdentifierImpl = originIdentifier.isolatedCopy().impl();
- callOnMainThread(deleteOriginOnMainThread, originIdentifierImpl.release().leakRef());
+ callOnMainThread(bind(&StorageTracker::deleteOriginWithIdentifier, this, originIdentifier.isolatedCopy()));
}
}
@@ -432,16 +426,8 @@
SQLiteFileSystem::deleteEmptyDatabaseDirectory(m_storageDirectoryPath);
}
-void StorageTracker::deleteOriginOnMainThread(void* originIdentifier)
+void StorageTracker::deleteOriginWithIdentifier(const String& originIdentifier)
{
- ASSERT(isMainThread());
-
- String identifier = adoptRef(reinterpret_cast<StringImpl*>(originIdentifier));
- tracker().deleteOrigin(identifier);
-}
-
-void StorageTracker::deleteOrigin(const String& originIdentifier)
-{
deleteOrigin(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).get());
}
Modified: trunk/Source/WebCore/storage/StorageTracker.h (149401 => 149402)
--- trunk/Source/WebCore/storage/StorageTracker.h 2013-04-30 21:55:43 UTC (rev 149401)
+++ trunk/Source/WebCore/storage/StorageTracker.h 2013-04-30 22:05:50 UTC (rev 149402)
@@ -54,7 +54,7 @@
void deleteAllOrigins();
void deleteOrigin(SecurityOrigin*);
- void deleteOrigin(const String& originIdentifier);
+ void deleteOriginWithIdentifier(const String& originIdentifier);
void origins(Vector<RefPtr<SecurityOrigin> >& result);
long long diskUsageForOrigin(SecurityOrigin*);
@@ -76,7 +76,6 @@
void openTrackerDatabase(bool createIfDoesNotExist);
void importOriginIdentifiers();
- static void notifyFinishedImportingOriginIdentifiersOnMainThread(void*);
void finishedImportingOriginIdentifiers();
void deleteTrackerFiles();
@@ -85,7 +84,6 @@
bool canDeleteOrigin(const String& originIdentifier);
void willDeleteOrigin(const String& originIdentifier);
void willDeleteAllOrigins();
- static void deleteOriginOnMainThread(void* originIdentifier);
void originFilePaths(Vector<String>& paths);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
