Split net::UploadData into two: for IPC and for upload handling

webkit/glue/weburlloader_impl.cc

 // Copyright (c) 2012 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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 14 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoadTiming.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "webkit/glue/ftp_directory_listing_response_delegate.h"
 #include "webkit/glue/multipart_response_delegate.h"
 #include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/glue/resource_request_body.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/glue/weburlrequest_extradata_impl.h"
 #include "webkit/glue/weburlresponse_extradata_impl.h"
 
 using base::Time;
 using base::TimeTicks;
 using WebKit::WebData;
 using WebKit::WebHTTPBody;
 using WebKit::WebHTTPHeaderVisitor;
@@ skipping 392 matching lines @@
     request_info.referrer_policy = referrer_policy_;
   }
   bridge_.reset(platform->CreateResourceLoader(request_info));
 
   if (!request.httpBody().isNull()) {
     // GET and HEAD requests shouldn't have http bodies.
     DCHECK(method != "GET" && method != "HEAD");
     const WebHTTPBody& httpBody = request.httpBody();
     size_t i = 0;
     WebHTTPBody::Element element;
+    scoped_refptr<ResourceRequestBody> request_body = new ResourceRequestBody;
     while (httpBody.elementAt(i++, element)) {
       switch (element.type) {
         case WebHTTPBody::Element::TypeData:
           if (!element.data.isEmpty()) {
             // WebKit sometimes gives up empty data to append. These aren't
             // necessary so we just optimize those out here.
-            bridge_->AppendDataToUpload(
+            request_body->AppendBytes(
                 element.data.data(), static_cast<int>(element.data.size()));
           }
           break;
         case WebHTTPBody::Element::TypeFile:
           if (element.fileLength == -1) {
-            bridge_->AppendFileToUpload(
-                WebStringToFilePath(element.filePath));
+            request_body->AppendFileRange(
+                WebStringToFilePath(element.filePath),
+                0, kuint64max, base::Time());
           } else {
-            bridge_->AppendFileRangeToUpload(
+            request_body->AppendFileRange(
                 WebStringToFilePath(element.filePath),
                 static_cast<uint64>(element.fileStart),
                 static_cast<uint64>(element.fileLength),
                 base::Time::FromDoubleT(element.modificationTime));
           }
           break;
         case WebHTTPBody::Element::TypeBlob:
-          bridge_->AppendBlobToUpload(GURL(element.blobURL));
+          request_body->AppendBlob(GURL(element.blobURL));
           break;
         default:
           NOTREACHED();
       }
     }
-    bridge_->SetUploadIdentifier(request.httpBody().identifier());
+    request_body->set_identifier(request.httpBody().identifier());
+    bridge_->SetRequestBody(request_body);
   }
 
   if (sync_load_response) {
     bridge_->SyncLoad(sync_load_response);
     return;
   }
 
   if (bridge_->Start(this)) {
     AddRef();  // Balanced in OnCompletedRequest
   } else {
@@ skipping 278 matching lines @@
 
 void WebURLLoaderImpl::cancel() {
   context_->Cancel();
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 }  // namespace webkit_glue