Index: ppapi/proxy/ppp_class_proxy.h |
diff --git a/ppapi/proxy/ppp_class_proxy.h b/ppapi/proxy/ppp_class_proxy.h |
index f890b3ddf44ad20fc74dddae58e37fd11225bd31..c70b564367e3f6ef037f7a9f4a368148c22e1054 100644 |
--- a/ppapi/proxy/ppp_class_proxy.h |
+++ b/ppapi/proxy/ppp_class_proxy.h |
@@ -5,9 +5,11 @@ |
#ifndef PPAPI_PROXY_PPP_CLASS_PROXY_H_ |
#define PPAPI_PROXY_PPP_CLASS_PROXY_H_ |
+#include <stdint.h> |
+ |
#include <vector> |
-#include "base/basictypes.h" |
+#include "base/macros.h" |
#include "ppapi/c/pp_instance.h" |
#include "ppapi/c/pp_var.h" |
#include "ppapi/proxy/interface_proxy.h" |
@@ -39,56 +41,64 @@ class PPP_Class_Proxy : public InterfaceProxy { |
static PP_Var CreateProxiedObject(const PPB_Var_Deprecated* var, |
Dispatcher* dispatcher, |
PP_Instance instance_id, |
- int64 ppp_class, |
- int64 class_data); |
+ int64_t ppp_class, |
+ int64_t class_data); |
static PP_Bool IsInstanceOf(const PPB_Var_Deprecated* ppb_var_impl, |
const PP_Var& var, |
- int64 ppp_class, |
- int64* ppp_class_data); |
+ int64_t ppp_class, |
+ int64_t* ppp_class_data); |
// InterfaceProxy implementation. |
virtual bool OnMessageReceived(const IPC::Message& msg); |
private: |
// IPC message handlers. |
- void OnMsgHasProperty(int64 ppp_class, int64 object, |
+ void OnMsgHasProperty(int64_t ppp_class, |
+ int64_t object, |
SerializedVarReceiveInput property, |
SerializedVarOutParam exception, |
bool* result); |
- void OnMsgHasMethod(int64 ppp_class, int64 object, |
+ void OnMsgHasMethod(int64_t ppp_class, |
+ int64_t object, |
SerializedVarReceiveInput property, |
SerializedVarOutParam exception, |
bool* result); |
- void OnMsgGetProperty(int64 ppp_class, int64 object, |
+ void OnMsgGetProperty(int64_t ppp_class, |
+ int64_t object, |
SerializedVarReceiveInput property, |
SerializedVarOutParam exception, |
SerializedVarReturnValue result); |
- void OnMsgEnumerateProperties( |
- int64 ppp_class, int64 object, |
- std::vector<SerializedVar>* props, |
- SerializedVarOutParam exception); |
- void OnMsgSetProperty(int64 ppp_class, int64 object, |
+ void OnMsgEnumerateProperties(int64_t ppp_class, |
+ int64_t object, |
+ std::vector<SerializedVar>* props, |
+ SerializedVarOutParam exception); |
+ void OnMsgSetProperty(int64_t ppp_class, |
+ int64_t object, |
SerializedVarReceiveInput property, |
SerializedVarReceiveInput value, |
SerializedVarOutParam exception); |
- void OnMsgRemoveProperty(int64 ppp_class, int64 object, |
+ void OnMsgRemoveProperty(int64_t ppp_class, |
+ int64_t object, |
SerializedVarReceiveInput property, |
SerializedVarOutParam exception); |
- void OnMsgCall(int64 ppp_class, int64 object, |
+ void OnMsgCall(int64_t ppp_class, |
+ int64_t object, |
SerializedVarReceiveInput method_name, |
SerializedVarVectorReceiveInput arg_vector, |
SerializedVarOutParam exception, |
SerializedVarReturnValue result); |
- void OnMsgConstruct(int64 ppp_class, int64 object, |
+ void OnMsgConstruct(int64_t ppp_class, |
+ int64_t object, |
SerializedVarVectorReceiveInput arg_vector, |
SerializedVarOutParam exception, |
SerializedVarReturnValue result); |
- void OnMsgDeallocate(int64 ppp_class, int64 object); |
+ void OnMsgDeallocate(int64_t ppp_class, int64_t object); |
// Returns true if the given class/data points to a plugin-implemented |
// object. On failure, the exception, if non-NULL, will also be set. |
- bool ValidateUserData(int64 ppp_class, int64 class_data, |
+ bool ValidateUserData(int64_t ppp_class, |
+ int64_t class_data, |
SerializedVarOutParam* exception); |
DISALLOW_COPY_AND_ASSIGN(PPP_Class_Proxy); |