PPB_URLRequestInfo::AppendFileToBody using sync ipc

webkit/plugins/ppapi/ppb_url_request_info_impl.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "net/http/http_util.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_ref_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHTTPBody.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
+#include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
+#include "webkit/plugins/ppapi/ppb_file_system_impl.h"
 #include "webkit/plugins/ppapi/string.h"
-#include "webkit/glue/webkit_glue.h"
 
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_FileRef_API;
 using ppapi::thunk::PPB_URLRequestInfo_API;
 using WebKit::WebData;
 using WebKit::WebHTTPBody;
 using WebKit::WebString;
 using WebKit::WebFrame;
 using WebKit::WebURL;
@@ skipping 50 matching lines @@
   while (it.GetNext()) {
     if (!IsValidHeaderField(it.name()))
       return false;
   }
   return true;
 }
 
 }  // namespace
 
 struct PPB_URLRequestInfo_Impl::BodyItem {
-  BodyItem(const std::string& data)
+  explicit BodyItem(const std::string& data)
       : data(data),
         start_offset(0),
         number_of_bytes(-1),
         expected_last_modified_time(0.0) {
   }
 
   BodyItem(PPB_FileRef_Impl* file_ref,
            int64_t start_offset,
            int64_t number_of_bytes,
            PP_Time expected_last_modified_time)
@@ skipping 109 matching lines @@
           WebString::fromUTF8(it.name()),
           WebString::fromUTF8(it.values()));
     }
   }
 
   if (!body_.empty()) {
     WebHTTPBody http_body;
     http_body.initialize();
     for (size_t i = 0; i < body_.size(); ++i) {
       if (body_[i].file_ref) {
+        FilePath platform_path;
+        switch (body_[i].file_ref->file_system()->type()) {
+          case PP_FILESYSTEMTYPE_LOCALTEMPORARY:
+          case PP_FILESYSTEMTYPE_LOCALPERSISTENT:
+            instance()->delegate()->SyncGetFileSystemPlatformPath(

[darin (slow to review), 2011/08/16 17:28:36]

can you insert a TODO(kinuko) here about switching to the better solution to
avoid this IPC in the future?

[kinuko, 2011/08/17 07:55:28]

Done.

+                body_[i].file_ref->GetFileSystemURL(),
+                &platform_path);
+            break;
+          case PP_FILESYSTEMTYPE_EXTERNAL:
+            platform_path = body_[i].file_ref->GetSystemPath();
+            break;
+          default:
+            NOTREACHED();
+        }
         http_body.appendFileRange(
-            webkit_glue::FilePathToWebString(
-                body_[i].file_ref->GetSystemPath()),
+            webkit_glue::FilePathToWebString(platform_path),
             body_[i].start_offset,
             body_[i].number_of_bytes,
             body_[i].expected_last_modified_time);
       } else {
         DCHECK(!body_[i].data.empty());
         http_body.appendData(WebData(body_[i].data));
       }
     }
     web_request.setHTTPBody(http_body);
   }
@@ skipping 104 matching lines @@
       has_custom_content_transfer_encoding_ = true;
       custom_content_transfer_encoding_ = value;
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit