| Index: Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| diff --git a/Source/modules/filesystem/WorkerContextFileSystem.cpp b/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| similarity index 83%
|
| rename from Source/modules/filesystem/WorkerContextFileSystem.cpp
|
| rename to Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| index d9f2a52967fe69e8f83d2efa380cc09ea2f2eab3..9d11f96fd77118e9f01cdc17cef5f3748ee8b4f7 100644
|
| --- a/Source/modules/filesystem/WorkerContextFileSystem.cpp
|
| +++ b/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| @@ -26,12 +26,12 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "modules/filesystem/WorkerContextFileSystem.h"
|
| +#include "modules/filesystem/WorkerGlobalScopeFileSystem.h"
|
|
|
| #include "core/fileapi/FileError.h"
|
| #include "core/fileapi/FileException.h"
|
| #include "core/platform/AsyncFileSystem.h"
|
| -#include "core/workers/WorkerContext.h"
|
| +#include "core/workers/WorkerGlobalScope.h"
|
| #include "modules/filesystem/DOMFileSystemBase.h"
|
| #include "modules/filesystem/DOMFileSystemSync.h"
|
| #include "modules/filesystem/DirectoryEntrySync.h"
|
| @@ -46,7 +46,7 @@
|
|
|
| namespace WebCore {
|
|
|
| -void WorkerContextFileSystem::webkitRequestFileSystem(WorkerContext* worker, int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
|
| +void WorkerGlobalScopeFileSystem::webkitRequestFileSystem(WorkerGlobalScope* worker, int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
|
| {
|
| ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
|
| if (!secureContext->securityOrigin()->canAccessFileSystem()) {
|
| @@ -63,7 +63,7 @@ void WorkerContextFileSystem::webkitRequestFileSystem(WorkerContext* worker, int
|
| LocalFileSystem::localFileSystem().requestFileSystem(worker, fileSystemType, size, FileSystemCallbacks::create(successCallback, errorCallback, worker, fileSystemType), AsynchronousFileSystem);
|
| }
|
|
|
| -PassRefPtr<DOMFileSystemSync> WorkerContextFileSystem::webkitRequestFileSystemSync(WorkerContext* worker, int type, long long size, ExceptionCode& ec)
|
| +PassRefPtr<DOMFileSystemSync> WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync(WorkerGlobalScope* worker, int type, long long size, ExceptionCode& ec)
|
| {
|
| ec = 0;
|
| ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
|
| @@ -83,7 +83,7 @@ PassRefPtr<DOMFileSystemSync> WorkerContextFileSystem::webkitRequestFileSystemSy
|
| return helper.getResult(ec);
|
| }
|
|
|
| -void WorkerContextFileSystem::webkitResolveLocalFileSystemURL(WorkerContext* worker, const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
|
| +void WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL(WorkerGlobalScope* worker, const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
|
| {
|
| KURL completedURL = worker->completeURL(url);
|
| ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
|
| @@ -102,7 +102,7 @@ void WorkerContextFileSystem::webkitResolveLocalFileSystemURL(WorkerContext* wor
|
| LocalFileSystem::localFileSystem().readFileSystem(worker, type, ResolveURICallbacks::create(successCallback, errorCallback, worker, type, filePath));
|
| }
|
|
|
| -PassRefPtr<EntrySync> WorkerContextFileSystem::webkitResolveLocalFileSystemSyncURL(WorkerContext* worker, const String& url, ExceptionCode& ec)
|
| +PassRefPtr<EntrySync> WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL(WorkerGlobalScope* worker, const String& url, ExceptionCode& ec)
|
| {
|
| ec = 0;
|
| KURL completedURL = worker->completeURL(url);
|
| @@ -132,7 +132,7 @@ PassRefPtr<EntrySync> WorkerContextFileSystem::webkitResolveLocalFileSystemSyncU
|
| return entry.release();
|
| }
|
|
|
| -COMPILE_ASSERT(static_cast<int>(WorkerContextFileSystem::TEMPORARY) == static_cast<int>(FileSystemTypeTemporary), enum_mismatch);
|
| -COMPILE_ASSERT(static_cast<int>(WorkerContextFileSystem::PERSISTENT) == static_cast<int>(FileSystemTypePersistent), enum_mismatch);
|
| +COMPILE_ASSERT(static_cast<int>(WorkerGlobalScopeFileSystem::TEMPORARY) == static_cast<int>(FileSystemTypeTemporary), enum_mismatch);
|
| +COMPILE_ASSERT(static_cast<int>(WorkerGlobalScopeFileSystem::PERSISTENT) == static_cast<int>(FileSystemTypePersistent), enum_mismatch);
|
|
|
| } // namespace WebCore
|
|
|