Blob Consolidation & Registry Hookup

content/child/webblobregistry_impl.h

Index: content/child/webblobregistry_impl.h
diff --git a/content/child/webblobregistry_impl.h b/content/child/webblobregistry_impl.h
index c9d7989e2c4f47c133a01a113e1a53218503ba2a..3b72143c10c1851ef48bb979eb3a2fb3fd4515a0 100644
--- a/content/child/webblobregistry_impl.h
+++ b/content/child/webblobregistry_impl.h
@@ -9,6 +9,8 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
+#include "content/child/blob_storage/blob_consolidation.h"
+#include "storage/common/data_element.h"
 #include "third_party/WebKit/public/platform/WebBlobRegistry.h"
 
 namespace blink {
@@ -27,8 +29,13 @@ class WebBlobRegistryImpl : public blink::WebBlobRegistry {
   explicit WebBlobRegistryImpl(ThreadSafeSender* sender);
   virtual ~WebBlobRegistryImpl();
 
+  // TODO(dmurph): remove this after moving to createBuilder

[kinuko, 2015/06/23 14:11:30]

nit: end comments with period

[dmurph, 2015/06/24 00:36:17]

Done.

   virtual void registerBlobData(const blink::WebString& uuid,
                                 const blink::WebBlobData& data);
+
+  virtual blink::WebBlobRegistry::Builder* createBuilder(
+      const blink::WebString& uuid, const blink::WebString& contentType);
+
   virtual void addBlobDataRef(const blink::WebString& uuid);
   virtual void removeBlobDataRef(const blink::WebString& uuid);
   virtual void registerPublicBlobURL(const blink::WebURL&,
@@ -48,19 +55,34 @@ class WebBlobRegistryImpl : public blink::WebBlobRegistry {
   virtual void unregisterStreamURL(const blink::WebURL& url);
 
  private:
-  // Sends the data in the buffer as a blob item, then resets the buffer size.
-  void FlushBlobItemBuffer(const std::string& uuid_str,
-                           storage::DataElement* data_buffer) const;
-
-  // Adds the item to the consolidating buffer, flushing the buffer if needed.
-  // If the item is too big for the buffer, it is sent as Sync messages in
-  // shared memory instead.
-  void BufferBlobData(const std::string& uuid_str,
-                      const blink::WebThreadSafeData& data,
-                      storage::DataElement* data_buffer);
-  // Sends data that is larger than the threshold.
-  void SendOversizedDataForBlob(const std::string& uuid_str,
-                                const blink::WebThreadSafeData& data);
+  // Handles all of the IPCs sent for building a blob.
+  class BuilderImpl : public blink::WebBlobRegistry::Builder {
+   public:
+    BuilderImpl(const blink::WebString& uuid,
+                const blink::WebString& contentType,
+                ThreadSafeSender* registry);

[kinuko, 2015/06/23 14:11:30]

nit:  registry -> sender

[dmurph, 2015/06/24 00:36:17]

Done.

+    virtual ~BuilderImpl();
+
+    void appendData(const blink::WebThreadSafeData&) override;
+    void appendFile(const blink::WebString& path, uint64_t offset,
+                    uint64_t length, double expectedModificationTime) override;
+    void appendBlob(const blink::WebString& uuid, uint64_t offset,
+                    uint64_t length) override;
+    void appendFileSystemURL(const blink::WebURL&, uint64_t offset,
+                             uint64_t length,
+                             double expectedModificationTime) override;
+
+    void build() override;
+
+   private:
+    // Sends data that is larger than the threshold.
+    void SendOversizedDataForBlob(size_t consolidated_item_index);
+
+    std::string uuid_;
+    std::string content_type_;

[michaeln, 2015/06/22 23:20:21]

nit: these first two members could be const

[dmurph, 2015/06/24 00:36:17]

Done.

+    BlobConsolidation consolidation_;
+    scoped_refptr<ThreadSafeSender> sender_;
+  };
 
   scoped_refptr<ThreadSafeSender> sender_;
 };