WebSocket Pepper API: C++ bindings implementation.

webkit/plugins/ppapi/ppb_websocket_impl.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 326 matching lines @@
 uint64_t PPB_WebSocket_Impl::GetBufferedAmount() {
   return SaturateAdd(buffered_amount_, buffered_amount_after_close_);
 }
 
 uint16_t PPB_WebSocket_Impl::GetCloseCode() {
   return close_code_;
 }
 
 PP_Var PPB_WebSocket_Impl::GetCloseReason() {
   if (!close_reason_)
-    return empty_string_->GetPPVar();
-  return close_reason_->GetPPVar();
+    return ReturnVar(empty_string_->GetPPVar());
+  return ReturnVar(close_reason_->GetPPVar());
 }
 
 PP_Bool PPB_WebSocket_Impl::GetCloseWasClean() {
   return close_was_clean_;
 }
 
 PP_Var PPB_WebSocket_Impl::GetExtensions() {
   // TODO(toyoshim): For now, always returns empty string because WebKit side
   // doesn't support it yet.
   if (!extensions_)
-    return empty_string_->GetPPVar();
-  return extensions_->GetPPVar();
+    return ReturnVar(empty_string_->GetPPVar());
+  return ReturnVar(extensions_->GetPPVar());
 }
 
 PP_Var PPB_WebSocket_Impl::GetProtocol() {
   // Check mandatory interfaces.
   if (!websocket_.get())
-    return empty_string_->GetPPVar();
+    return ReturnVar(empty_string_->GetPPVar());
 
   std::string protocol = websocket_->subprotocol().utf8();
   return StringVar::StringToPPVar(protocol);
 }
 
 PP_WebSocketReadyState_Dev PPB_WebSocket_Impl::GetReadyState() {
   return state_;
 }
 
 PP_Var PPB_WebSocket_Impl::GetURL() {
   if (!url_)
-    return empty_string_->GetPPVar();
-  return url_->GetPPVar();
+    return ReturnVar(empty_string_->GetPPVar());
+  return ReturnVar(url_->GetPPVar());

[dmichael (off chromium), 2011/12/09 23:05:26]

It looks like this got polluted from that other CL that makes this change?

 }
 
 void PPB_WebSocket_Impl::didConnect() {
   DCHECK_EQ(PP_WEBSOCKETREADYSTATE_CONNECTING_DEV, state_);
   state_ = PP_WEBSOCKETREADYSTATE_OPEN_DEV;
   PP_RunAndClearCompletionCallback(&connect_callback_, PP_OK);
 }
 
 void PPB_WebSocket_Impl::didReceiveMessage(const WebString& message) {
   // Dispose packets after receiving an error or in invalid state.
@@ skipping 95 matching lines @@
   if (!receive_callback_var_)
     return PP_OK;
 
   *receive_callback_var_ = received_messages_.front();
   received_messages_.pop();
   receive_callback_var_ = NULL;
   wait_for_receive_ = false;
   return PP_OK;
 }
 
+PP_Var PPB_WebSocket_Impl::ReturnVar(PP_Var var) {
+  VarTracker* var_tracker = PpapiGlobals::Get()->GetVarTracker();
+  var_tracker->AddRefVar(var);
+  return var;
+}
+
 }  // namespace ppapi
 }  // namespace webkit