Add Worker support for FileSystem API.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/file_system/file_system_dispatcher.h"
+#include "chrome/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/plugin_group.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
@@ skipping 357 matching lines @@
     // the languages CLD can detect. As a result, it'll return the invalid
     // language code for tradtional Chinese among others.
     // |LanguageCodeWithDialect| will go through ISO 639-1, ISO-639-2 and
     // 'other' tables to do the 'right' thing. In addition, it'll return zh-CN
     // for Simplified Chinese.
     language = LanguageCodeWithDialects(cld_language);
   }
   return language;
 }
 
-// Holds pending openFileSystem callbacks.
-struct RenderView::PendingOpenFileSystem {
-  explicit PendingOpenFileSystem(WebFileSystemCallbacks* c) : callbacks(c) {
-  }
-  ~PendingOpenFileSystem() {
-    if (callbacks)
-      callbacks->didFail(WebKit::WebFileErrorAbort);
-  }
-  WebFileSystemCallbacks* callbacks;
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 
 int32 RenderView::next_page_id_ = 1;
 
 struct RenderView::PendingFileChooser {
   PendingFileChooser(const ViewHostMsg_RunFileChooser_Params& p,
                      WebFileChooserCompletion* c)
       : params(p),
         completion(c) {
   }
@@ skipping 371 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction,
                         OnCustomContextMenuAction)
     IPC_MESSAGE_HANDLER(ViewMsg_TranslatePage, OnTranslatePage)
     IPC_MESSAGE_HANDLER(ViewMsg_RevertTranslation, OnRevertTranslation)
     IPC_MESSAGE_HANDLER(ViewMsg_GetAccessibilityTree, OnGetAccessibilityTree)
     IPC_MESSAGE_HANDLER(ViewMsg_SetAccessibilityFocus, OnSetAccessibilityFocus)
     IPC_MESSAGE_HANDLER(ViewMsg_AccessibilityDoDefaultAction,
                         OnAccessibilityDoDefaultAction)
     IPC_MESSAGE_HANDLER(ViewMsg_AccessibilityNotifications_ACK,
                         OnAccessibilityNotificationsAck)
-    IPC_MESSAGE_HANDLER(ViewMsg_OpenFileSystemRequest_Complete,
-                        OnOpenFileSystemRequestComplete)
     IPC_MESSAGE_HANDLER(ViewMsg_AsyncOpenFile_ACK, OnAsyncFileOpened)
 
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(RenderWidget::OnMessageReceived(message))
   IPC_END_MESSAGE_MAP()
 }
 
 void RenderView::OnCaptureThumbnail() {
   WebFrame* main_frame = webview()->mainFrame();
   if (!main_frame)
@@ skipping 2674 matching lines @@
                                   selection_rect,
                                   active_match_ordinal,
                                   false));
 }
 
 void RenderView::openFileSystem(
     WebFrame* frame,
     WebFileSystem::Type type,
     long long size,
     WebFileSystemCallbacks* callbacks) {
-  scoped_ptr<PendingOpenFileSystem> request(
-      new PendingOpenFileSystem(callbacks));
+  DCHECK(callbacks);
 
   WebSecurityOrigin origin = frame->securityOrigin();
-  if (origin.isEmpty())
-    return;  // Uninitialized document?
+  if (origin.isEmpty()) {
+    // Uninitialized document?
+    callbacks->didFail(WebKit::WebFileErrorAbort);
+    return;
+  }
 
-  ViewHostMsg_OpenFileSystemRequest_Params params;
-  params.routing_id = routing_id_;
-  params.request_id = pending_file_system_requests_.Add(request.release());
-  params.origin_url = GURL(origin.toString());
-  params.type = type;
-  params.requested_size = size;
-
-  Send(new ViewHostMsg_OpenFileSystemRequest(params));
+  ChildThread::current()->file_system_dispatcher()->OpenFileSystem(
+      GURL(origin.toString()), static_cast<fileapi::FileSystemType>(type),
+      size, new WebFileSystemCallbackDispatcher(callbacks));
 }
 
 // webkit_glue::WebPluginPageDelegate -----------------------------------------
 
 webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate(
     const FilePath& file_path,
     const std::string& mime_type) {
   if (!PluginChannelHost::IsListening())
     return NULL;
 
@@ skipping 2272 matching lines @@
         return true;
       }
     }
 
     if (url.GetOrigin() != GURL(opener->url()).GetOrigin())
       return true;
   }
   return false;
 }
 
-void RenderView::OnOpenFileSystemRequestComplete(
-    int request_id, bool accepted, const string16& name,
-    const string16& root_path) {
-  PendingOpenFileSystem* request = pending_file_system_requests_.Lookup(
-      request_id);
-  DCHECK(request);
-  if (accepted)
-    request->callbacks->didOpenFileSystem(name, root_path);
-  else
-    request->callbacks->didFail(WebKit::WebFileErrorSecurity);
-  request->callbacks = NULL;
-  pending_file_system_requests_.Remove(request_id);
-}
-
 void RenderView::OnAsyncFileOpened(base::PlatformFileError error_code,
                                    IPC::PlatformFileForTransit file_for_transit,
                                    int message_id) {
   pepper_delegate_.OnAsyncFileOpened(
       error_code,
       IPC::PlatformFileForTransitToPlatformFile(file_for_transit),
       message_id);
 }