summaryrefslogtreecommitdiffstats
path: root/ppapi/c/ppb_image_data.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 05:33:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 05:33:20 +0000
commit7ca87c2179917c73feae2f6183d2536dd6690623 (patch)
treee4bf36cdd3bb3045f82d1d921f760d70b7dc73d5 /ppapi/c/ppb_image_data.h
parent187c54919b3af4cd6dec23d9ea3c1547417fe7be (diff)
downloadchromium_src-7ca87c2179917c73feae2f6183d2536dd6690623.zip
chromium_src-7ca87c2179917c73feae2f6183d2536dd6690623.tar.gz
chromium_src-7ca87c2179917c73feae2f6183d2536dd6690623.tar.bz2
Add an instance parameter to var objects, audio, and the 2D API. This replaces the module in most cases.
This will be used in the proxy to multiplex one plugin across multiple renderer processes. We need the instance in the proxy to know which process to send it to. I added a deprecated var object creation function for native client, which depends on the module and this is very difficult to change. Because it doesn't have the multiplexing requirements, this is fine for now. TEST=ppapi ui tests BUG=none Review URL: http://codereview.chromium.org/6085009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c/ppb_image_data.h')
-rw-r--r--ppapi/c/ppb_image_data.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h
index e1fe5d0..27fbbc0 100644
--- a/ppapi/c/ppb_image_data.h
+++ b/ppapi/c/ppb_image_data.h
@@ -6,6 +6,7 @@
#define PPAPI_C_PPB_IMAGE_DATA_H_
#include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_macros.h"
#include "ppapi/c/pp_module.h"
#include "ppapi/c/pp_resource.h"
@@ -31,7 +32,7 @@ struct PP_ImageDataDesc {
};
PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16);
-#define PPB_IMAGEDATA_INTERFACE "PPB_ImageData;0.2"
+#define PPB_IMAGEDATA_INTERFACE "PPB_ImageData;0.3"
/**
* @file
@@ -58,7 +59,7 @@ struct PPB_ImageData {
/**
* Allocates an image data resource with the given format and size. The
* return value will have a nonzero ID on success, or zero on failure.
- * Failure means the module handle, image size, or format was invalid.
+ * Failure means the instance, image size, or format was invalid.
*
* Set the init_to_zero flag if you want the bitmap initialized to
* transparent during the creation process. If this flag is not set, the
@@ -69,7 +70,7 @@ struct PPB_ImageData {
* memory, but may contain data from a previous image produced by the same
* plugin if the bitmap was cached and re-used.
*/
- PP_Resource (*Create)(PP_Module module,
+ PP_Resource (*Create)(PP_Instance instance,
PP_ImageDataFormat format,
const struct PP_Size* size,
PP_Bool init_to_zero);