summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/common/websocket.h3
-rw-r--r--content/common/websocket_messages.h5
2 files changed, 5 insertions, 3 deletions
diff --git a/content/common/websocket.h b/content/common/websocket.h
index 98d75fa..f6f8ddb 100644
--- a/content/common/websocket.h
+++ b/content/common/websocket.h
@@ -18,7 +18,8 @@ namespace content {
enum WebSocketMessageType {
WEB_SOCKET_MESSAGE_TYPE_CONTINUATION = 0x0,
WEB_SOCKET_MESSAGE_TYPE_TEXT = 0x1,
- WEB_SOCKET_MESSAGE_TYPE_BINARY = 0x2
+ WEB_SOCKET_MESSAGE_TYPE_BINARY = 0x2,
+ WEB_SOCKET_MESSAGE_TYPE_LAST = WEB_SOCKET_MESSAGE_TYPE_BINARY
};
// Opening handshake request information which will be shown in the inspector.
diff --git a/content/common/websocket_messages.h b/content/common/websocket_messages.h
index dadece4..0781562 100644
--- a/content/common/websocket_messages.h
+++ b/content/common/websocket_messages.h
@@ -26,6 +26,9 @@
#define IPC_MESSAGE_EXPORT CONTENT_EXPORT
#define IPC_MESSAGE_START WebSocketMsgStart
+IPC_ENUM_TRAITS_MAX_VALUE(content::WebSocketMessageType,
+ content::WEB_SOCKET_MESSAGE_TYPE_LAST)
+
IPC_STRUCT_TRAITS_BEGIN(content::WebSocketHandshakeRequest)
IPC_STRUCT_TRAITS_MEMBER(url)
IPC_STRUCT_TRAITS_MEMBER(headers)
@@ -101,8 +104,6 @@ IPC_MESSAGE_ROUTED1(WebSocketMsg_NotifyFailure,
// WebSocket messages that can be sent in either direction.
-IPC_ENUM_TRAITS(content::WebSocketMessageType)
-
// Send a non-control frame on |channel_id|. If the sender is the renderer, it
// will be sent to the remote server. If the sender is the browser, it comes
// from the remote server. |fin| indicates that this frame is the last in the