WebSocket Pepper API: WebArrayBuffer support

webkit/plugins/ppapi/ppb_websocket_impl.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_
 
 #include <queue>
 
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/ppb_websocket_api.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocket.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketClient.h"
 
 namespace ppapi {
 class StringVar;
-}
-
-namespace WebKit {
-class WebSocket;
+class Var;
 }
 
 namespace webkit {
 namespace ppapi {
 
 // All implementation is in this class for now. We should move some common
 // implementation to shared_impl when we implement proxy interfaces.
 class PPB_WebSocket_Impl : public ::ppapi::Resource,
                            public ::ppapi::thunk::PPB_WebSocket_API,
                            public ::WebKit::WebSocketClient {
@@ skipping 25 matching lines @@
   virtual PP_Var GetProtocol() OVERRIDE;
   virtual PP_WebSocketReadyState_Dev GetReadyState() OVERRIDE;
   virtual PP_Var GetURL() OVERRIDE;
   virtual PP_Bool SetBinaryType(
       PP_WebSocketBinaryType_Dev binary_type) OVERRIDE;
   virtual PP_WebSocketBinaryType_Dev GetBinaryType() OVERRIDE;
 
   // WebSocketClient implementation.
   virtual void didConnect();
   virtual void didReceiveMessage(const WebKit::WebString& message);
-  virtual void didReceiveBinaryData(const WebKit::WebData& binaryData);
+  virtual void didReceiveArrayBuffer(const WebKit::WebArrayBuffer& binaryData);
   virtual void didReceiveMessageError();
   virtual void didUpdateBufferedAmount(unsigned long buffered_amount);
   virtual void didStartClosingHandshake();
   virtual void didClose(unsigned long unhandled_buffered_amount,
                         ClosingHandshakeCompletionStatus status,
                         unsigned short code,
                         const WebKit::WebString& reason);
  private:
   int32_t DoReceive();
 
   scoped_ptr<WebKit::WebSocket> websocket_;
   PP_WebSocketReadyState_Dev state_;
-  PP_WebSocketBinaryType_Dev binary_type_;
+  WebKit::WebSocket::BinaryType binary_type_;
   bool error_was_received_;
 
   scoped_refptr< ::ppapi::TrackedCallback> connect_callback_;
 
   scoped_refptr< ::ppapi::TrackedCallback> receive_callback_;
   PP_Var* receive_callback_var_;
   bool wait_for_receive_;
-  // TODO(toyoshim): Use std::queue<Var> when it supports binary.
-  std::queue<PP_Var> received_messages_;
+  std::queue< scoped_refptr< ::ppapi::Var>*> received_messages_;

[dmichael (off chromium), 2012/01/17 22:14:28]

You don't want the * there

[Takashi Toyoshima, 2012/01/18 12:10:43]

Done.

 
   scoped_refptr< ::ppapi::TrackedCallback> close_callback_;
   uint16_t close_code_;
   scoped_refptr< ::ppapi::StringVar> close_reason_;
   PP_Bool close_was_clean_;
 
   scoped_refptr< ::ppapi::StringVar> empty_string_;
   scoped_refptr< ::ppapi::StringVar> extensions_;
   scoped_refptr< ::ppapi::StringVar> url_;
 
   uint64_t buffered_amount_;
   uint64_t buffered_amount_after_close_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_WebSocket_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_WEBSOCKET_IMPL_H_