summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/file_chooser_resource.cc2
-rw-r--r--ppapi/proxy/flash_device_id_resource.cc2
-rw-r--r--ppapi/proxy/ppb_broker_proxy.cc2
-rw-r--r--ppapi/proxy/ppb_file_system_proxy.cc2
-rw-r--r--ppapi/proxy/ppb_flash_menu_proxy.cc2
-rw-r--r--ppapi/proxy/ppb_graphics_2d_proxy.cc4
-rw-r--r--ppapi/proxy/ppb_instance_proxy.cc2
-rw-r--r--ppapi/proxy/ppb_talk_private_proxy.cc2
-rw-r--r--ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc3
-rw-r--r--ppapi/proxy/ppb_url_loader_proxy.cc4
-rw-r--r--ppapi/proxy/printing_resource.cc2
-rw-r--r--ppapi/proxy/websocket_resource.cc8
12 files changed, 17 insertions, 18 deletions
diff --git a/ppapi/proxy/file_chooser_resource.cc b/ppapi/proxy/file_chooser_resource.cc
index 5c11012..6135aaa 100644
--- a/ppapi/proxy/file_chooser_resource.cc
+++ b/ppapi/proxy/file_chooser_resource.cc
@@ -118,7 +118,7 @@ void FileChooserResource::OnPluginMsgShowReply(
}
// Notify the plugin of the new data.
- TrackedCallback::ClearAndRun(&callback_, params.result());
+ callback_->Run(params.result());
// DANGER: May delete |this|!
}
diff --git a/ppapi/proxy/flash_device_id_resource.cc b/ppapi/proxy/flash_device_id_resource.cc
index d7174bd..493ebda 100644
--- a/ppapi/proxy/flash_device_id_resource.cc
+++ b/ppapi/proxy/flash_device_id_resource.cc
@@ -54,7 +54,7 @@ void FlashDeviceIDResource::OnPluginMsgGetDeviceIDReply(
else
*dest_ = PP_MakeUndefined();
dest_ = NULL;
- TrackedCallback::ClearAndRun(&callback_, params.result());
+ callback_->Run(params.result());
}
} // namespace proxy
diff --git a/ppapi/proxy/ppb_broker_proxy.cc b/ppapi/proxy/ppb_broker_proxy.cc
index 9800d32..f7818dc 100644
--- a/ppapi/proxy/ppb_broker_proxy.cc
+++ b/ppapi/proxy/ppb_broker_proxy.cc
@@ -108,7 +108,7 @@ void Broker::ConnectComplete(IPC::PlatformFileForTransit socket_handle,
return;
}
- TrackedCallback::ClearAndRun(&current_connect_callback_, result);
+ current_connect_callback_->Run(result);
}
PPB_Broker_Proxy::PPB_Broker_Proxy(Dispatcher* dispatcher)
diff --git a/ppapi/proxy/ppb_file_system_proxy.cc b/ppapi/proxy/ppb_file_system_proxy.cc
index 4619a1f..1d8747a 100644
--- a/ppapi/proxy/ppb_file_system_proxy.cc
+++ b/ppapi/proxy/ppb_file_system_proxy.cc
@@ -94,7 +94,7 @@ PP_FileSystemType FileSystem::GetType() {
}
void FileSystem::OpenComplete(int32_t result) {
- TrackedCallback::ClearAndRun(&current_open_callback_, result);
+ current_open_callback_->Run(result);
}
PPB_FileSystem_Proxy::PPB_FileSystem_Proxy(Dispatcher* dispatcher)
diff --git a/ppapi/proxy/ppb_flash_menu_proxy.cc b/ppapi/proxy/ppb_flash_menu_proxy.cc
index 9cc8d63..a499e51 100644
--- a/ppapi/proxy/ppb_flash_menu_proxy.cc
+++ b/ppapi/proxy/ppb_flash_menu_proxy.cc
@@ -70,7 +70,7 @@ int32_t FlashMenu::Show(const struct PP_Point* location,
void FlashMenu::ShowACK(int32_t selected_id, int32_t result) {
*selected_id_ptr_ = selected_id;
- TrackedCallback::ClearAndRun(&callback_, result);
+ callback_->Run(result);
}
PPB_Flash_Menu_Proxy::PPB_Flash_Menu_Proxy(Dispatcher* dispatcher)
diff --git a/ppapi/proxy/ppb_graphics_2d_proxy.cc b/ppapi/proxy/ppb_graphics_2d_proxy.cc
index 47abef9..23c90fc 100644
--- a/ppapi/proxy/ppb_graphics_2d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_2d_proxy.cc
@@ -65,7 +65,7 @@ class Graphics2D : public Resource, public thunk::PPB_Graphics2D_API {
float scale_;
// In the plugin, this is the current callback set for Flushes. When the
- // pointer is non-NULL, we're waiting for a flush ACK.
+ // callback is pending, we're waiting for a flush ACK.
scoped_refptr<TrackedCallback> current_flush_callback_;
DISALLOW_COPY_AND_ASSIGN(Graphics2D);
@@ -167,7 +167,7 @@ int32_t Graphics2D::Flush(scoped_refptr<TrackedCallback> callback,
}
void Graphics2D::FlushACK(int32_t result_code) {
- TrackedCallback::ClearAndRun(&current_flush_callback_, result_code);
+ current_flush_callback_->Run(result_code);
}
PPB_Graphics2D_Proxy::PPB_Graphics2D_Proxy(Dispatcher* dispatcher)
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 90a33f4..f8cd310 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -1171,7 +1171,7 @@ void PPB_Instance_Proxy::OnPluginMsgMouseLockComplete(PP_Instance instance,
NOTREACHED();
return;
}
- TrackedCallback::ClearAndRun(&(data->mouse_lock_callback), result);
+ data->mouse_lock_callback->Run(result);
}
void PPB_Instance_Proxy::MouseLockCompleteInHost(int32_t result,
diff --git a/ppapi/proxy/ppb_talk_private_proxy.cc b/ppapi/proxy/ppb_talk_private_proxy.cc
index 6297fa3..7c34185c 100644
--- a/ppapi/proxy/ppb_talk_private_proxy.cc
+++ b/ppapi/proxy/ppb_talk_private_proxy.cc
@@ -49,7 +49,7 @@ class Talk : public Resource, public thunk::PPB_Talk_Private_API {
}
void GotCompletion(int32_t result) {
- TrackedCallback::ClearAndRun(&callback_, result);
+ callback_->Run(result);
}
private:
diff --git a/ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc b/ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc
index 5e6557b..a98d4a7 100644
--- a/ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc
+++ b/ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc
@@ -78,8 +78,7 @@ void TCPServerSocket::OnAcceptCompleted(
}
tcp_socket_buffer_ = NULL;
- TrackedCallback::ClearAndRun(&accept_callback_,
- succeeded ? PP_OK : PP_ERROR_FAILED);
+ accept_callback_->Run(succeeded ? PP_OK : PP_ERROR_FAILED);
}
void TCPServerSocket::SendListen(const PP_NetAddress_Private& addr,
diff --git a/ppapi/proxy/ppb_url_loader_proxy.cc b/ppapi/proxy/ppb_url_loader_proxy.cc
index 5c2439e..9398671 100644
--- a/ppapi/proxy/ppb_url_loader_proxy.cc
+++ b/ppapi/proxy/ppb_url_loader_proxy.cc
@@ -351,11 +351,11 @@ void URLLoader::ReadResponseBodyAck(int32 result, const char* data) {
result = bytes_to_return;
}
- TrackedCallback::ClearAndRun(&current_callback_, result);
+ current_callback_->Run(result);
}
void URLLoader::CallbackComplete(int32_t result) {
- TrackedCallback::ClearAndRun(&current_callback_, result);
+ current_callback_->Run(result);
}
void URLLoader::PopBuffer(void* output_buffer, int32_t output_size) {
diff --git a/ppapi/proxy/printing_resource.cc b/ppapi/proxy/printing_resource.cc
index 6c1ae17..d9be3b7 100644
--- a/ppapi/proxy/printing_resource.cc
+++ b/ppapi/proxy/printing_resource.cc
@@ -50,7 +50,7 @@ void PrintingResource::OnPluginMsgGetDefaultPrintSettingsReply(
*settings_out = settings;
// Notify the plugin of the new data.
- TrackedCallback::ClearAndRun(&callback, params.result());
+ callback->Run(params.result());
// DANGER: May delete |this|!
}
diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc
index eb4176f..c45de90 100644
--- a/ppapi/proxy/websocket_resource.cc
+++ b/ppapi/proxy/websocket_resource.cc
@@ -371,7 +371,7 @@ void WebSocketResource::OnPluginMsgConnectReply(
protocol_ = new StringVar(protocol);
url_ = new StringVar(url);
}
- TrackedCallback::ClearAndRun(&connect_callback_, params.result());
+ connect_callback_->Run(params.result());
}
void WebSocketResource::OnPluginMsgCloseReply(
@@ -412,7 +412,7 @@ void WebSocketResource::OnPluginMsgReceiveTextReply(
if (!TrackedCallback::IsPending(receive_callback_))
return;
- TrackedCallback::ClearAndRun(&receive_callback_, DoReceive());
+ receive_callback_->Run(DoReceive());
}
void WebSocketResource::OnPluginMsgReceiveBinaryReply(
@@ -432,7 +432,7 @@ void WebSocketResource::OnPluginMsgReceiveBinaryReply(
if (!TrackedCallback::IsPending(receive_callback_))
return;
- TrackedCallback::ClearAndRun(&receive_callback_, DoReceive());
+ receive_callback_->Run(DoReceive());
}
void WebSocketResource::OnPluginMsgErrorReply(
@@ -445,7 +445,7 @@ void WebSocketResource::OnPluginMsgErrorReply(
// No more text or binary messages will be received. If there is ongoing
// ReceiveMessage(), we must invoke the callback with error code here.
receive_callback_var_ = NULL;
- TrackedCallback::ClearAndRun(&receive_callback_, PP_ERROR_FAILED);
+ receive_callback_->Run(PP_ERROR_FAILED);
}
void WebSocketResource::OnPluginMsgBufferedAmountReply(
generated by cgit v1.1 at 2025-03-22 04:37:44 +0000