Stop using SpdySynStreamIR for SPDY 4.

net/spdy/spdy_framer.cc

 // 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.
 
 #include "net/spdy/spdy_framer.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/stats_counters.h"
 #include "base/third_party/valgrind/memcheck.h"
@@ skipping 2330 matching lines @@
         data_ir.data().length() + data_ir.padding_payload_len());
   } else {
     builder.OverwriteLength(*this, data_ir.data().length());
   }
   DCHECK_EQ(frame_size, builder.length());
   return builder.take();
 }
 
 SpdySerializedFrame* SpdyFramer::SerializeSynStream(
     const SpdySynStreamIR& syn_stream) {
+  DCHECK_GE(SPDY3, protocol_version());
   uint8 flags = 0;
   if (syn_stream.fin()) {
     flags |= CONTROL_FLAG_FIN;
   }
   if (syn_stream.unidirectional()) {
     // TODO(hkhalil): invalid for HTTP2.
     flags |= CONTROL_FLAG_UNIDIRECTIONAL;
   }
-  // In SPDY >= 4, SYN_STREAM frames are HEADERS frames, but for now
-  // we never expect to have to overflow into a CONTINUATION frame.
-  if (protocol_version() > SPDY3) {
-    flags |= HEADERS_FLAG_PRIORITY;
-    flags |= HEADERS_FLAG_END_HEADERS;
-  }
 
   // Sanitize priority.
   uint8 priority = syn_stream.priority();
   if (priority > GetLowestPriority()) {
     DLOG(DFATAL) << "Priority out-of-bounds.";
     priority = GetLowestPriority();
   }
 
   // The size of this frame, including variable-length name-value block.
-  size_t size = GetSynStreamMinimumSize();
-
-  string hpack_encoding;
-  if (protocol_version() > SPDY3) {
-    if (enable_compression_) {
-      GetHpackEncoder()->EncodeHeaderSet(
-          syn_stream.name_value_block(), &hpack_encoding);
-    } else {
-      GetHpackEncoder()->EncodeHeaderSetWithoutCompression(
-          syn_stream.name_value_block(), &hpack_encoding);
-    }
-    size += hpack_encoding.size();
-  } else {
-    size += GetSerializedLength(syn_stream.name_value_block());
-  }
+  size_t size = GetSynStreamMinimumSize() +
+      GetSerializedLength(syn_stream.name_value_block());
 
   SpdyFrameBuilder builder(size, protocol_version());
-  if (protocol_version() <= SPDY3) {
-    builder.WriteControlFrameHeader(*this, SYN_STREAM, flags);
-    builder.WriteUInt32(syn_stream.stream_id());
-    builder.WriteUInt32(syn_stream.associated_to_stream_id());
-    builder.WriteUInt8(priority << ((protocol_version() <= SPDY2) ? 6 : 5));
-    builder.WriteUInt8(0);  // Unused byte where credential slot used to be.
-  } else {
-    builder.BeginNewFrame(*this,
-                          HEADERS,
-                          flags,
-                          syn_stream.stream_id());
-    // TODO(jgraettinger): Plumb priorities and stream dependencies.
-    builder.WriteUInt32(0);  // Non-exclusive bit and root stream ID.
-    builder.WriteUInt8(MapPriorityToWeight(priority));
-  }
+  builder.WriteControlFrameHeader(*this, SYN_STREAM, flags);
+  builder.WriteUInt32(syn_stream.stream_id());
+  builder.WriteUInt32(syn_stream.associated_to_stream_id());
+  builder.WriteUInt8(priority << ((protocol_version() <= SPDY2) ? 6 : 5));
+  builder.WriteUInt8(0);  // Unused byte where credential slot used to be.
   DCHECK_EQ(GetSynStreamMinimumSize(), builder.length());
-  if (protocol_version() > SPDY3) {
-    builder.WriteBytes(&hpack_encoding[0], hpack_encoding.size());
-  } else {
-    SerializeNameValueBlock(&builder, syn_stream);
-  }
+  SerializeNameValueBlock(&builder, syn_stream);
 
   if (debug_visitor_) {
     const size_t payload_len =
         GetSerializedLength(protocol_version(),
                             &(syn_stream.name_value_block()));
     // SPDY 4 reports this compression as a SYN_STREAM compression.
     debug_visitor_->OnSendCompressedFrame(syn_stream.stream_id(),
                                           SYN_STREAM,
                                           payload_len,
                                           builder.length());
@@ skipping 206 matching lines @@
 
   // The size of this frame, including variable-length name-value block.
   size_t size = GetHeadersMinimumSize();
 
   uint32 priority = headers.priority();
   if (headers.has_priority()) {
     if (priority > GetLowestPriority()) {
       DLOG(DFATAL) << "Priority out-of-bounds.";
       priority = GetLowestPriority();
     }
-    size += 4;
+    size += 5;
   }
 
   string hpack_encoding;
   if (protocol_version() > SPDY3) {
     if (enable_compression_) {
       GetHpackEncoder()->EncodeHeaderSet(
           headers.name_value_block(), &hpack_encoding);
     } else {
       GetHpackEncoder()->EncodeHeaderSetWithoutCompression(
           headers.name_value_block(), &hpack_encoding);
@@ skipping 10 matching lines @@
 
   SpdyFrameBuilder builder(size, protocol_version());
   if (protocol_version() <= SPDY3) {
     builder.WriteControlFrameHeader(*this, HEADERS, flags);
     builder.WriteUInt32(headers.stream_id());
   } else {
     builder.BeginNewFrame(*this,
                           HEADERS,
                           flags,
                           headers.stream_id());
-    if (headers.has_priority()) {
-      // TODO(jgraettinger): Plumb priorities and stream dependencies.
-      builder.WriteUInt32(0);  // Non-exclusive bit and root stream ID.
-      builder.WriteUInt8(MapPriorityToWeight(priority));
-    }
   }
   if (protocol_version() <= SPDY2) {
     builder.WriteUInt16(0);  // Unused.
   }
   DCHECK_EQ(GetHeadersMinimumSize(), builder.length());
 
   if (protocol_version() > SPDY3) {
+    if (headers.has_priority()) {
+      // TODO(jgraettinger): Plumb priorities and stream dependencies.
+      builder.WriteUInt32(0);  // Non-exclusive bit and root stream ID.
+      builder.WriteUInt8(MapPriorityToWeight(priority));
+    }
     WritePayloadWithContinuation(&builder,
                                  hpack_encoding,
                                  headers.stream_id(),
                                  HEADERS);
   } else {
     SerializeNameValueBlock(&builder, headers);
   }
 
   if (debug_visitor_) {
     const size_t payload_len = protocol_version() > SPDY3 ?
@@ skipping 567 matching lines @@
   builder->Seek(compressed_size);
   builder->RewriteLength(*this);
 
   pre_compress_bytes.Add(uncompressed_len);
   post_compress_bytes.Add(compressed_size);
 
   compressed_frames.Increment();
 }
 
 }  // namespace net