| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/websockets/websocket_deflater.h" | 5 #include "net/websockets/websocket_deflater.h" |
| 6 | 6 |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <deque> | 9 #include <deque> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "net/base/io_buffer.h" | 13 #include "net/base/io_buffer.h" |
| 14 #include "third_party/zlib/zlib.h" | 14 #include "third_party/zlib/zlib.h" |
| 15 | 15 |
| 16 namespace net { | 16 namespace net { |
| 17 | 17 |
| 18 WebSocketDeflater::WebSocketDeflater(ContextTakeOverMode mode) | 18 WebSocketDeflater::WebSocketDeflater(ContextTakeOverMode mode) |
| 19 : mode_(mode), are_bytes_added_(false) {} | 19 : mode_(mode), are_bytes_added_(false) { |
| 20 } |
| 20 | 21 |
| 21 WebSocketDeflater::~WebSocketDeflater() { | 22 WebSocketDeflater::~WebSocketDeflater() { |
| 22 if (stream_) { | 23 if (stream_) { |
| 23 deflateEnd(stream_.get()); | 24 deflateEnd(stream_.get()); |
| 24 stream_.reset(NULL); | 25 stream_.reset(NULL); |
| 25 } | 26 } |
| 26 } | 27 } |
| 27 | 28 |
| 28 bool WebSocketDeflater::Initialize(int window_bits) { | 29 bool WebSocketDeflater::Initialize(int window_bits) { |
| 29 DCHECK(!stream_); | 30 DCHECK(!stream_); |
| 30 stream_.reset(new z_stream); | 31 stream_.reset(new z_stream); |
| 31 | 32 |
| 32 DCHECK_LE(8, window_bits); | 33 DCHECK_LE(8, window_bits); |
| 33 DCHECK_GE(15, window_bits); | 34 DCHECK_GE(15, window_bits); |
| 34 memset(stream_.get(), 0, sizeof(*stream_)); | 35 memset(stream_.get(), 0, sizeof(*stream_)); |
| 35 int result = deflateInit2(stream_.get(), | 36 int result = deflateInit2(stream_.get(), |
| 36 Z_DEFAULT_COMPRESSION, | 37 Z_DEFAULT_COMPRESSION, |
| 37 Z_DEFLATED, | 38 Z_DEFLATED, |
| 38 -window_bits, // Negative value for raw deflate | 39 -window_bits, // Negative value for raw deflate |
| 39 8, // default mem level | 40 8, // default mem level |
| 40 Z_DEFAULT_STRATEGY); | 41 Z_DEFAULT_STRATEGY); |
| 41 if (result != Z_OK) { | 42 if (result != Z_OK) { |
| 42 deflateEnd(stream_.get()); | 43 deflateEnd(stream_.get()); |
| 43 stream_.reset(); | 44 stream_.reset(); |
| 44 return false; | 45 return false; |
| 45 } | 46 } |
| 46 const size_t kFixedBufferSize = 4096; | 47 const size_t kFixedBufferSize = 4096; |
| 47 fixed_buffer_.resize(kFixedBufferSize); | 48 fixed_buffer_.resize(kFixedBufferSize); |
| 48 return true; | 49 return true; |
| 49 } | 50 } |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 stream_->next_out = reinterpret_cast<Bytef*>(&fixed_buffer_[0]); | 119 stream_->next_out = reinterpret_cast<Bytef*>(&fixed_buffer_[0]); |
| 119 stream_->avail_out = fixed_buffer_.size(); | 120 stream_->avail_out = fixed_buffer_.size(); |
| 120 result = deflate(stream_.get(), flush); | 121 result = deflate(stream_.get(), flush); |
| 121 size_t size = fixed_buffer_.size() - stream_->avail_out; | 122 size_t size = fixed_buffer_.size() - stream_->avail_out; |
| 122 buffer_.insert(buffer_.end(), &fixed_buffer_[0], &fixed_buffer_[0] + size); | 123 buffer_.insert(buffer_.end(), &fixed_buffer_[0], &fixed_buffer_[0] + size); |
| 123 } while (result == Z_OK); | 124 } while (result == Z_OK); |
| 124 return result; | 125 return result; |
| 125 } | 126 } |
| 126 | 127 |
| 127 } // namespace net | 128 } // namespace net |
| OLD | NEW |