Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: webkit/plugins/ppapi/ppb_video_capture_impl.cc

Issue 10837064: Corresponding change in Pepper since EnumerateDevices contract is changed. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/ppapi/ppb_video_capture_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_video_capture_impl.cc (revision 148913)
+++ webkit/plugins/ppapi/ppb_video_capture_impl.cc (working copy)
@@ -184,13 +184,25 @@
devices_ = devices;
enumerate_devices_callback_ = callback;
- instance->delegate()->EnumerateDevices(
+ enumeration_request_id_ = instance->delegate()->EnumerateDevices(
PP_DEVICETYPE_DEV_VIDEOCAPTURE,
base::Bind(&PPB_VideoCapture_Impl::EnumerateDevicesCallbackFunc,
AsWeakPtr()));
return PP_OK_COMPLETIONPENDING;
}
+int32_t PPB_VideoCapture_Impl::InternalStopEnumerateDevices(
+ PP_Resource* devices) {
+ PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
+ if (!instance)
+ return PP_ERROR_FAILED;
+
+ if (devices_ == devices) {
+ instance->delegate()->StopEnumerateDevices(enumeration_request_id_);
+ }
+ return PP_OK;
+}
+
int32_t PPB_VideoCapture_Impl::InternalOpen(
const std::string& device_id,
const PP_VideoCaptureDeviceInfo_Dev& requested_info,
« ppapi/shared_impl/ppb_audio_input_shared.cc ('K') | « webkit/plugins/ppapi/ppb_video_capture_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698