| Index: Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| diff --git a/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp b/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| index 6e04dd6ab2edf7b1871ddd945156ac89b1f9a974..3784e3330859a8e682a0d8a93f1b18f288e94f1d 100644
|
| --- a/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| +++ b/Source/modules/filesystem/WorkerGlobalScopeFileSystem.cpp
|
| @@ -63,17 +63,17 @@ void WorkerGlobalScopeFileSystem::webkitRequestFileSystem(WorkerGlobalScope* wor
|
| LocalFileSystem::from(worker)->requestFileSystem(worker, fileSystemType, size, FileSystemCallbacks::create(successCallback, errorCallback, worker, fileSystemType));
|
| }
|
|
|
| -PassRefPtr<DOMFileSystemSync> WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync(WorkerGlobalScope* worker, int type, long long size, ExceptionState& es)
|
| +PassRefPtr<DOMFileSystemSync> WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync(WorkerGlobalScope* worker, int type, long long size, ExceptionState& exceptionState)
|
| {
|
| ExecutionContext* secureContext = worker->executionContext();
|
| if (!secureContext->securityOrigin()->canAccessFileSystem()) {
|
| - es.throwSecurityError(ExceptionMessages::failedToExecute("webkitRequestFileSystemSync", "WorkerGlobalScopeFileSystem", FileError::securityErrorMessage));
|
| + exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("webkitRequestFileSystemSync", "WorkerGlobalScopeFileSystem", FileError::securityErrorMessage));
|
| return 0;
|
| }
|
|
|
| FileSystemType fileSystemType = static_cast<FileSystemType>(type);
|
| if (!DOMFileSystemBase::isValidType(fileSystemType)) {
|
| - es.throwDOMException(InvalidModificationError, ExceptionMessages::failedToExecute("webkitRequestFileSystemSync", "WorkerGlobalScopeFileSystem", "the type must be TEMPORARY or PERSISTENT."));
|
| + exceptionState.throwDOMException(InvalidModificationError, ExceptionMessages::failedToExecute("webkitRequestFileSystemSync", "WorkerGlobalScopeFileSystem", "the type must be TEMPORARY or PERSISTENT."));
|
| return 0;
|
| }
|
|
|
| @@ -82,7 +82,7 @@ PassRefPtr<DOMFileSystemSync> WorkerGlobalScopeFileSystem::webkitRequestFileSyst
|
| callbacks->setShouldBlockUntilCompletion(true);
|
|
|
| LocalFileSystem::from(worker)->requestFileSystem(worker, fileSystemType, size, callbacks.release());
|
| - return helper.getResult(es);
|
| + return helper.getResult(exceptionState);
|
| }
|
|
|
| void WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL(WorkerGlobalScope* worker, const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
|
| @@ -102,17 +102,17 @@ void WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL(WorkerGlobalSc
|
| LocalFileSystem::from(worker)->resolveURL(worker, completedURL, ResolveURICallbacks::create(successCallback, errorCallback, worker));
|
| }
|
|
|
| -PassRefPtr<EntrySync> WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL(WorkerGlobalScope* worker, const String& url, ExceptionState& es)
|
| +PassRefPtr<EntrySync> WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL(WorkerGlobalScope* worker, const String& url, ExceptionState& exceptionState)
|
| {
|
| KURL completedURL = worker->completeURL(url);
|
| ExecutionContext* secureContext = worker->executionContext();
|
| if (!secureContext->securityOrigin()->canAccessFileSystem() || !secureContext->securityOrigin()->canRequest(completedURL)) {
|
| - es.throwSecurityError(ExceptionMessages::failedToExecute("webkitResolveLocalFileSystemSyncURL", "WorkerGlobalScopeFileSystem", FileError::securityErrorMessage));
|
| + exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("webkitResolveLocalFileSystemSyncURL", "WorkerGlobalScopeFileSystem", FileError::securityErrorMessage));
|
| return 0;
|
| }
|
|
|
| if (!completedURL.isValid()) {
|
| - es.throwDOMException(EncodingError, ExceptionMessages::failedToExecute("webkitResolveLocalFileSystemSyncURL", "WorkerGlobalScopeFileSystem", "the URL '" + url + "' is invalid."));
|
| + exceptionState.throwDOMException(EncodingError, ExceptionMessages::failedToExecute("webkitResolveLocalFileSystemSyncURL", "WorkerGlobalScopeFileSystem", "the URL '" + url + "' is invalid."));
|
| return 0;
|
| }
|
|
|
| @@ -122,7 +122,7 @@ PassRefPtr<EntrySync> WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemS
|
|
|
| LocalFileSystem::from(worker)->resolveURL(worker, completedURL, callbacks.release());
|
|
|
| - RefPtr<EntrySync> entry = resolveURLHelper.getResult(es);
|
| + RefPtr<EntrySync> entry = resolveURLHelper.getResult(exceptionState);
|
| if (!entry)
|
| return 0;
|
| return entry.release();
|
|
|