| Index: ppapi/shared_impl/ppb_video_capture_shared.h
|
| ===================================================================
|
| --- ppapi/shared_impl/ppb_video_capture_shared.h (revision 148913)
|
| +++ ppapi/shared_impl/ppb_video_capture_shared.h (working copy)
|
| @@ -30,6 +30,7 @@
|
| virtual int32_t EnumerateDevices(
|
| PP_Resource* devices,
|
| scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| + virtual int32_t StopEnumerateDevices(PP_Resource* devices) OVERRIDE;
|
| virtual int32_t Open(const std::string& device_id,
|
| const PP_VideoCaptureDeviceInfo_Dev& requested_info,
|
| uint32_t buffer_count,
|
| @@ -59,6 +60,7 @@
|
| virtual int32_t InternalEnumerateDevices(
|
| PP_Resource* devices,
|
| scoped_refptr<TrackedCallback> callback) = 0;
|
| + virtual int32_t InternalStopEnumerateDevices(PP_Resource* devices) = 0;
|
| virtual int32_t InternalOpen(
|
| const std::string& device_id,
|
| const PP_VideoCaptureDeviceInfo_Dev& requested_info,
|
| @@ -86,8 +88,9 @@
|
| scoped_refptr<TrackedCallback> open_callback_;
|
|
|
| // Output parameter of EnumerateDevices(). It should not be accessed after
|
| - // |enumerate_devices_callback_| is run.
|
| + // StopEnumerateDevices is called.
|
| PP_Resource* devices_;
|
| + int enumeration_request_id_;
|
|
|
| ResourceObjectType resource_object_type_;
|
|
|
|
|