Add Chromium side implementation for WebFileSystem interface in WebKit.

BUG=none
TEST=non

Review URL: http://codereview.chromium.org/1748015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46625 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 68 insertions, 27 deletions

diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index e8f4214..b9c1dd6 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -25,6 +25,7 @@
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
 #include "googleurl/src/gurl.h"
+#include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
@@ -60,6 +61,10 @@ WebKit::WebMimeRegistry* RendererWebKitClientImpl::mimeRegistry() {
   return &mime_registry_;
 }
 
+WebKit::WebFileSystem* RendererWebKitClientImpl::fileSystem() {
+  return &file_system_;
+}
+
 WebKit::WebSandboxSupport* RendererWebKitClientImpl::sandboxSupport() {
 #if defined(OS_WIN) || defined(OS_LINUX)
   return &sandbox_support_;
@@ -84,31 +89,15 @@ bool RendererWebKitClientImpl::sandboxEnabled() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 }
 
-bool RendererWebKitClientImpl::getFileSize(const WebString& path,
-                                           long long& result) {
-  if (RenderThread::current()->Send(
-          new ViewHostMsg_GetFileSize(webkit_glue::WebStringToFilePath(path),
-                                      reinterpret_cast<int64*>(&result)))) {
-    return result >= 0;
-  }
-
-  result = -1;
-  return false;
-}
-
-bool RendererWebKitClientImpl::getFileModificationTime(
-    const WebKit::WebString& path,
-    double& result) {
-  base::Time time;
-  if (RenderThread::current()->Send(
-          new ViewHostMsg_GetFileModificationTime(
-              webkit_glue::WebStringToFilePath(path), &time))) {
-    result = time.ToDoubleT();
-    return true;
-  }
+bool RendererWebKitClientImpl::SendSyncMessageFromAnyThread(
+    IPC::SyncMessage* msg) {
+  RenderThread* render_thread = RenderThread::current();
+  if (render_thread)
+    return render_thread->Send(msg);
 
-  result = 0;
-  return false;
+  scoped_refptr<IPC::SyncMessageFilter> sync_msg_filter =
+      ChildThread::current()->sync_message_filter();
+  return sync_msg_filter->Send(msg);
 }
 
 unsigned long long RendererWebKitClientImpl::visitedLinkHash(
@@ -225,6 +214,45 @@ WebString RendererWebKitClientImpl::MimeRegistry::preferredExtensionForMIMEType(
 
 //------------------------------------------------------------------------------
 
+bool RendererWebKitClientImpl::FileSystem::getFileSize(const WebString& path,
+                                                       long long& result) {
+  if (SendSyncMessageFromAnyThread(new ViewHostMsg_GetFileSize(
+          webkit_glue::WebStringToFilePath(path),
+          reinterpret_cast<int64*>(&result)))) {
+    return result >= 0;
+  }
+
+  result = -1;
+  return false;
+}
+
+bool RendererWebKitClientImpl::FileSystem::getFileModificationTime(
+    const WebString& path,
+    double& result) {
+  base::Time time;
+  if (SendSyncMessageFromAnyThread(new ViewHostMsg_GetFileModificationTime(
+          webkit_glue::WebStringToFilePath(path), &time))) {
+    result = time.ToDoubleT();
+    return !time.is_null();
+  }
+
+  result = 0;
+  return false;
+}
+
+base::PlatformFile RendererWebKitClientImpl::FileSystem::openFile(
+    const WebString& path,
+    int mode) {
+  base::PlatformFile handle;
+  if (!SendSyncMessageFromAnyThread(new ViewHostMsg_OpenFile(
+          webkit_glue::WebStringToFilePath(path), mode, &handle))) {
+    handle = base::kInvalidPlatformFileValue;
+  }
+  return handle;
+}
+
+//------------------------------------------------------------------------------
+
 #if defined(OS_WIN)
 
 bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) {
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 3606eaa..7d90520 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -9,6 +9,7 @@
 #include "chrome/renderer/websharedworkerrepository_impl.h"
 #include "webkit/glue/simple_webmimeregistry_impl.h"
 #include "webkit/glue/webclipboard_impl.h"
+#include "webkit/glue/webfilesystem_impl.h"
 #include "webkit/glue/webkitclient_impl.h"
 
 #if defined(OS_WIN)
@@ -31,12 +32,10 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   // WebKitClient methods:
   virtual WebKit::WebClipboard* clipboard();
   virtual WebKit::WebMimeRegistry* mimeRegistry();
+  virtual WebKit::WebFileSystem* fileSystem();
   virtual WebKit::WebSandboxSupport* sandboxSupport();
   virtual WebKit::WebCookieJar* cookieJar();
   virtual bool sandboxEnabled();
-  virtual bool getFileSize(const WebKit::WebString& path, long long& result);
-  virtual bool getFileModificationTime(const WebKit::WebString& path,
-                                       double& result);
   virtual unsigned long long visitedLinkHash(
       const char* canonicalURL, size_t length);
   virtual bool isLinkVisited(unsigned long long linkHash);
@@ -76,6 +75,15 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
         const WebKit::WebString&);
   };
 
+  class FileSystem : public webkit_glue::WebFileSystemImpl {
+   public:
+    virtual bool getFileSize(const WebKit::WebString& path, long long& result);
+    virtual bool getFileModificationTime(const WebKit::WebString& path,
+                                         double& result);
+    virtual base::PlatformFile openFile(const WebKit::WebString& path,
+                                        int mode);
+  };
+
 #if defined(OS_WIN)
   class SandboxSupport : public WebKit::WebSandboxSupport {
    public:
@@ -99,8 +107,13 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   };
 #endif
 
+  // Helper function to send synchronous message from any thread.
+  static bool SendSyncMessageFromAnyThread(IPC::SyncMessage* msg);
+
   webkit_glue::WebClipboardImpl clipboard_;
 
+  FileSystem file_system_;
+
   MimeRegistry mime_registry_;
 #if defined(OS_WIN) || defined(OS_LINUX)
   SandboxSupport sandbox_support_;