New blobstoragecontext for use in the main browser process, not plugged in yet.

webkit/base/data_element.h

 // 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.
 
 #ifndef WEBKIT_BASE_DATA_ELEMENT_H_
 #define WEBKIT_BASE_DATA_ELEMENT_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 16 matching lines @@
     TYPE_BLOB,
     TYPE_FILE_FILESYSTEM,
   };
 
   DataElement();
   ~DataElement();
 
   Type type() const { return type_; }
   const char* bytes() const { return bytes_ ? bytes_ : &buf_[0]; }
   const base::FilePath& path() const { return path_; }
-  const GURL& url() const { return url_; }
+  const GURL& filesystem_url() const { return filesystem_url_; }
+
+  // TODO(michaeln): fully switch to using string uuids for blob identifiers.
+  // Note: Identifying blobs by url is being deprecated, but while transitioning
+  // there's a little of both going on in the project.
+  const std::string& blob_uuid() const { return blob_uuid_; }
+  const GURL& blob_url() const { return blob_url_; }
   uint64 offset() const { return offset_; }
   uint64 length() const { return length_; }
   const base::Time& expected_modification_time() const {
     return expected_modification_time_;
   }
 
+  // TODO(michaeln): fixup callers to use filesytem_url() and blob_uuid().
+  const GURL& url() const {
+    if (type_ == TYPE_FILE_FILESYSTEM)
+      return filesystem_url_;
+    return blob_url_;
+  }
+
   // Sets TYPE_BYTES data. This copies the given data into the element.
   void SetToBytes(const char* bytes, int bytes_len) {
     type_ = TYPE_BYTES;
     buf_.assign(bytes, bytes + bytes_len);
     length_ = buf_.size();
   }
 
   // Sets TYPE_BYTES data. This does NOT copy the given data and the caller
   // should make sure the data is alive when this element is accessed.
   void SetToSharedBytes(const char* bytes, int bytes_len) {
     type_ = TYPE_BYTES;
     bytes_ = bytes;
     length_ = bytes_len;
   }
 
   // Sets TYPE_FILE data.
   void SetToFilePath(const base::FilePath& path) {
     SetToFilePathRange(path, 0, kuint64max, base::Time());
   }
 
   // Sets TYPE_BLOB data.
   void SetToBlobUrl(const GURL& blob_url) {
     SetToBlobUrlRange(blob_url, 0, kuint64max);
   }
+  void SetToBlob(const std::string& uuid) {
+    SetToBlobRange(uuid, 0, kuint64max);
+  }
 
   // Sets TYPE_FILE data with range.
   void SetToFilePathRange(const base::FilePath& path,
                           uint64 offset, uint64 length,
                           const base::Time& expected_modification_time);
 
   // Sets TYPE_BLOB data with range.
   void SetToBlobUrlRange(const GURL& blob_url,
                          uint64 offset, uint64 length);
+  void SetToBlobRange(const std::string& blob_uuid,
+                      uint64 offset, uint64 length);
 
   // Sets TYPE_FILE_FILESYSTEM with range.
   void SetToFileSystemUrlRange(const GURL& filesystem_url,
                                uint64 offset, uint64 length,
                                const base::Time& expected_modification_time);
 
  private:
   Type type_;
   std::vector<char> buf_;  // For TYPE_BYTES.
   const char* bytes_;  // For TYPE_BYTES.
   base::FilePath path_;  // For TYPE_FILE.
-  GURL url_;  // For TYPE_BLOB or TYPE_FILE_FILESYSTEM.
+  GURL filesystem_url_;  // For TYPE_FILE_FILESYSTEM.
+  GURL blob_url_;

[ericu, 2013/04/18 02:01:58]

I don't see any reason that you need 2 GURL members; they can still share space
until you stop using url_ for blobs.

[michaeln, 2013/04/23 21:11:10]

true, not strictly needed, but i think makes removing the dead code easier later
and lends greater clarity now... at least that's the idea... i don't feel
strongly but i think the extra storage for the empty GURL is worth it for those
benefits mentioned

+  std::string blob_uuid_;
   uint64 offset_;
   uint64 length_;
   base::Time expected_modification_time_;
 };
 
 #if defined(UNIT_TEST)
 inline bool operator==(const DataElement& a, const DataElement& b) {
   if (a.type() != b.type() ||
       a.offset() != b.offset() ||
       a.length() != b.length())
     return false;
   switch (a.type()) {
     case DataElement::TYPE_BYTES:
       return memcmp(a.bytes(), b.bytes(), b.length()) == 0;
     case DataElement::TYPE_FILE:
       return a.path() == b.path() &&
              a.expected_modification_time() == b.expected_modification_time();
     case DataElement::TYPE_BLOB:
+      return a.blob_uuid().empty() ? (a.blob_url() == b.blob_url())
+                                   : (a.blob_uuid() == b.blob_uuid());
     case DataElement::TYPE_FILE_FILESYSTEM:
-      return a.url() == b.url();
+      return a.filesystem_url() == b.filesystem_url();
     case DataElement::TYPE_UNKNOWN:
       NOTREACHED();
       return false;
   }
   return false;
 }
 
 inline bool operator!=(const DataElement& a, const DataElement& b) {
   return !(a == b);
 }
 #endif  // defined(UNIT_TEST)
 
 }  // namespace webkit_base
 
 #endif  // WEBKIT_BASE_DATA_ELEMENT_H_