WebSocket Pepper API: C++ utility class implementation.

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 407 matching lines @@
   switch (binary_type) {
     case PP_WEBSOCKETBINARYTYPE_BLOB_DEV:
       binary_type_ = WebSocket::BinaryTypeBlob;
       break;
     case PP_WEBSOCKETBINARYTYPE_ARRAYBUFFER_DEV:
       binary_type_ = WebSocket::BinaryTypeArrayBuffer;
       break;
     default:
       return PP_FALSE;
   }
-  if (!websocket_.get())
-    return PP_FALSE;
-  websocket_->setBinaryType(binary_type_);
+  // WebKit API setBinaryType() is called when Connect() is called.
+  // If the websocket_ contains an object; it means Connect() is already
+  // called, call WebKit API here to reflect the setting as soon as possible.
+  if (websocket_.get())
+    websocket_->setBinaryType(binary_type_);

[dmichael (off chromium), 2012/02/01 23:05:18]

This looks like leftovers from another CL?

[Takashi Toyoshima, 2012/02/03 07:58:27]

Yes.
This difference was removed in the next patch set 16.

   return PP_TRUE;
 }
 
 PP_WebSocketBinaryType_Dev PPB_WebSocket_Impl::GetBinaryType() {
   switch (binary_type_) {
     case WebSocket::BinaryTypeBlob:
       return PP_WEBSOCKETBINARYTYPE_BLOB_DEV;
     case WebSocket::BinaryTypeArrayBuffer:
       return PP_WEBSOCKETBINARYTYPE_ARRAYBUFFER_DEV;
     default:
@@ skipping 116 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