WebSocket Pepper API: allow to close connection without code and reason

webkit/plugins/ppapi/ppb_websocket_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppb_websocket_impl.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 193 matching lines @@
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_WebSocket_Impl::Close(uint16_t code,
                                   PP_Var reason,
                                   PP_CompletionCallback callback) {
   // Check mandarory interfaces.
   if (!websocket_.get())
     return PP_ERROR_FAILED;
 
-  // Validate |code|. Need to cast |CloseEventCodeNotSpecified| which is -1 to
-  // uint16_t for the comparison to work.
-  if (code != static_cast<uint16_t>(WebSocket::CloseEventCodeNotSpecified)) {
-    if (!(code == WebSocket::CloseEventCodeNormalClosure ||
-        (WebSocket::CloseEventCodeMinimumUserDefined <= code &&
-        code <= WebSocket::CloseEventCodeMaximumUserDefined)))
-    // 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.
-    return PP_ERROR_NOACCESS;
-  }
-
+  // Validate |code| and |reason|.
   scoped_refptr<StringVar> reason_string;
   WebString web_reason;
-  // |reason| must be ignored if it is PP_VARTYPE_UNDEFINED.
-  if (reason.type != PP_VARTYPE_UNDEFINED) {
-    // Validate |reason|.
-    reason_string = StringVar::FromPPVar(reason);
-    if (!reason_string ||
-        reason_string->value().size() > kMaxReasonSizeInBytes)
-      return PP_ERROR_BADARGUMENT;
-    web_reason = WebString::fromUTF8(reason_string->value());
+  WebSocket::CloseEventCode event_code =
+      static_cast<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 = WebSocket::CloseEventCodeNotSpecified;
+  } else {
+    if (!(code == PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE ||
+        (PP_WEBSOCKETSTATUSCODE_USER_REGISTERED_MIN <= code &&
+        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.
+      return PP_ERROR_NOACCESS;
+
+    // |reason| must be ignored if it is PP_VARTYPE_UNDEFINED or |code| is
+    // PP_WEBSOCKETSTATUSCODE_NOT_SPECIFIED.
+    if (reason.type != PP_VARTYPE_UNDEFINED) {
+      // Validate |reason|.
+      reason_string = StringVar::FromPPVar(reason);
+      if (!reason_string ||
+          reason_string->value().size() > kMaxReasonSizeInBytes)
+        return PP_ERROR_BADARGUMENT;
+      web_reason = WebString::fromUTF8(reason_string->value());
+    }
   }
 
   // Check state.
   if (state_ == PP_WEBSOCKETREADYSTATE_CLOSING)
     return PP_ERROR_INPROGRESS;
   if (state_ == PP_WEBSOCKETREADYSTATE_CLOSED)
     return PP_OK;
 
   // Validate |callback| (Doesn't support blocking callback)
   if (!callback.func)
@@ skipping 18 matching lines @@
     wait_for_receive_ = false;
     receive_callback_var_ = NULL;
 
     // Need to do a "Post" to avoid reentering the plugin.
     receive_callback_->PostAbort();
     receive_callback_ = NULL;
   }
 
   // Close connection.
   state_ = PP_WEBSOCKETREADYSTATE_CLOSING;
-  websocket_->close(code, web_reason);
+  websocket_->close(event_code, web_reason);
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_WebSocket_Impl::ReceiveMessage(PP_Var* message,
                                            PP_CompletionCallback callback) {
   // Check state.
   if (state_ == PP_WEBSOCKETREADYSTATE_INVALID ||
       state_ == PP_WEBSOCKETREADYSTATE_CONNECTING)
     return PP_ERROR_BADARGUMENT;
@@ skipping 244 matching lines @@
 
   *receive_callback_var_ = received_messages_.front()->GetPPVar();
   received_messages_.pop();
   receive_callback_var_ = NULL;
   wait_for_receive_ = false;
   return PP_OK;
 }
 
 }  // namespace ppapi
 }  // namespace webkit