Index: Source/web/LocalFileSystemClient.cpp |
diff --git a/Source/web/LocalFileSystemClient.cpp b/Source/web/LocalFileSystemClient.cpp |
index 9f933a9369fe80015f6fd48a70265bef894dfdff..92519c1520bdb18943bd733007c24d61b9a4065c 100644 |
--- a/Source/web/LocalFileSystemClient.cpp |
+++ b/Source/web/LocalFileSystemClient.cpp |
@@ -54,33 +54,33 @@ LocalFileSystemClient::~LocalFileSystemClient() |
{ |
} |
-bool LocalFileSystemClient::allowFileSystem(ExecutionContext* context) |
+bool LocalFileSystemClient::requestFileSystemAccessSync(ExecutionContext* context) |
{ |
ASSERT(context); |
if (context->isDocument()) { |
- Document* document = toDocument(context); |
- WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame()); |
- return !webFrame->permissionClient() || webFrame->permissionClient()->allowFileSystem(); |
+ ASSERT_NOT_REACHED(); |
+ return false; |
} |
+ |
ASSERT(context->isWorkerGlobalScope()); |
- return WorkerPermissionClient::from(*toWorkerGlobalScope(context))->allowFileSystem(); |
+ return WorkerPermissionClient::from(*toWorkerGlobalScope(context))->requestFileSystemAccessSync(); |
} |
-void LocalFileSystemClient::requestFileSystemAccess(ExecutionContext* context, PassOwnPtr<WebCore::PermissionCallbacks> callbacks) |
+void LocalFileSystemClient::requestFileSystemAccessAsync(ExecutionContext* context, PassOwnPtr<WebCore::PermissionCallbacks> callbacks) |
{ |
ASSERT(context); |
- if (context->isDocument()) { |
- Document* document = toDocument(context); |
- WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame()); |
- if (!webFrame->permissionClient()) { |
- callbacks->onAllowed(); |
- return; |
- } |
- webFrame->permissionClient()->requestFileSystemAccess(callbacks); |
+ if (!context->isDocument()) { |
+ ASSERT_NOT_REACHED(); |
return; |
} |
- ASSERT(context->isWorkerGlobalScope()); |
- WorkerPermissionClient::from(*toWorkerGlobalScope(context))->requestFileSystemAccess(callbacks); |
+ |
+ Document* document = toDocument(context); |
+ WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame()); |
+ if (!webFrame->permissionClient()) { |
+ callbacks->onAllowed(); |
+ return; |
+ } |
+ webFrame->permissionClient()->requestFileSystemAccessAsync(callbacks); |
} |
LocalFileSystemClient::LocalFileSystemClient() |