Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1018)

Unified Diff: net/server/web_socket.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/server/web_socket.cc
diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc
index f06b425fee018c4f8d1020c4a94a02f00e1bbd56..97c48bfee659abb1c41a86784fcf3851d6be1adc 100644
--- a/net/server/web_socket.cc
+++ b/net/server/web_socket.cc
@@ -111,7 +111,8 @@ class WebSocketHixie76 : public net::WebSocket {
WebSocketHixie76(HttpConnection* connection,
const HttpServerRequestInfo& request,
- size_t* pos) : WebSocket(connection) {
+ size_t* pos)
+ : WebSocket(connection) {
std::string key1 = request.GetHeaderValue("sec-websocket-key1");
std::string key2 = request.GetHeaderValue("sec-websocket-key2");
@@ -129,9 +130,8 @@ class WebSocketHixie76 : public net::WebSocket {
return;
}
- key3_ = connection->recv_data().substr(
- *pos,
- *pos + kWebSocketHandshakeBodyLen);
+ key3_ =
+ connection->recv_data().substr(*pos, *pos + kWebSocketHandshakeBodyLen);
*pos += kWebSocketHandshakeBodyLen;
}
@@ -142,7 +142,6 @@ class WebSocketHixie76 : public net::WebSocket {
const int WebSocketHixie76::kWebSocketHandshakeBodyLen = 8;
-
// Constants for hybi-10 frame format.
typedef int OpCode;
@@ -228,18 +227,17 @@ class WebSocketHybi17 : public WebSocket {
WebSocketHybi17(HttpConnection* connection,
const HttpServerRequestInfo& request,
size_t* pos)
- : WebSocket(connection),
- op_code_(0),
- final_(false),
- reserved1_(false),
- reserved2_(false),
- reserved3_(false),
- masked_(false),
- payload_(0),
- payload_length_(0),
- frame_end_(0),
- closed_(false) {
- }
+ : WebSocket(connection),
+ op_code_(0),
+ final_(false),
+ reserved1_(false),
+ reserved2_(false),
+ reserved3_(false),
+ masked_(false),
+ payload_(0),
+ payload_length_(0),
+ frame_end_(0),
+ closed_(false) {}
OpCode op_code_;
bool final_;
@@ -294,20 +292,20 @@ WebSocket::ParseResult WebSocket::DecodeFrameHybi17(const std::string& frame,
bool closed = false;
switch (op_code) {
- case kOpCodeClose:
- closed = true;
- break;
- case kOpCodeText:
- break;
- case kOpCodeBinary: // We don't support binary frames yet.
- case kOpCodeContinuation: // We don't support binary frames yet.
- case kOpCodePing: // We don't support binary frames yet.
- case kOpCodePong: // We don't support binary frames yet.
- default:
- return FRAME_ERROR;
+ case kOpCodeClose:
+ closed = true;
+ break;
+ case kOpCodeText:
+ break;
+ case kOpCodeBinary: // We don't support binary frames yet.
+ case kOpCodeContinuation: // We don't support binary frames yet.
+ case kOpCodePing: // We don't support binary frames yet.
+ case kOpCodePong: // We don't support binary frames yet.
+ default:
+ return FRAME_ERROR;
}
- if (client_frame && !masked) // In Hybi-17 spec client MUST mask his frame.
+ if (client_frame && !masked) // In Hybi-17 spec client MUST mask his frame.
return FRAME_ERROR;
uint64 payload_length64 = second_byte & kPayloadLengthMask;
@@ -382,9 +380,8 @@ std::string WebSocket::EncodeFrameHybi17(const std::string& message,
extended_payload_length[7 - i] = remaining & 0xFF;
remaining >>= 8;
}
- frame.insert(frame.end(),
- extended_payload_length,
- extended_payload_length + 8);
+ frame.insert(
+ frame.end(), extended_payload_length, extended_payload_length + 8);
DCHECK(!remaining);
}

Powered by Google App Engine
This is Rietveld 408576698