Index: content/renderer/pepper/pepper_websocket_host.cc |
diff --git a/content/renderer/pepper/pepper_websocket_host.cc b/content/renderer/pepper/pepper_websocket_host.cc |
index a88fdb54e47ddd8f211fe4e5ef4c296905c19cf9..6a14aabcaf1839dd3a70c0fdd34007d8b2c1c357 100644 |
--- a/content/renderer/pepper/pepper_websocket_host.cc |
+++ b/content/renderer/pepper/pepper_websocket_host.cc |
@@ -253,8 +253,18 @@ int32_t PepperWebSocketHost::OnHostMsgClose( |
return PP_ERROR_FAILED; |
close_reply_ = context->MakeReplyMessageContext(); |
initiating_close_ = true; |
+ |
+ blink::WebSocket::CloseEventCode event_code = |
+ static_cast<blink::WebSocket::CloseEventCode>(code); |
dmichael (off chromium)
2014/03/18 18:02:30
:-/
I like for us to do a compile assert on enum v
bbudge
2014/03/18 20:23:31
Done.
|
+ 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; |
+ } |
+ |
WebString web_reason = WebString::fromUTF8(reason); |
- websocket_->close(code, web_reason); |
+ websocket_->close(event_code, web_reason); |
return PP_OK_COMPLETIONPENDING; |
} |