SPDY: WriteHeaders should not invoke OnDataSent callback

net/spdy/spdy_stream.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 NET_SPDY_SPDY_STREAM_H_
 #define NET_SPDY_SPDY_STREAM_H_
 
 #include <list>
 #include <string>
 #include <vector>
@@ skipping 53 matching lines @@
     // Called when the SYN_STREAM, SYN_REPLY, or HEADERS frames are received.
     // Normal streams will receive a SYN_REPLY and optional HEADERS frames.
     // Pushed streams will receive a SYN_STREAM and optional HEADERS frames.
     // Because a stream may have a SYN_* frame and multiple HEADERS frames,
     // this callback may be called multiple times.
     // |status| indicates network error. Returns network error code.
     virtual int OnResponseReceived(const SpdyHeaderBlock& response,
                                    base::Time response_time,
                                    int status) = 0;
 
+    // Called when a HEADERS frame is sent.
+    virtual void OnHeadersSent() = 0;
+
     // Called when data is received.
     virtual void OnDataReceived(const char* data, int length) = 0;
 
     // Called when data is sent.
     virtual void OnDataSent(int length) = 0;
 
     // Called when SpdyStream is closed.
     virtual void OnClose(int status) = 0;
 
    protected:
     friend class base::RefCounted<Delegate>;
     virtual ~Delegate() {}
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
 
   // Indicates pending frame type.
-  enum PendingFrameType {
-    TYPE_HEADER,
+  enum FrameType {
+    TYPE_HEADERS,
     TYPE_DATA
   };
 
   // Structure to contains pending frame information.
   typedef struct {
-    PendingFrameType type;
+    FrameType type;
     union {
       SpdyHeaderBlock* header_block;
       SpdyDataFrame* data_frame;
     };
   } PendingFrame;
 
   // SpdyStream constructor
   SpdyStream(SpdySession* session,
              bool pushed,
              const BoundNetLog& net_log);
@@ skipping 249 matching lines @@
 
   // The time at which the request was made that resulted in this response.
   // For cached responses, this time could be "far" in the past.
   base::Time request_time_;
 
   scoped_ptr<SpdyHeaderBlock> response_;
   base::Time response_time_;
 
   std::list<PendingFrame> pending_frames_;
 
+  std::list<FrameType> waiting_completions_;

[Ryan Hamilton, 2012/08/13 17:10:02]

nit: Please add a comment that describes the difference between pending_frames_
and waiting_completions_. 

[Takashi Toyoshima, 2012/08/14 09:14:02]

Done.

+
   State io_state_;
 
   // Since we buffer the response, we also buffer the response status.
   // Not valid until the stream is closed.
   int response_status_;
 
   bool cancelled_;
   bool has_upload_data_;
 
   BoundNetLog net_log_;
@@ skipping 10 matching lines @@
   std::string domain_bound_private_key_;
   std::string domain_bound_cert_;
   ServerBoundCertService::RequestHandle domain_bound_cert_request_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_STREAM_H_