Index: ppapi/c/ppb_instance.h |
=================================================================== |
--- ppapi/c/ppb_instance.h (revision 65116) |
+++ ppapi/c/ppb_instance.h (working copy) |
@@ -5,11 +5,12 @@ |
#ifndef PPAPI_C_PPB_INSTANCE_H_ |
#define PPAPI_C_PPB_INSTANCE_H_ |
+#include "ppapi/c/pp_bool.h" |
#include "ppapi/c/pp_instance.h" |
#include "ppapi/c/pp_resource.h" |
#include "ppapi/c/pp_var.h" |
-#define PPB_INSTANCE_INTERFACE "PPB_Instance;0.1" |
+#define PPB_INSTANCE_INTERFACE "PPB_Instance;0.2" |
/** |
* @file |
@@ -33,7 +34,7 @@ |
* |
* You can pass a NULL resource as the device parameter to unbind all |
* devices from the given instance. The instance will then appear |
- * transparent. Re-binding the same device will return true and will do |
+ * transparent. Re-binding the same device will return PP_TRUE and will do |
* nothing. Unbinding a device will drop any pending flush callbacks. |
* |
* Any previously-bound device will be Release()d. It is an error to bind |
@@ -41,7 +42,7 @@ |
* to move a device between instances, first unbind it from the old one, and |
* then rebind it to the new one. |
* |
- * Returns true if the bind was successful. False means the device was not |
+ * Returns PP_TRUE if the bind was successful. False means the device was not |
* the correct type. On success, a reference to the device will be held by |
* the plugin instance, so the caller can release its reference if it |
* chooses. |
@@ -49,15 +50,15 @@ |
* Binding a device will invalidate that portion of the web page to flush the |
* contents of the new device to the screen. |
*/ |
- bool (*BindGraphics)(PP_Instance instance, PP_Resource device); |
+ PP_Bool (*BindGraphics)(PP_Instance instance, PP_Resource device); |
/** |
- * Returns true if the instance is full-frame. Such a plugin represents the |
- * entire document in a frame rather than an embedded resource. This can |
+ * Returns PP_TRUE if the instance is full-frame. Such a plugin represents |
+ * the entire document in a frame rather than an embedded resource. This can |
* happen if the user does a top level navigation or the page specifies an |
* iframe to a resource with a MIME type registered by the plugin. |
*/ |
- bool (*IsFullFrame)(PP_Instance instance); |
+ PP_Bool (*IsFullFrame)(PP_Instance instance); |
/** |
* Executes the given script in the context of the frame containing the |
@@ -78,8 +79,9 @@ |
* @return The result of the script execution, |
* or a "void" var if execution failed. |
*/ |
- PP_Var (*ExecuteScript)(PP_Instance instance, PP_Var script, |
- PP_Var* exception); |
+ struct PP_Var (*ExecuteScript)(PP_Instance instance, |
+ struct PP_Var script, |
+ struct PP_Var* exception); |
}; |
/** |