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 1239 matching lines @@
   return reinterpret_cast<SpdyDataFrame*>(frame.take());
 }
 
 // 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;
-  }
-
-  // We don't compress Data frames.
-  return false;
-}
-
 z_stream* SpdyFramer::GetHeaderCompressor() {
   if (header_compressor_.get())
     return header_compressor_.get();  // Already initialized.
 
   header_compressor_.reset(new z_stream);
   memset(header_compressor_.get(), 0, sizeof(z_stream));
 
   int success = deflateInit2(header_compressor_.get(),
                              kCompressorLevel,
                              Z_DEFLATED,
@@ skipping 254 matching lines @@
   return read_successfully;
 }
 
 SpdyFrame* SpdyFramer::DuplicateFrame(const SpdyFrame& frame) {
   int size = SpdyFrame::kHeaderSize + frame.length();
   SpdyFrame* new_frame = new SpdyFrame(size);
   memcpy(new_frame->data(), frame.data(), size);
   return new_frame;
 }
 
+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() == HEADERS;
+  }
+
+  // We don't compress Data frames.
+  return false;
+}
+
 size_t SpdyFramer::GetMinimumControlFrameSize(int version,
                                               SpdyControlType type) {
   switch (type) {
     case SYN_STREAM:
       return SpdySynStreamControlFrame::size();
     case SYN_REPLY:
       return SpdySynReplyControlFrame::size();
     case RST_STREAM:
       return SpdyRstStreamControlFrame::size();
     case SETTINGS:
@@ skipping 71 matching lines @@
 
 void SpdyFramer::set_enable_compression(bool value) {
   enable_compression_ = value;
 }
 
 void SpdyFramer::set_enable_compression_default(bool value) {
   g_enable_compression_default = value;
 }
 
 }  // namespace net