Title: [149639] trunk/Source/WebKit2
- Revision
- 149639
- Author
- [email protected]
- Date
- 2013-05-06 14:07:35 -0700 (Mon, 06 May 2013)
Log Message
Every LocalStorageDatabase should know about its tracker
https://bugs.webkit.org/show_bug.cgi?id=115673
Reviewed by Andreas Kling.
* UIProcess/Storage/LocalStorageDatabase.cpp:
(WebKit::LocalStorageDatabase::create):
(WebKit::LocalStorageDatabase::LocalStorageDatabase):
* UIProcess/Storage/LocalStorageDatabase.h:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::StorageArea::StorageArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149638 => 149639)
--- trunk/Source/WebKit2/ChangeLog 2013-05-06 20:56:10 UTC (rev 149638)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-06 21:07:35 UTC (rev 149639)
@@ -1,5 +1,19 @@
2013-05-06 Anders Carlsson <[email protected]>
+ Every LocalStorageDatabase should know about its tracker
+ https://bugs.webkit.org/show_bug.cgi?id=115673
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/Storage/LocalStorageDatabase.cpp:
+ (WebKit::LocalStorageDatabase::create):
+ (WebKit::LocalStorageDatabase::LocalStorageDatabase):
+ * UIProcess/Storage/LocalStorageDatabase.h:
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::StorageArea::StorageArea):
+
+2013-05-06 Anders Carlsson <[email protected]>
+
Add LocalStorageDatabaseTracker class
https://bugs.webkit.org/show_bug.cgi?id=115671
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp (149638 => 149639)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2013-05-06 20:56:10 UTC (rev 149638)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2013-05-06 21:07:35 UTC (rev 149639)
@@ -26,6 +26,7 @@
#include "config.h"
#include "LocalStorageDatabase.h"
+#include "LocalStorageDatabaseTracker.h"
#include "WorkQueue.h"
#include <WebCore/FileSystem.h>
#include <WebCore/SQLiteStatement.h>
@@ -43,14 +44,15 @@
namespace WebKit {
-PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(const String& databaseFilename, PassRefPtr<WorkQueue> queue)
+PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(const String& databaseFilename, PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker)
{
- return adoptRef(new LocalStorageDatabase(databaseFilename, queue));
+ return adoptRef(new LocalStorageDatabase(databaseFilename, queue, tracker));
}
-LocalStorageDatabase::LocalStorageDatabase(const String& databaseFilename, PassRefPtr<WorkQueue> queue)
+LocalStorageDatabase::LocalStorageDatabase(const String& databaseFilename, PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker)
: m_databaseFilename(databaseFilename)
, m_queue(queue)
+ , m_tracker(tracker)
, m_failedToOpenDatabase(false)
, m_didImportItems(false)
, m_isClosed(false)
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h (149638 => 149639)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2013-05-06 20:56:10 UTC (rev 149638)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2013-05-06 21:07:35 UTC (rev 149639)
@@ -40,9 +40,11 @@
namespace WebKit {
+class LocalStorageDatabaseTracker;
+
class LocalStorageDatabase : public ThreadSafeRefCounted<LocalStorageDatabase> {
public:
- static PassRefPtr<LocalStorageDatabase> create(const String& databaseFilename, PassRefPtr<WorkQueue>);
+ static PassRefPtr<LocalStorageDatabase> create(const String& databaseFilename, PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>);
~LocalStorageDatabase();
// Will block until the import is complete.
@@ -56,7 +58,7 @@
void close();
private:
- LocalStorageDatabase(const String& databaseFilename, PassRefPtr<WorkQueue>);
+ LocalStorageDatabase(const String& databaseFilename, PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>);
enum DatabaseOpeningStrategy {
CreateIfNonExistent,
@@ -75,6 +77,7 @@
String m_databaseFilename;
RefPtr<WorkQueue> m_queue;
+ RefPtr<LocalStorageDatabaseTracker> m_tracker;
WebCore::SQLiteDatabase m_database;
bool m_failedToOpenDatabase;
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (149638 => 149639)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-05-06 20:56:10 UTC (rev 149638)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-05-06 21:07:35 UTC (rev 149639)
@@ -111,7 +111,7 @@
, m_storageMap(StorageMap::create(m_quotaInBytes))
{
if (m_localStorageNamespace)
- m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->databaseFilename(m_securityOrigin.get()), m_localStorageNamespace->storageManager()->m_queue);
+ m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->databaseFilename(m_securityOrigin.get()), m_localStorageNamespace->storageManager()->m_queue, m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker);
}
StorageManager::StorageArea::~StorageArea()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
