PPAPI: Get TrackedCallback ready for running on non-main threads.

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 397 matching lines @@
 
 PP_Var PPB_WebSocket_Impl::GetURL() {
   if (!url_)
     return empty_string_->GetPPVar();
   return url_->GetPPVar();
 }
 
 void PPB_WebSocket_Impl::didConnect() {
   DCHECK_EQ(PP_WEBSOCKETREADYSTATE_CONNECTING, state_);
   state_ = PP_WEBSOCKETREADYSTATE_OPEN;
-  TrackedCallback::ClearAndRun(&connect_callback_, PP_OK);
+  connect_callback_->Run(PP_OK);
 }
 
 void PPB_WebSocket_Impl::didReceiveMessage(const WebString& message) {
   // Dispose packets after receiving an error or in invalid state.
   if (error_was_received_ || !InValidStateToReceive(state_))
     return;
 
   // Append received data to queue.
   std::string string = message.utf8();
   received_messages_.push(scoped_refptr<Var>(new StringVar(string)));
 
   if (!wait_for_receive_)
     return;
 
-  TrackedCallback::ClearAndRun(&receive_callback_, DoReceive());
+  receive_callback_->Run(DoReceive());
 }
 
 void PPB_WebSocket_Impl::didReceiveArrayBuffer(
     const WebArrayBuffer& binaryData) {
   // Dispose packets after receiving an error or in invalid state.
   if (error_was_received_ || !InValidStateToReceive(state_))
     return;
 
   // Append received data to queue.
   received_messages_.push(
       scoped_refptr<Var>(new HostArrayBufferVar(binaryData)));
 
   if (!wait_for_receive_)
     return;
 
-  TrackedCallback::ClearAndRun(&receive_callback_, DoReceive());
+  receive_callback_->Run(DoReceive());
 }
 
 void PPB_WebSocket_Impl::didReceiveMessageError() {
   // Ignore error notification in invalid state.
   if (!InValidStateToReceive(state_))
     return;
 
   // Records the error, then stops receiving any frames after this error.
   // The error will be notified after all queued messages are read via
   // ReceiveMessage().
   error_was_received_ = true;
   if (!wait_for_receive_)
     return;
 
   // But, if no messages are queued and ReceiveMessage() is now on going.
   // We must invoke the callback with error code here.
   wait_for_receive_ = false;
   receive_callback_var_ = NULL;
-  TrackedCallback::ClearAndRun(&receive_callback_, PP_ERROR_FAILED);
+  receive_callback_->Run(PP_ERROR_FAILED);
 }
 
 void PPB_WebSocket_Impl::didUpdateBufferedAmount(
     unsigned long buffered_amount) {
   if (state_ == PP_WEBSOCKETREADYSTATE_CLOSED)
     return;
   buffered_amount_ = buffered_amount;
 }
 
 void PPB_WebSocket_Impl::didStartClosingHandshake() {
@@ skipping 21 matching lines @@
   // Handle state transition and invoking callback.
   DCHECK_NE(PP_WEBSOCKETREADYSTATE_CLOSED, state_);
   PP_WebSocketReadyState state = state_;
   state_ = PP_WEBSOCKETREADYSTATE_CLOSED;
 
   // User handlers may release WebSocket PP_Resource in the following
   // completion callbacks. Retain |this| here to assure that this object
   // keep on being valid in this function.
   scoped_refptr<PPB_WebSocket_Impl> retain_this(this);
   if (state == PP_WEBSOCKETREADYSTATE_CONNECTING)
-    TrackedCallback::ClearAndRun(&connect_callback_, PP_ERROR_FAILED);
+    connect_callback_->Run(PP_ERROR_FAILED);
 
   if (wait_for_receive_) {
     wait_for_receive_ = false;
     receive_callback_var_ = NULL;
-    TrackedCallback::ClearAndRun(&receive_callback_, PP_ERROR_FAILED);
+    receive_callback_->Run(PP_ERROR_FAILED);
   }
 
   if ((state == PP_WEBSOCKETREADYSTATE_CLOSING) && close_callback_.get())
-    TrackedCallback::ClearAndRun(&close_callback_, PP_OK);
+    close_callback_->Run(PP_OK);
 
   // Disconnect.
   if (websocket_.get())
     websocket_->disconnect();
 }
 
 int32_t PPB_WebSocket_Impl::DoReceive() {
   if (!receive_callback_var_)
     return PP_OK;
 
   *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