Merge: Allow offsets in blobs larger than 2GB on 32 bit Chromium builds.

storage/browser/blob/blob_storage_context.cc

 // Copyright (c) 2013 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 "storage/browser/blob/blob_storage_context.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 357 matching lines @@
   }
   UMA_HISTOGRAM_COUNTS("Storage.Blob.StorageSizeAfterAppend",
                        memory_usage_ / 1024);
 
   return !exceeded_memory;
 }
 
 bool BlobStorageContext::AppendBlob(
     const std::string& target_blob_uuid,
     const InternalBlobData& blob,
-    size_t offset,
-    size_t length,
+    uint64_t offset,
+    uint64_t length,
     InternalBlobData::Builder* target_blob_builder) {
   DCHECK(length > 0);
 
   const std::vector<scoped_refptr<ShareableBlobDataItem>>& items = blob.items();
   auto iter = items.begin();
   if (offset) {
     for (; iter != items.end(); ++iter) {
       const BlobDataItem& item = *(iter->get()->item());
       if (offset >= item.length())
         offset -= item.length();
       else
         break;
     }
   }
 
   for (; iter != items.end() && length > 0; ++iter) {
     scoped_refptr<ShareableBlobDataItem> shareable_item = iter->get();
     const BlobDataItem& item = *(shareable_item->item());
-    size_t item_length = item.length();
+    uint64_t item_length = item.length();
     DCHECK_GT(item_length, offset);
-    size_t current_length = item_length - offset;
-    size_t new_length = current_length > length ? length : current_length;
+    uint64_t current_length = item_length - offset;
+    uint64_t new_length = current_length > length ? length : current_length;
 
     bool reusing_blob_item = offset == 0 && new_length == item.length();
     UMA_HISTOGRAM_BOOLEAN("Storage.Blob.ReusedItem", reusing_blob_item);
     if (reusing_blob_item) {
       shareable_item->referencing_blobs().insert(target_blob_uuid);
       target_blob_builder->AppendSharedBlobItem(shareable_item);
       length -= new_length;
       continue;
     }
 
@@ skipping 55 matching lines @@
   if (found == blob_map_.end())
     return false;
   return found->second->IsBeingBuilt();
 }
 
 bool BlobStorageContext::IsUrlRegistered(const GURL& blob_url) {
   return public_blob_urls_.find(blob_url) != public_blob_urls_.end();
 }
 
 }  // namespace storage