Fix out of order SYN_STEAM frames.

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_
 #pragma once
 
+#include <list>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/bandwidth_metrics.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/request_priority.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/base/ssl_client_cert_type.h"
 #include "net/base/upload_data.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
+#include "net/spdy/spdy_frame_producer.h"
 
 namespace net {
 
 class AddressList;
 class IPEndPoint;
 class SpdySession;
 class SSLCertRequestInfo;
 class SSLInfo;
 
 // The SpdyStream is used by the SpdySession to represent each stream known
 // on the SpdySession.  This class provides interfaces for SpdySession to use.
 // Streams can be created either by the client or by the server.  When they
 // are initiated by the client, both the SpdySession and client object (such as
 // a SpdyNetworkTransaction) will maintain a reference to the stream.  When
 // initiated by the server, only the SpdySession will maintain any reference,
 // until such a time as a client object requests a stream for the path.
 class NET_EXPORT_PRIVATE SpdyStream
     : public base::RefCounted<SpdyStream>,
+      public SpdyFrameProducer,
       public ChunkCallback {
  public:
   // Delegate handles protocol specific behavior of spdy stream.
   class NET_EXPORT_PRIVATE Delegate {
    public:
     Delegate() {}
 
     // Called when SYN frame has been sent.
     // Returns true if no more data to be sent after SYN frame.
     virtual bool OnSendHeadersComplete(int status) = 0;
@@ skipping 33 matching lines @@
    protected:
     friend class base::RefCounted<Delegate>;
     virtual ~Delegate() {}
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
 
   // SpdyStream constructor
   SpdyStream(SpdySession* session,
-             SpdyStreamId stream_id,
              bool pushed,
              const BoundNetLog& net_log);
 
+  // SpdyFrameProducer
+  virtual RequestPriority GetPriority() const OVERRIDE;
+  virtual SpdyFrame* ProduceNextFrame() OVERRIDE;
+  virtual SpdyStream* GetSpdyStream() const OVERRIDE;
+
   // Set new |delegate|. |delegate| must not be NULL.
   // If it already received SYN_REPLY or data, OnResponseReceived() or
   // OnDataReceived() will be called.
   void SetDelegate(Delegate* delegate);
   Delegate* GetDelegate() { return delegate_; }
 
   // Detach delegate from the stream. It will cancel the stream if it was not
   // cancelled yet.  It is safe to call multiple times.
   void DetachDelegate();
 
@@ skipping 224 matching lines @@
   // The request to send.
   linked_ptr<SpdyHeaderBlock> request_;
 
   // 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_;
 
   linked_ptr<SpdyHeaderBlock> response_;
   base::Time response_time_;
 
+  std::list<SpdyFrame*> pending_data_frames_;
+
   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 29 matching lines @@
   const SpdyStreamId stream_id_;
   const int status_;
   const std::string description_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLogSpdyStreamErrorParameter);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_STREAM_H_