Rename sync and async file system access methods in blink. [blink] (1/4)

Source/web/LocalFileSystemClient.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
     ASSERT(context);
     if (context->isDocument()) {
         Document* document = toDocument(context);
         WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame());
         return !webFrame->permissionClient() || webFrame->permissionClient()->allowFileSystem();
     }
     ASSERT(context->isWorkerGlobalScope());
     return WorkerPermissionClient::from(*toWorkerGlobalScope(context))->allowFileSystem();
 }
 
-void LocalFileSystemClient::requestFileSystemAccess(ExecutionContext* context, PassOwnPtr<WebCore::PermissionCallbacks> callbacks)
+bool LocalFileSystemClient::requestFileSystemAccessSync(ExecutionContext* context)
 {
     ASSERT(context);
     if (context->isDocument()) {
+        Document* document = toDocument(context);

[jochen (gone - plz use gerrit), 2014/05/15 14:35:20]

this should not be reachable, no?

[Xi Han, 2014/05/15 15:33:25]

Good catch, thanks.

On 2014/05/15 14:35:20, jochen wrote:

+        WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame());
+        return !webFrame->permissionClient() || webFrame->permissionClient()->requestFileSystemAccessSync();
+    }
+    ASSERT(context->isWorkerGlobalScope());
+    return WorkerPermissionClient::from(*toWorkerGlobalScope(context))->requestFileSystemAccessSync();
+}
+
+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);
+        webFrame->permissionClient()->requestFileSystemAccessAsync(callbacks);
         return;
     }
     ASSERT(context->isWorkerGlobalScope());
-    WorkerPermissionClient::from(*toWorkerGlobalScope(context))->requestFileSystemAccess(callbacks);
+    WorkerPermissionClient::from(*toWorkerGlobalScope(context))->requestFileSystemAccessAsync(callbacks);
 }
 
 LocalFileSystemClient::LocalFileSystemClient()
 {
 }
 
 } // namespace blink