Index: net/websockets/websocket_deflate_stream.cc |
diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc |
index 38de5fa2ecab770882d3594a2ba95f7de5810e0c..713e25e0e3e73069854d945fc099f0169d539c8b 100644 |
--- a/net/websockets/websocket_deflate_stream.cc |
+++ b/net/websockets/websocket_deflate_stream.cc |
@@ -53,16 +53,17 @@ WebSocketDeflateStream::WebSocketDeflateStream( |
inflater_.Initialize(kWindowBits); |
} |
-WebSocketDeflateStream::~WebSocketDeflateStream() {} |
+WebSocketDeflateStream::~WebSocketDeflateStream() { |
+} |
int WebSocketDeflateStream::ReadFrames(ScopedVector<WebSocketFrame>* frames, |
const CompletionCallback& callback) { |
- int result = stream_->ReadFrames( |
- frames, |
- base::Bind(&WebSocketDeflateStream::OnReadComplete, |
- base::Unretained(this), |
- base::Unretained(frames), |
- callback)); |
+ int result = |
+ stream_->ReadFrames(frames, |
+ base::Bind(&WebSocketDeflateStream::OnReadComplete, |
+ base::Unretained(this), |
+ base::Unretained(frames), |
+ callback)); |
if (result < 0) |
return result; |
DCHECK_EQ(OK, result); |
@@ -81,7 +82,9 @@ int WebSocketDeflateStream::WriteFrames(ScopedVector<WebSocketFrame>* frames, |
return stream_->WriteFrames(frames, callback); |
} |
-void WebSocketDeflateStream::Close() { stream_->Close(); } |
+void WebSocketDeflateStream::Close() { |
+ stream_->Close(); |
+} |
std::string WebSocketDeflateStream::GetSubProtocol() const { |
return stream_->GetSubProtocol(); |
@@ -132,8 +135,9 @@ int WebSocketDeflateStream::Deflate(ScopedVector<WebSocketFrame>* frames) { |
frames_to_write.push_back(frame.release()); |
current_writing_opcode_ = WebSocketFrameHeader::kOpCodeContinuation; |
} else { |
- if (frame->data && !deflater_.AddBytes(frame->data->data(), |
- frame->header.payload_length)) { |
+ if (frame->data && |
+ !deflater_.AddBytes(frame->data->data(), |
+ frame->header.payload_length)) { |
DVLOG(1) << "WebSocket protocol error. " |
<< "deflater_.AddBytes() returns an error."; |
return ERR_WS_PROTOCOL_ERROR; |
@@ -174,7 +178,8 @@ int WebSocketDeflateStream::Deflate(ScopedVector<WebSocketFrame>* frames) { |
} |
void WebSocketDeflateStream::OnMessageStart( |
- const ScopedVector<WebSocketFrame>& frames, size_t index) { |
+ const ScopedVector<WebSocketFrame>& frames, |
+ size_t index) { |
WebSocketFrame* frame = frames[index]; |
current_writing_opcode_ = frame->header.opcode; |
DCHECK(current_writing_opcode_ == WebSocketFrameHeader::kOpCodeText || |
@@ -241,9 +246,9 @@ int WebSocketDeflateStream::AppendPossiblyCompressedMessage( |
WebSocketFrame* frame = (*frames)[i]; |
// Asserts checking that frames represent one whole data message. |
DCHECK(WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)); |
- DCHECK_EQ(i == 0, |
- WebSocketFrameHeader::kOpCodeContinuation != |
- frame->header.opcode); |
+ DCHECK_EQ( |
+ i == 0, |
+ WebSocketFrameHeader::kOpCodeContinuation != frame->header.opcode); |
DCHECK_EQ(i == frames->size() - 1, frame->header.final); |
original_payload_length += frame->header.payload_length; |
} |
@@ -310,8 +315,9 @@ int WebSocketDeflateStream::Inflate(ScopedVector<WebSocketFrame>* frames) { |
frames_to_output.push_back(frame.release()); |
} else { |
DCHECK_EQ(reading_state_, READING_COMPRESSED_MESSAGE); |
- if (frame->data && !inflater_.AddBytes(frame->data->data(), |
- frame->header.payload_length)) { |
+ if (frame->data && |
+ !inflater_.AddBytes(frame->data->data(), |
+ frame->header.payload_length)) { |
DVLOG(1) << "WebSocket protocol error. " |
<< "inflater_.AddBytes() returns an error."; |
return ERR_WS_PROTOCOL_ERROR; |
@@ -369,12 +375,12 @@ int WebSocketDeflateStream::InflateAndReadIfNecessary( |
while (result == ERR_IO_PENDING) { |
DCHECK(frames->empty()); |
- result = stream_->ReadFrames( |
- frames, |
- base::Bind(&WebSocketDeflateStream::OnReadComplete, |
- base::Unretained(this), |
- base::Unretained(frames), |
- callback)); |
+ result = |
+ stream_->ReadFrames(frames, |
+ base::Bind(&WebSocketDeflateStream::OnReadComplete, |
+ base::Unretained(this), |
+ base::Unretained(frames), |
+ callback)); |
if (result < 0) |
break; |
DCHECK_EQ(OK, result); |