Land recent SPDY changes (through 67282679)

net/spdy/spdy_protocol.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_protocol.h"
 
 namespace net {
 
 SpdyFrameWithNameValueBlockIR::SpdyFrameWithNameValueBlockIR(
     SpdyStreamId stream_id) : SpdyFrameWithFinIR(stream_id) {}
@@ skipping 80 matching lines @@
           return WINDOW_UPDATE;
       }
       break;
     case SPDY4:
     case SPDY5:
       switch (frame_type_field) {
         case 0:
           return DATA;
         case 1:
           return HEADERS;
-        // TODO(hkhalil): Add PRIORITY.
+        case 2:
+          return PRIORITY;
         case 3:
           return RST_STREAM;
         case 4:
           return SETTINGS;
         case 5:
           return PUSH_PROMISE;
         case 6:
           return PING;
         case 7:
           return GOAWAY;
         case 8:
           return WINDOW_UPDATE;
         case 9:
           return CONTINUATION;
         case 10:
+          return ALTSVC;
+        case 11:
           return BLOCKED;
       }
       break;
   }
 
   LOG(DFATAL) << "Unhandled frame type " << frame_type_field;
   return DATA;
 }
 
 int SpdyConstants::SerializeFrameType(SpdyMajorVersion version,
@@ skipping 22 matching lines @@
           LOG(DFATAL) << "Serializing unhandled frame type " << frame_type;
           return -1;
       }
     case SPDY4:
     case SPDY5:
       switch (frame_type) {
         case DATA:
           return 0;
         case HEADERS:
           return 1;
-        // TODO(hkhalil): Add PRIORITY.
+        case PRIORITY:
+          return 2;
         case RST_STREAM:
           return 3;
         case SETTINGS:
           return 4;
         case PUSH_PROMISE:
           return 5;
         case PING:
           return 6;
         case GOAWAY:
           return 7;
         case WINDOW_UPDATE:
           return 8;
         case CONTINUATION:
           return 9;
+        case ALTSVC:
+          return 10;
         case BLOCKED:
-          return 10;
+          return 11;
         default:
           LOG(DFATAL) << "Serializing unhandled frame type " << frame_type;
           return -1;
       }
   }
 
   LOG(DFATAL) << "Unhandled SPDY version " << version;
   return -1;
 }
 
@@ skipping 16 matching lines @@
 
       return true;
     case SPDY4:
     case SPDY5:
       // HEADER_TABLE_SIZE is the first valid setting id.
       if (setting_id_field <
           SerializeSettingId(version, SETTINGS_HEADER_TABLE_SIZE)) {
         return false;
       }
 
-      // INITIAL_WINDOW_SIZE is the last valid setting id.
+      // COMPRESS_DATA is the last valid setting id.
       if (setting_id_field >
-          SerializeSettingId(version, SETTINGS_INITIAL_WINDOW_SIZE)) {
+          SerializeSettingId(version, SETTINGS_COMPRESS_DATA)) {
         return false;
       }
 
       return true;
   }
 
   LOG(DFATAL) << "Unhandled SPDY version " << version;
   return false;
 }
 
@@ skipping 23 matching lines @@
     case SPDY5:
       switch (setting_id_field) {
         case 1:
           return SETTINGS_HEADER_TABLE_SIZE;
         case 2:
           return SETTINGS_ENABLE_PUSH;
         case 3:
           return SETTINGS_MAX_CONCURRENT_STREAMS;
         case 4:
           return SETTINGS_INITIAL_WINDOW_SIZE;
+        case 5:
+          return SETTINGS_COMPRESS_DATA;
       }
       break;
   }
 
   LOG(DFATAL) << "Unhandled setting ID " << setting_id_field;
   return SETTINGS_UPLOAD_BANDWIDTH;
 }
 
 int SpdyConstants::SerializeSettingId(SpdyMajorVersion version,
                                        SpdySettingsIds id) {
@@ skipping 23 matching lines @@
     case SPDY5:
       switch (id) {
         case SETTINGS_HEADER_TABLE_SIZE:
           return 1;
         case SETTINGS_ENABLE_PUSH:
           return 2;
         case SETTINGS_MAX_CONCURRENT_STREAMS:
           return 3;
         case SETTINGS_INITIAL_WINDOW_SIZE:
           return 4;
+        case SETTINGS_COMPRESS_DATA:
+          return 5;
         default:
           LOG(DFATAL) << "Serializing unhandled setting id " << id;
           return -1;
       }
   }
   LOG(DFATAL) << "Unhandled SPDY version " << version;
   return -1;
 }
 
 bool SpdyConstants::IsValidRstStreamStatus(SpdyMajorVersion version,
@@ skipping 470 matching lines @@
 }
 
 void SpdyPushPromiseIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitPushPromise(*this);
 }
 
 void SpdyContinuationIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitContinuation(*this);
 }
 
+SpdyAltSvcIR::SpdyAltSvcIR(SpdyStreamId stream_id)
+    : SpdyFrameWithStreamIdIR(stream_id),
+      max_age_(0),
+      port_(0) {}
+
+void SpdyAltSvcIR::Visit(SpdyFrameVisitor* visitor) const {
+  return visitor->VisitAltSvc(*this);
+}
+
 }  // namespace net