Ensure blobs and associated temp/shareable files survive URLRequest uploads.

webkit/blob/blob_storage_controller.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/blob/blob_storage_controller.h"
 
 #include "base/logging.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/upload_data.h"
 #include "webkit/blob/blob_data.h"
@@ skipping 180 matching lines @@
 
     // Remove this element.
     iter = uploads->erase(iter);
 
     // If there is no element in the referred blob data, continue the loop.
     // Note that we should not increase iter since it already points to the one
     // after the removed element.
     if (blob_data->items().empty())
       continue;
 
+    // Ensure the blob and any attached shareable files survive until
+    // upload completion.
+    upload_data->SetUserData(blob_data,
+                             new base::UserDataAdapter<BlobData>(blob_data));
+
     // Insert the elements in the referred blob data.
     // Note that we traverse from the bottom so that the elements can be
     // inserted in the original order.
     for (size_t i = blob_data->items().size(); i > 0; --i) {
       iter = uploads->insert(iter, net::UploadData::Element());
 
       const BlobData::Item& item = blob_data->items().at(i - 1);
       switch (item.type) {
         case BlobData::TYPE_DATA:
           // TODO(jianli): Figure out how to avoid copying the data.
+          // TODO(michaeln): Now that blob_data surives for the duration,
+          // maybe UploadData could take a raw ptr without having to copy.
           iter->SetToBytes(
               &item.data.at(0) + static_cast<int>(item.offset),
               static_cast<int>(item.length));
           break;
         case BlobData::TYPE_FILE:
-          // TODO(michaeln): Ensure that any temp files survive till the
-          // net::URLRequest is done with the upload.
           iter->SetToFilePathRange(
               item.file_path,
               item.offset,
               item.length,
               item.expected_modification_time);
           break;
         default:
           NOTREACHED();
           break;
       }
@@ skipping 59 matching lines @@
 bool BlobStorageController::DecrementBlobDataUsage(BlobData* blob_data) {
   BlobDataUsageMap::iterator found = blob_data_usage_count_.find(blob_data);
   DCHECK(found != blob_data_usage_count_.end());
   if (--(found->second))
     return false;  // Still in use
   blob_data_usage_count_.erase(found);
   return true;
 }
 
 }  // namespace webkit_blob