Remove SpdyFramer::CompressFrame() and use CompressControlFrame instead.

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.
 
 // TODO(rtenhove) clean up frame buffer size calculations so that we aren't
 // constantly adding and subtracting header sizes; this is ugly and error-
 // prone.
 
 #include "net/spdy/spdy_framer.h"
 
@@ skipping 1254 matching lines @@
   return rv;
 }
 
 // The following compression setting are based on Brian Olson's analysis. See
 // https://groups.google.com/group/spdy-dev/browse_thread/thread/dfaf498542fac792
 // for more details.
 static const int kCompressorLevel = 9;
 static const int kCompressorWindowSizeInBits = 11;
 static const int kCompressorMemLevel = 1;
 
-SpdyFrame* SpdyFramer::CompressFrame(const SpdyFrame& frame) {
-  if (frame.is_control_frame()) {
-    return CompressControlFrame(
-        reinterpret_cast<const SpdyControlFrame&>(frame));
-  }
-  return NULL;
-}
-
 bool SpdyFramer::IsCompressible(const SpdyFrame& frame) const {
   // The important frames to compress are those which contain large
   // amounts of compressible data - namely the headers in the SYN_STREAM
   // and SYN_REPLY.
   if (frame.is_control_frame()) {
     const SpdyControlFrame& control_frame =
         reinterpret_cast<const SpdyControlFrame&>(frame);
     return control_frame.type() == SYN_STREAM ||
-           control_frame.type() == SYN_REPLY;
+           control_frame.type() == SYN_REPLY ||
+           control_frame.type() == HEADERS;

[hkhalil, 2012/04/19 21:12:59]

Should probably be a separate change so that it's easier to roll back, track,
etc. Up to you.

[hkhalil, 2012/04/19 21:12:59]

Regression test for this bug?

[Ryan Hamilton, 2012/04/19 21:14:55]

I added one in spdy_framer_test.cc :>

[Ryan Hamilton, 2012/04/19 21:14:55]

I think it'll just as easy to do in a single CL since the server side doesn't
have this function at all...

[hkhalil, 2012/04/19 21:15:48]

I mean in an end-to-end test...

   }
 
   // We don't compress Data frames.
   return false;
 }
 
 z_stream* SpdyFramer::GetHeaderCompressor() {
   if (header_compressor_.get())
     return header_compressor_.get();  // Already initialized.
 
@@ skipping 423 matching lines @@
 
 void SpdyFramer::set_validate_control_frame_sizes(bool value) {
   validate_control_frame_sizes_ = value;
 }
 
 void SpdyFramer::set_enable_compression_default(bool value) {
   g_enable_compression_default = value;
 }
 
 }  // namespace net