Revert 138554 - Prevent zero-length items from being appended to a blob.

webkit/blob/blob_data.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef WEBKIT_BLOB_BLOB_DATA_H_
 #define WEBKIT_BLOB_BLOB_DATA_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 66 matching lines @@
     uint64 length;
   };
 
   BlobData();
   explicit BlobData(const WebKit::WebBlobData& data);
 
   void AppendData(const std::string& data) {
     AppendData(data.c_str(), data.size());
   }
 
-  void AppendData(const char* data, size_t length);
+  void AppendData(const char* data, size_t length) {
+    if (length > 0) {
+      items_.push_back(Item());
+      items_.back().SetToData(data, length);
+    }
+  }
 
   void AppendFile(const FilePath& file_path, uint64 offset, uint64 length,
-                  const base::Time& expected_modification_time);
+                  const base::Time& expected_modification_time) {
+    items_.push_back(Item());
+    items_.back().SetToFile(file_path, offset, length,
+                            expected_modification_time);
+  }
 
-  void AppendBlob(const GURL& blob_url, uint64 offset, uint64 length);
+  void AppendBlob(const GURL& blob_url, uint64 offset, uint64 length) {
+    items_.push_back(Item());
+    items_.back().SetToBlob(blob_url, offset, length);
+  }
 
   void AttachShareableFileReference(ShareableFileReference* reference) {
     shareable_files_.push_back(reference);
   }
 
   const std::vector<Item>& items() const { return items_; }
 
   const std::string& content_type() const { return content_type_; }
   void set_content_type(const std::string& content_type) {
     content_type_ = content_type;
   }
 
   const std::string& content_disposition() const {
     return content_disposition_;
   }
   void set_content_disposition(const std::string& content_disposition) {
     content_disposition_ = content_disposition;
   }
 
-  int64 GetMemoryUsage() const;
+  int64 GetMemoryUsage() const {
+    int64 memory = 0;
+    for (std::vector<Item>::const_iterator iter = items_.begin();
+         iter != items_.end(); ++iter) {
+      if (iter->type == TYPE_DATA)
+        memory += iter->data.size();
+    }
+    return memory;
+  }
 
  private:
   friend class base::RefCounted<BlobData>;
 
   virtual ~BlobData();
 
   std::string content_type_;
   std::string content_disposition_;
   std::vector<Item> items_;
   std::vector<scoped_refptr<ShareableFileReference> > shareable_files_;
@@ skipping 43 matching lines @@
 }
 
 inline bool operator!=(const BlobData& a, const BlobData& b) {
   return !(a == b);
 }
 #endif  // defined(UNIT_TEST)
 
 }  // namespace webkit_blob
 
 #endif  // WEBKIT_BLOB_BLOB_DATA_H_