Avoid sync IPCs for FileSystem API [chromium] (2/4)

chrome/browser/renderer_host/chrome_render_message_filter.cc

Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index bb0ed1be0bba69c4ff16d024515d4d3445bc0300..233ef33e258bbd8b8d592c93ff33f1af526810bf 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -124,7 +124,10 @@ bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message,
                         OnAddEventToExtensionActivityLog);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDatabase, OnAllowDatabase)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDOMStorage, OnAllowDOMStorage)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowFileSystem, OnAllowFileSystem)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RequestFileSystemAccessSync,
+                        OnRequestFileSystemAccessSync)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RequestFileSystemAccessAsync,
+                        OnRequestFileSystemAccessAsync)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowIndexedDB, OnAllowIndexedDB)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CanTriggerClipboardRead,
                         OnCanTriggerClipboardRead)
@@ -433,10 +436,11 @@ void ChromeRenderMessageFilter::OnAllowDOMStorage(int render_frame_id,
                  !*allowed));
 }
 
-void ChromeRenderMessageFilter::OnAllowFileSystem(int render_frame_id,
-                                                  const GURL& origin_url,
-                                                  const GURL& top_origin_url,
-                                                  bool* allowed) {
+void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync(
+    int render_frame_id,
+    const GURL& origin_url,
+    const GURL& top_origin_url,
+    bool* allowed) {
   *allowed =
       cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url);
   // Record access to file system for potential display in UI.
@@ -446,6 +450,41 @@ void ChromeRenderMessageFilter::OnAllowFileSystem(int render_frame_id,
                  render_process_id_, render_frame_id, origin_url, !*allowed));
 }
 
+void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync(
+    int render_frame_id,
+    int request_id,
+    const GURL& origin_url,
+    const GURL& top_origin_url) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  bool allowed =
+      cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url);
+  // Record access to file system for potential display in UI.
+  BrowserThread::PostTaskAndReply(

[dcheng, 2014/05/21 22:20:35]

Why use PostTaskAndReply here? You can queue the IPC immediately.

[Xi Han, 2014/05/22 17:24:49]

Good catch, I shouldn't use PostTaskAndReply() here, since the result won't be
updated when the callback is called. I move the sending message part to
TabSpecificContentSettings::FileSystemAccessedAsync, and rename
TabSpecificContentSettings::FileSystemAccessed as
TabSpecificContentSettings::FileSystemAccessedSync.

+      BrowserThread::UI, FROM_HERE,
+      base::Bind(
+          &TabSpecificContentSettings::FileSystemAccessed,
+          render_process_id_,
+          render_frame_id,
+          origin_url,
+          !allowed),
+      base::Bind(
+          &ChromeRenderMessageFilter::OnRequestFileSystemAccessAsyncCallbacks,
+          base::Unretained(this),
+          render_frame_id,
+          request_id,
+          allowed));
+}
+
+void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsyncCallbacks(
+    int render_frame_id, int request_id, bool allowed) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  Send(new ChromeViewMsg_RequestFileSystemAccessAsyncResponse(
+      render_frame_id,
+      request_id,
+      allowed));
+}
+
 void ChromeRenderMessageFilter::OnAllowIndexedDB(int render_frame_id,
                                                  const GURL& origin_url,
                                                  const GURL& top_origin_url,