summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_var_deprecated_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 17:16:28 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 17:16:28 +0000
commit799d1ab53ba8071db7a718ae6317d8701f393b18 (patch)
treeb18153f14faa2726cd4c23c73b46be872bf917a0 /ppapi/proxy/ppb_var_deprecated_proxy.cc
parent4d420efaaa2bdcb502596ef01ee217d0ea1d0256 (diff)
downloadchromium_src-799d1ab53ba8071db7a718ae6317d8701f393b18.zip
chromium_src-799d1ab53ba8071db7a718ae6317d8701f393b18.tar.gz
chromium_src-799d1ab53ba8071db7a718ae6317d8701f393b18.tar.bz2
Random updates for all added proxy interfaces I've done in the past week.
TEST=none BUG=none Review URL: http://codereview.chromium.org/4609001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_var_deprecated_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_var_deprecated_proxy.cc43
1 files changed, 22 insertions, 21 deletions
diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc
index 8b5aff3..42abbc7 100644
--- a/ppapi/proxy/ppb_var_deprecated_proxy.cc
+++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc
@@ -11,7 +11,6 @@
#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb_core.h"
#include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/ppapi_message_helpers.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/ppp_class_proxy.h"
#include "ppapi/proxy/serialized_var.h"
@@ -57,14 +56,14 @@ bool HasProperty(PP_Var var,
PP_Var* exception) {
Dispatcher* dispatcher = PluginDispatcher::Get();
ReceiveSerializedException se(dispatcher, exception);
- bool result = false;
+ PP_Bool result = PP_FALSE;
if (!se.IsThrown()) {
dispatcher->Send(new PpapiHostMsg_PPBVar_HasProperty(
INTERFACE_ID_PPB_VAR_DEPRECATED,
SerializedVarSendInput(dispatcher, var),
SerializedVarSendInput(dispatcher, name), &se, &result));
}
- return result;
+ return PPBoolToBool(result);
}
bool HasMethod(PP_Var var,
@@ -72,14 +71,14 @@ bool HasMethod(PP_Var var,
PP_Var* exception) {
Dispatcher* dispatcher = PluginDispatcher::Get();
ReceiveSerializedException se(dispatcher, exception);
- bool result = false;
+ PP_Bool result = PP_FALSE;
if (!se.IsThrown()) {
dispatcher->Send(new PpapiHostMsg_PPBVar_HasMethodDeprecated(
INTERFACE_ID_PPB_VAR_DEPRECATED,
SerializedVarSendInput(dispatcher, var),
SerializedVarSendInput(dispatcher, name), &se, &result));
}
- return result;
+ return PPBoolToBool(result);
}
PP_Var GetProperty(PP_Var var,
@@ -134,7 +133,7 @@ void RemoveProperty(PP_Var var,
PP_Var* exception) {
Dispatcher* dispatcher = PluginDispatcher::Get();
ReceiveSerializedException se(dispatcher, exception);
- bool result = false;
+ PP_Bool result = PP_FALSE;
if (!se.IsThrown()) {
dispatcher->Send(new PpapiHostMsg_PPBVar_DeleteProperty(
INTERFACE_ID_PPB_VAR_DEPRECATED,
@@ -184,9 +183,9 @@ PP_Var Construct(PP_Var object,
}
bool IsInstanceOf(PP_Var var,
- const PPP_Class_Deprecated* ppp_class,
- void** ppp_class_data) {
- bool result = false;
+ const PPP_Class_Deprecated* ppp_class,
+ void** ppp_class_data) {
+ PP_Bool result = PP_FALSE;
Dispatcher* dispatcher = PluginDispatcher::Get();
int64 class_int = static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class));
int64 class_data_int = 0;
@@ -195,7 +194,7 @@ bool IsInstanceOf(PP_Var var,
class_int, &class_data_int, &result));
*ppp_class_data =
reinterpret_cast<void*>(static_cast<intptr_t>(class_data_int));
- return result;
+ return PPBoolToBool(result);
}
PP_Var CreateObject(PP_Module module_id,
@@ -278,20 +277,22 @@ void PPB_Var_Deprecated_Proxy::OnMsgHasProperty(
SerializedVarReceiveInput var,
SerializedVarReceiveInput name,
SerializedVarOutParam exception,
- bool* result) {
- *result = ppb_var_target()->HasProperty(var.Get(dispatcher()),
- name.Get(dispatcher()),
- exception.OutParam(dispatcher()));
+ PP_Bool* result) {
+ *result = BoolToPPBool(ppb_var_target()->HasProperty(
+ var.Get(dispatcher()),
+ name.Get(dispatcher()),
+ exception.OutParam(dispatcher())));
}
void PPB_Var_Deprecated_Proxy::OnMsgHasMethodDeprecated(
SerializedVarReceiveInput var,
SerializedVarReceiveInput name,
SerializedVarOutParam exception,
- bool* result) {
- *result = ppb_var_target()->HasMethod(var.Get(dispatcher()),
- name.Get(dispatcher()),
- exception.OutParam(dispatcher()));
+ PP_Bool* result) {
+ *result = BoolToPPBool(ppb_var_target()->HasMethod(
+ var.Get(dispatcher()),
+ name.Get(dispatcher()),
+ exception.OutParam(dispatcher())));
}
void PPB_Var_Deprecated_Proxy::OnMsgGetProperty(
@@ -328,13 +329,13 @@ void PPB_Var_Deprecated_Proxy::OnMsgDeleteProperty(
SerializedVarReceiveInput var,
SerializedVarReceiveInput name,
SerializedVarOutParam exception,
- bool* result) {
+ PP_Bool* result) {
ppb_var_target()->RemoveProperty(var.Get(dispatcher()),
name.Get(dispatcher()),
exception.OutParam(dispatcher()));
// This deprecated function doesn't actually return a value, but we re-use
// the message from the non-deprecated interface with the return value.
- *result = true;
+ *result = PP_TRUE;
}
void PPB_Var_Deprecated_Proxy::OnMsgCallDeprecated(
@@ -368,7 +369,7 @@ void PPB_Var_Deprecated_Proxy::OnMsgIsInstanceOfDeprecated(
pp::proxy::SerializedVarReceiveInput var,
int64 ppp_class,
int64* ppp_class_data,
- bool* result) {
+ PP_Bool* result) {
// TODO(brettw) write this.
}