diff options
author | ricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 14:59:21 +0000 |
---|---|---|
committer | ricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 14:59:21 +0000 |
commit | 40e9c62fe01cb651eb50329b65d264a1fa7edd4e (patch) | |
tree | 98b00d9c8279a4ec38ec46a761af66cf92bf7b70 /net/websockets/websocket_frame_parser.h | |
parent | 7a1f79852d930debcb32274adad623adb1fe1cef (diff) | |
download | chromium_src-40e9c62fe01cb651eb50329b65d264a1fa7edd4e.zip chromium_src-40e9c62fe01cb651eb50329b65d264a1fa7edd4e.tar.gz chromium_src-40e9c62fe01cb651eb50329b65d264a1fa7edd4e.tar.bz2 |
Add missing status codes to WebSocketError enum.
Add the close status codes that were missing from net::WebSocketError, and also
change the style of the enum from ALL_UPPER to kCamelCase.
Also add a constructor to WebSocketFrameHeader to minimise boilerplate when it
is used, and utility functions IsKnownDataOpCode() and IsKnownControlOpCode()
which will be used by WebSocketCommon. Made WebSocketFrameHeader uncopyable and
added a Clone() method for more style-guide compliance.
BUG=237496
TEST=net_unittests --gtest_filter='WebSocket*'
Review URL: https://chromiumcodereview.appspot.com/14850012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_frame_parser.h')
-rw-r--r-- | net/websockets/websocket_frame_parser.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/websockets/websocket_frame_parser.h b/net/websockets/websocket_frame_parser.h index 0a4d2ae..52e6f85 100644 --- a/net/websockets/websocket_frame_parser.h +++ b/net/websockets/websocket_frame_parser.h @@ -40,8 +40,8 @@ class NET_EXPORT WebSocketFrameParser { size_t length, ScopedVector<WebSocketFrameChunk>* frame_chunks); - // Returns WEB_SOCKET_OK if the parser has not failed to decode WebSocket - // frames. Otherwise returns WebSocketError which is defined in + // Returns kWebSocketNormalClosure if the parser has not failed to decode + // WebSocket frames. Otherwise returns WebSocketError which is defined in // websocket_errors.h. We can convert net::WebSocketError to net::Error by // using WebSocketErrorToNetError(). WebSocketError websocket_error() const { return websocket_error_; } |