Chromium Code Reviews| Index: ppapi/api/private/ppb_image_capture_private.idl |
| diff --git a/ppapi/api/private/ppb_image_capture_private.idl b/ppapi/api/private/ppb_image_capture_private.idl |
| index 28432af5ddea1018e1e6f50ffd1077975df2f703..bbc3f9e05b69fcef2eb5beeb9f19eb3caf7fda00 100644 |
| --- a/ppapi/api/private/ppb_image_capture_private.idl |
| +++ b/ppapi/api/private/ppb_image_capture_private.idl |
| @@ -11,7 +11,7 @@ |
| [generate_thunk] |
| label Chrome { |
| - M39 = 0.1 |
| + M42 = 0.1 |
|
dmichael (off chromium)
2015/02/03 19:21:29
Maybe best to just leave this file alone if we're
dmichael (off chromium)
2015/02/03 19:33:17
Nevermind
|
| }; |
| /** |
| @@ -102,23 +102,11 @@ interface PPB_ImageCapture_Private { |
| * |
| * @param[in] instance A <code>PP_Instance</code> identifying one instance |
| * of a module. |
| - * @param[in] camera_source_id A <code>PP_Var</code> identifying a camera |
| - * source. The type is string. The ID can be obtained from |
| - * MediaStreamTrack.getSources() or MediaStreamVideoTrack.id. If a |
| - * MediaStreamVideoTrack is associated with the same source and the track |
| - * is closed, this PPB_ImageCapture_Private object can still do image capture. |
| - * @param[in] error_callback A <code>PPB_ImageCapture_Private_ErrorCallback |
| - * </code> callback to indicate the image capture has failed. |
| - * @param[inout] user_data An opaque pointer that will be passed to the |
| - * callbacks of PPB_ImageCapture_Private. |
| * |
| * @return A <code>PP_Resource</code> corresponding to a |
| * PPB_ImageCapture_Private resource if successful, 0 if failed. |
| */ |
| - PP_Resource Create([in] PP_Instance instance, |
| - [in] PP_Var camera_source_id, |
| - [in] PPB_ImageCapture_Private_ErrorCallback error_callback, |
| - [inout] mem_t user_data); |
| + PP_Resource Create([in] PP_Instance instance); |
| /** |
| * Determines if a resource is an image capture resource. |
| @@ -132,6 +120,26 @@ interface PPB_ImageCapture_Private { |
| PP_Bool IsImageCapture([in] PP_Resource resource); |
| /** |
| + * Opens a video capture device. |
| + * |
| + * @param[in] image_capture A <code>PP_Resource</code> corresponding to an |
| + * image capture resource. |
| + * @param[in] device_id A <code>PP_Var</code> identifying a camera device. The |
| + * type is string. The ID can be obtained from MediaStreamTrack.getSources() |
| + * or MediaStreamVideoTrack.id. If a MediaStreamVideoTrack is associated with |
| + * the same source and the track is closed, this PPB_ImageCapture_Private |
| + * object can still do image capture. |
| + * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon |
| + * completion of <code>Open()</code>. |
| + * |
| + * @return An error code from <code>pp_errors.h</code>. |
| + */ |
| + int32_t Open( |
| + [in] PP_Resource image_capture, |
| + [in] PP_Var device_id, |
| + [in] PP_CompletionCallback callback); |
| + |
| + /** |
| * Disconnects from the camera and cancels all pending capture requests. |
| * After this returns, no callbacks will be called. If <code> |
| * PPB_ImageCapture_Private</code> is destroyed and is not closed yet, this |
| @@ -140,13 +148,8 @@ interface PPB_ImageCapture_Private { |
| * |
| * @param[in] image_capture A <code>PP_Resource</code> corresponding to an |
| * image capture resource. |
| - * @param[in] callback <code>PP_CompletionCallback</code> to be called upon |
| - * completion of <code>Close()</code>. |
| - * |
| - * @return An int32_t containing a result code from <code>pp_errors.h</code>. |
| */ |
| - int32_t Close([in] PP_Resource resource, |
| - [in] PP_CompletionCallback callback); |
| + void Close([in] PP_Resource image_capture); |
| /** |
| * Sets the configuration of the image capture. |