Add Stream support to WebBlobRegistry and FileAPIMessageFilter.

content/browser/streams/stream.h

 // 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.
 
 #ifndef CONTENT_BROWSER_STREAMS_STREAM_H_
 #define CONTENT_BROWSER_STREAMS_STREAM_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 20 matching lines @@
 // reader to consume part of the stream, then pass it along to another client
 // to continue processing the stream.
 class CONTENT_EXPORT Stream : public base::RefCountedThreadSafe<Stream> {
  public:
   enum StreamState {
     STREAM_HAS_DATA,
     STREAM_COMPLETE,
     STREAM_EMPTY,
   };
 
-  // Creates a stream useable from the |security_origin|.
+  // Creates a stream.
+  //
+  // TODO(tyoshino): Add |security_origin| parameter back to prevent cross
+  // origin access to streams inside Chromium (Blink has its own origin checking
+  // mechanism).

[kinuko, 2013/07/24 13:11:05]

nit: this comment should be added in/after
https://codereview.chromium.org/19798012/ ?

[tyoshino (SeeGerritForStatus), 2013/07/24 13:56:22]

ditto. already removed

   Stream(StreamRegistry* registry,
          StreamWriteObserver* write_observer,
          const GURL& security_origin,
          const GURL& url);
 
   // Sets the reader of this stream. Returns true on success, or false if there
   // is already a reader.
   bool SetReadObserver(StreamReadObserver* observer);
 
   // Removes the read observer.  |observer| must be the current observer.
   void RemoveReadObserver(StreamReadObserver* observer);
 
   // Removes the write observer.  |observer| must be the current observer.
   void RemoveWriteObserver(StreamWriteObserver* observer);
 
   // Adds the data in |buffer| to the stream.  Takes ownership of |buffer|.
   void AddData(scoped_refptr<net::IOBuffer> buffer, size_t size);
+  // Adds data of |size| at |data| to the stream. This method creates a copy
+  // of the data, and then passes it to |writer_|.
+  void AddData(const char* data, size_t size);
 
   // Notifies this stream that it will not be receiving any more data.
   void Finalize();
 
   // Reads a maximum of |buf_size| from the stream into |buf|.  Sets
   // |*bytes_read| to the number of bytes actually read.
   // Returns STREAM_HAS_DATA if data was read, STREAM_EMPTY if no data was read,
   // and STREAM_COMPLETE if the stream is finalized and all data has been read.
   StreamState ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read);
 
   scoped_ptr<StreamHandle> CreateHandle(const GURL& original_url,
                                         const std::string& mime_type);
   void CloseHandle();
 
   // Indicates whether there is space in the buffer to add more data.
   bool can_add_data() const { return can_add_data_; }
 
   const GURL& url() const { return url_; }
 
+  // TODO(tyoshino): Once security origin handling inside Chromium is fixed,
+  // revisit callers of the Stream constructor and fix them if necessary to
+  // pass right data (e.g. FileAPIMessageFilter). (crbug.com/263342)
   const GURL& security_origin() const { return security_origin_; }
 
  private:
   friend class base::RefCountedThreadSafe<Stream>;
 
   virtual ~Stream();
 
   void OnSpaceAvailable();
   void OnDataAvailable();
 
@@ skipping 15 matching lines @@
 
   StreamHandleImpl* stream_handle_;
 
   base::WeakPtrFactory<Stream> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(Stream);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_STREAMS_STREAM_H_