Land Recent QUIC Changes

Fix a merging error in the previous checkin.

visitor_ is now a scoped_ptr so the visitor_(NULL) initializer
was removed.

Merge internal change: 43199271

More cleanups that fell out of recent Chrome merges.

Merge internal change: 43195667

Implement framing for version flag and field.

Merge internal change: 43155434

Reduce the usage of magic numbers by moving most of them to quic_protocol.h

Merge internal change: 43133922

Expose functions to calculate offsets and packet sizes from quic_protocol.h.

Merge internal change: 43123088

Various cleanups from landing recent changes in Chrome.

Merge internal change: 43060871

Moving the quic session's write blocked list over such that we won't add a given session multiple times.

Merge internal change: 42920586

Factoring our blocked list out into a separate class.

Merge internal change: 42919835

R=jar@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12374030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185797 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/net/quic/quic_packet_generator.h b/net/quic/quic_packet_generator.h
index 32becc1..254a4fe 100644
--- a/net/quic/quic_packet_generator.h
+++ b/net/quic/quic_packet_generator.h
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 //
 // Responsible for generating packets on behalf of a QuicConnection.
-// Packets are serialized just-in-time.  Control frame are queued.
-// Ack and Feedback frames will requested from the Connection
+// Packets are serialized just-in-time.  Control frames are queued.
+// Ack and Feedback frames will be requested from the Connection
 // just-in-time.  When a packet needs to be sent, the Generator
-// wills serialized a packet pass it to  QuicConnection::SendOrQueuePacket()
+// will serialized a packet and pass it to QuicConnection::SendOrQueuePacket()
 //
 // The Generator's mode of operation is controlled by two conditions:
 //
@@ -14,7 +14,7 @@
 //
 // If the Delegate is not writable, then no operations will cause
 // a packet to be serialized.  In particular:
-// * SetShouldSendAck will simply record that an ack is to be send.
+// * SetShouldSendAck will simply record that an ack is to be sent.
 // * AddControlFram will enqueue the control frame.
 // * ConsumeData will do nothing.
 //
@@ -43,10 +43,10 @@
 // an FEC packet will be sent after each write call completes.
 //
 // TODO(rch): This behavior should probably be tuned.  When not in batch
-// mode we, should probably set a timer so that several independent
+// mode, we should probably set a timer so that several independent
 // operations can be grouped into the same FEC group.
 //
-// When an FEC packet is generate, it will be send to the Delegate,
+// When an FEC packet is generated, it will be send to the Delegate,
 // even if the Delegate has become unwritable after handling the
 // data packet immediately proceeding the FEC packet.
 
@@ -89,8 +89,6 @@ class NET_EXPORT_PRIVATE QuicPacketGenerator {
   bool HasQueuedData() const;
 
  private:
-  // Must be called when the connection is writable
-  // and not blocked by the congestion manager.
   void SendQueuedData();
 
   bool HasPendingData() const;
@@ -106,6 +104,8 @@ class NET_EXPORT_PRIVATE QuicPacketGenerator {
   scoped_ptr<QuicAckFrame> pending_ack_frame_;
   scoped_ptr<QuicCongestionFeedbackFrame> pending_feedback_frame_;
   bool should_send_feedback_;
+
+  DISALLOW_COPY_AND_ASSIGN(QuicPacketGenerator);
 };
 
 }  // namespace net