diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/storage/DatabaseTracker.h | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/storage/DatabaseTracker.h')
| -rw-r--r-- | WebCore/storage/DatabaseTracker.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebCore/storage/DatabaseTracker.h b/WebCore/storage/DatabaseTracker.h index c87b26a..38a3418 100644 --- a/WebCore/storage/DatabaseTracker.h +++ b/WebCore/storage/DatabaseTracker.h @@ -37,6 +37,7 @@ #include "DatabaseDetails.h" #include "SQLiteDatabase.h" #include "StringHash.h" +#include <wtf/HashMap.h> #include <wtf/HashSet.h> #include <wtf/OwnPtr.h> #endif // !PLATFORM(CHROMIUM) @@ -44,7 +45,7 @@ namespace WebCore { class Database; -class Document; +class ScriptExecutionContext; class SecurityOrigin; #if !PLATFORM(CHROMIUM) @@ -58,8 +59,11 @@ struct SecurityOriginTraits; class DatabaseTracker : public Noncopyable { public: static DatabaseTracker& tracker(); + // FIXME: Due to workers having multiple threads in a single process sharing + // a DatabaseTracker, this singleton will have to be synchronized or moved + // to TLS. - bool canEstablishDatabase(Document*, const String& name, const String& displayName, unsigned long estimatedSize); + bool canEstablishDatabase(ScriptExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize); void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize); String fullPathForDatabase(SecurityOrigin*, const String& name, bool createIfDoesNotExist = true); |