| Index: WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h
|
| ===================================================================
|
| --- WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h (revision 140218)
|
| +++ WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h (working copy)
|
| @@ -43,6 +43,7 @@
|
| #include <wtf/text/WTFString.h>
|
|
|
| namespace WebCore {
|
| +class BlobDataHandle;
|
| class WorkerLoaderProxy;
|
| }
|
|
|
| @@ -52,7 +53,7 @@
|
| class MainThreadFileSystemCallbacks;
|
| class WebCommonWorkerClient;
|
| class ThreadableCallbacksBridgeWrapper;
|
| -class WebFileSystemCallbacks;
|
| +class WebFileSystemCallbacksImpl;
|
| class WorkerFileSystemContextObserver;
|
| struct WebFileInfo;
|
| struct WebFileSystemEntry;
|
| @@ -77,7 +78,7 @@
|
|
|
| void stop();
|
|
|
| - static PassRefPtr<WorkerFileSystemCallbacksBridge> create(WebCore::WorkerLoaderProxy* workerLoaderProxy, WebCore::ScriptExecutionContext* workerContext, WebFileSystemCallbacks* callbacks)
|
| + static PassRefPtr<WorkerFileSystemCallbacksBridge> create(WebCore::WorkerLoaderProxy* workerLoaderProxy, WebCore::ScriptExecutionContext* workerContext, WebFileSystemCallbacksImpl* callbacks)
|
| {
|
| return adoptRef(new WorkerFileSystemCallbacksBridge(workerLoaderProxy, workerContext, callbacks));
|
| }
|
| @@ -94,17 +95,18 @@
|
| void postFileExistsToMainThread(WebFileSystem*, const WebCore::KURL& path, const String& mode);
|
| void postDirectoryExistsToMainThread(WebFileSystem*, const WebCore::KURL& path, const String& mode);
|
| void postReadDirectoryToMainThread(WebFileSystem*, const WebCore::KURL& path, const String& mode);
|
| - void postCreateSnapshotFileToMainThread(WebFileSystem*, const WebCore::KURL& internalBlobURL, const WebCore::KURL& path, const String& mode);
|
| + void postCreateSnapshotFileToMainThread(WebFileSystem*, const WebCore::KURL& path, const String& mode);
|
|
|
| // Callback methods that are called on the main thread.
|
| void didFailOnMainThread(WebFileError, const String& mode);
|
| void didOpenFileSystemOnMainThread(const String& name, const WebCore::KURL& rootURL, const String& mode);
|
| void didSucceedOnMainThread(const String& mode);
|
| void didReadMetadataOnMainThread(const WebFileInfo&, const String& mode);
|
| + void didCreateSnapshotFileOnMainThread(const WebFileInfo&, const String& mode, PassRefPtr<WebCore::BlobDataHandle> snapshotBlob);
|
| void didReadDirectoryOnMainThread(const WebVector<WebFileSystemEntry>&, bool hasMore, const String& mode);
|
|
|
| private:
|
| - WorkerFileSystemCallbacksBridge(WebCore::WorkerLoaderProxy*, WebCore::ScriptExecutionContext*, WebFileSystemCallbacks*);
|
| + WorkerFileSystemCallbacksBridge(WebCore::WorkerLoaderProxy*, WebCore::ScriptExecutionContext*, WebFileSystemCallbacksImpl*);
|
|
|
| // Methods that are to be called on the main thread.
|
| static void openFileSystemOnMainThread(WebCore::ScriptExecutionContext*, WebCommonWorkerClient*, WebFileSystem::Type, long long size, bool create, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
|
| @@ -118,7 +120,7 @@
|
| static void fileExistsOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& path, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
|
| static void directoryExistsOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& path, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
|
| static void readDirectoryOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& path, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
|
| - static void createSnapshotFileOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& internalBlobURL, const WebCore::KURL& path, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
|
| + static void createSnapshotFileOnMainThread(WebCore::ScriptExecutionContext*, WebFileSystem*, const WebCore::KURL& path, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& mode);
|
|
|
| friend class MainThreadFileSystemCallbacks;
|
|
|
| @@ -127,6 +129,7 @@
|
| static void didOpenFileSystemOnWorkerThread(WebCore::ScriptExecutionContext*, PassRefPtr<WorkerFileSystemCallbacksBridge>, const String& name, const WebCore::KURL& rootPath);
|
| static void didSucceedOnWorkerThread(WebCore::ScriptExecutionContext*, PassRefPtr<WorkerFileSystemCallbacksBridge>);
|
| static void didReadMetadataOnWorkerThread(WebCore::ScriptExecutionContext*, PassRefPtr<WorkerFileSystemCallbacksBridge>, const WebFileInfo&);
|
| + static void didCreateSnapshotFileOnWorkerThread(WebCore::ScriptExecutionContext*, PassRefPtr<WorkerFileSystemCallbacksBridge>, const WebFileInfo&, PassRefPtr<WebCore::BlobDataHandle> snapshotBlob);
|
| static void didReadDirectoryOnWorkerThread(WebCore::ScriptExecutionContext*, PassRefPtr<WorkerFileSystemCallbacksBridge>, const WebVector<WebFileSystemEntry>&, bool hasMore);
|
|
|
| static void runTaskOnMainThread(WebCore::ScriptExecutionContext*, PassRefPtr<WorkerFileSystemCallbacksBridge>, PassOwnPtr<WebCore::ScriptExecutionContext::Task>);
|
| @@ -146,7 +149,7 @@
|
| WorkerFileSystemContextObserver* m_workerContextObserver;
|
|
|
| // This is self-destructed and must be fired on the worker thread.
|
| - WebFileSystemCallbacks* m_callbacksOnWorkerThread;
|
| + WebFileSystemCallbacksImpl* m_callbacksOnWorkerThread;
|
| };
|
|
|
| } // namespace WebCore
|
|
|