Title: [149680] trunk/Source/WebKit2
- Revision
- 149680
- Author
- ander...@apple.com
- Date
- 2013-05-07 10:45:02 -0700 (Tue, 07 May 2013)
Log Message
Each local storage database should know its origin
https://bugs.webkit.org/show_bug.cgi?id=115737
Reviewed by Andreas Kling.
Store the security origin in a member variable. It'll be used to communicate database state changes to the tracker.
* UIProcess/Storage/LocalStorageDatabase.cpp:
(WebKit::LocalStorageDatabase::create):
(WebKit::LocalStorageDatabase::LocalStorageDatabase):
* UIProcess/Storage/LocalStorageDatabase.h:
(LocalStorageDatabase):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149679 => 149680)
--- trunk/Source/WebKit2/ChangeLog 2013-05-07 17:42:17 UTC (rev 149679)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-07 17:45:02 UTC (rev 149680)
@@ -1,3 +1,18 @@
+2013-05-07 Anders Carlsson <ander...@apple.com>
+
+ Each local storage database should know its origin
+ https://bugs.webkit.org/show_bug.cgi?id=115737
+
+ Reviewed by Andreas Kling.
+
+ Store the security origin in a member variable. It'll be used to communicate database state changes to the tracker.
+
+ * UIProcess/Storage/LocalStorageDatabase.cpp:
+ (WebKit::LocalStorageDatabase::create):
+ (WebKit::LocalStorageDatabase::LocalStorageDatabase):
+ * UIProcess/Storage/LocalStorageDatabase.h:
+ (LocalStorageDatabase):
+
2013-05-07 Brady Eidson <beid...@apple.com>
Remove some unnecessary soft linking in NetworkProcess. (Take 2)
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp (149679 => 149680)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2013-05-07 17:42:17 UTC (rev 149679)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2013-05-07 17:45:02 UTC (rev 149680)
@@ -31,6 +31,7 @@
#include <WebCore/FileSystem.h>
#include <WebCore/SQLiteStatement.h>
#include <WebCore/SQLiteTransaction.h>
+#include <WebCore/SecurityOrigin.h>
#include <WebCore/StorageMap.h>
#include <wtf/PassRefPtr.h>
#include <wtf/text/StringHash.h>
@@ -44,15 +45,16 @@
namespace WebKit {
-PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, SecurityOrigin* securityOrigin)
+PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, PassRefPtr<SecurityOrigin> securityOrigin)
{
return adoptRef(new LocalStorageDatabase(queue, tracker, securityOrigin));
}
-LocalStorageDatabase::LocalStorageDatabase(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, SecurityOrigin* securityOrigin)
+LocalStorageDatabase::LocalStorageDatabase(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, PassRefPtr<SecurityOrigin> securityOrigin)
: m_queue(queue)
, m_tracker(tracker)
- , m_databaseFilename(m_tracker->databaseFilename(securityOrigin))
+ , m_securityOrigin(securityOrigin)
+ , m_databaseFilename(m_tracker->databaseFilename(m_securityOrigin.get()))
, m_failedToOpenDatabase(false)
, m_didImportItems(false)
, m_isClosed(false)
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h (149679 => 149680)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2013-05-07 17:42:17 UTC (rev 149679)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2013-05-07 17:45:02 UTC (rev 149680)
@@ -45,7 +45,7 @@
class LocalStorageDatabase : public ThreadSafeRefCounted<LocalStorageDatabase> {
public:
- static PassRefPtr<LocalStorageDatabase> create(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, WebCore::SecurityOrigin*);
+ static PassRefPtr<LocalStorageDatabase> create(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, PassRefPtr<WebCore::SecurityOrigin>);
~LocalStorageDatabase();
// Will block until the import is complete.
@@ -59,7 +59,7 @@
void close();
private:
- LocalStorageDatabase(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, WebCore::SecurityOrigin*);
+ LocalStorageDatabase(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, PassRefPtr<WebCore::SecurityOrigin>);
enum DatabaseOpeningStrategy {
CreateIfNonExistent,
@@ -78,6 +78,7 @@
RefPtr<WorkQueue> m_queue;
RefPtr<LocalStorageDatabaseTracker> m_tracker;
+ RefPtr<WebCore::SecurityOrigin> m_securityOrigin;
String m_databaseFilename;
WebCore::SQLiteDatabase m_database;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes