diff options
Diffstat (limited to 'chromium/ppapi/proxy/websocket_resource.cc')
| -rw-r--r-- | chromium/ppapi/proxy/websocket_resource.cc | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/chromium/ppapi/proxy/websocket_resource.cc b/chromium/ppapi/proxy/websocket_resource.cc index c998cd94b72..d03121a870f 100644 --- a/chromium/ppapi/proxy/websocket_resource.cc +++ b/chromium/ppapi/proxy/websocket_resource.cc @@ -15,7 +15,6 @@ #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var_tracker.h" -#include "third_party/WebKit/public/web/WebSocket.h" namespace { @@ -137,17 +136,10 @@ int32_t WebSocketResource::Close(uint16_t code, // Validate |code| and |reason|. scoped_refptr<StringVar> reason_string_var; std::string reason_string; - blink::WebSocket::CloseEventCode event_code = - static_cast<blink::WebSocket::CloseEventCode>(code); - if (code == PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED) { - // PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED and CloseEventCodeNotSpecified are - // assigned to different values. A conversion is needed if - // PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED is specified. - event_code = blink::WebSocket::CloseEventCodeNotSpecified; - } else { - if (!(code == PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE || - (PP_WEBSOCKETSTATUSCODE_USER_REGISTERED_MIN <= code && - code <= PP_WEBSOCKETSTATUSCODE_USER_PRIVATE_MAX))) + if (code != PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED) { + if (code != PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE && + (code < PP_WEBSOCKETSTATUSCODE_USER_REGISTERED_MIN || + code > PP_WEBSOCKETSTATUSCODE_USER_PRIVATE_MAX)) // RFC 6455 limits applications to use reserved connection close code in // section 7.4.2.. The WebSocket API (http://www.w3.org/TR/websockets/) // defines this out of range error as InvalidAccessError in JavaScript. @@ -195,7 +187,7 @@ int32_t WebSocketResource::Close(uint16_t code, // Close connection. state_ = PP_WEBSOCKETREADYSTATE_CLOSING; - PpapiHostMsg_WebSocket_Close msg(static_cast<int32_t>(event_code), + PpapiHostMsg_WebSocket_Close msg(static_cast<int32_t>(code), reason_string); Call<PpapiPluginMsg_WebSocket_CloseReply>(RENDERER, msg, base::Bind(&WebSocketResource::OnPluginMsgCloseReply, this)); @@ -336,7 +328,7 @@ void WebSocketResource::OnReplyReceived( return; } - IPC_BEGIN_MESSAGE_MAP(WebSocketResource, msg) + PPAPI_BEGIN_MESSAGE_MAP(WebSocketResource, msg) PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL( PpapiPluginMsg_WebSocket_ReceiveTextReply, OnPluginMsgReceiveTextReply) @@ -356,7 +348,7 @@ void WebSocketResource::OnReplyReceived( PpapiPluginMsg_WebSocket_ClosedReply, OnPluginMsgClosedReply) PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL_UNHANDLED(NOTREACHED()) - IPC_END_MESSAGE_MAP() + PPAPI_END_MESSAGE_MAP() } void WebSocketResource::OnPluginMsgConnectReply( |