diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/fileapi/DOMFileSystemBase.h | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/fileapi/DOMFileSystemBase.h')
-rw-r--r-- | Source/WebCore/fileapi/DOMFileSystemBase.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/Source/WebCore/fileapi/DOMFileSystemBase.h b/Source/WebCore/fileapi/DOMFileSystemBase.h index 66f1331..6332b63 100644 --- a/Source/WebCore/fileapi/DOMFileSystemBase.h +++ b/Source/WebCore/fileapi/DOMFileSystemBase.h @@ -47,20 +47,30 @@ class EntriesCallback; class EntryBase; class EntryCallback; class ErrorCallback; +class KURL; class MetadataCallback; +class ScriptExecutionContext; +class SecurityOrigin; class VoidCallback; // A common base class for DOMFileSystem and DOMFileSystemSync. class DOMFileSystemBase : public RefCounted<DOMFileSystemBase> { public: - static PassRefPtr<DOMFileSystemBase> create(const String& name, PassOwnPtr<AsyncFileSystem> asyncFileSystem) + static PassRefPtr<DOMFileSystemBase> create(ScriptExecutionContext* context, const String& name, PassOwnPtr<AsyncFileSystem> asyncFileSystem) { - return adoptRef(new DOMFileSystemBase(name, asyncFileSystem)); + return adoptRef(new DOMFileSystemBase(context, name, asyncFileSystem)); } virtual ~DOMFileSystemBase(); + static const char kPersistentPathPrefix[]; + static const size_t kPersistentPathPrefixLength; + static const char kTemporaryPathPrefix[]; + static const size_t kTemporaryPathPrefixLength; + static bool crackFileSystemURL(const KURL&, AsyncFileSystem::Type&, String& filePath); + const String& name() const { return m_name; } AsyncFileSystem* asyncFileSystem() const { return m_asyncFileSystem.get(); } + SecurityOrigin* securityOrigin() const; // Actual FileSystem API implementations. All the validity checks on virtual paths are done at this level. // They return false for immediate errors that don't involve lower AsyncFileSystem layer (e.g. for name validation errors). Otherwise they return true (but later may call back with an runtime error). @@ -75,9 +85,10 @@ public: bool readDirectory(PassRefPtr<DirectoryReaderBase>, const String& path, PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>); protected: - DOMFileSystemBase(const String& name, PassOwnPtr<AsyncFileSystem>); + DOMFileSystemBase(ScriptExecutionContext*, const String& name, PassOwnPtr<AsyncFileSystem>); friend class DOMFileSystemSync; + ScriptExecutionContext* m_context; String m_name; mutable OwnPtr<AsyncFileSystem> m_asyncFileSystem; }; |