Index: ppapi/cpp/dev/video_capture_dev.cc |
diff --git a/ppapi/cpp/dev/video_capture_dev.cc b/ppapi/cpp/dev/video_capture_dev.cc |
index 46fdb5973ca84873eee0cfef9e8a6f8877dcfff9..49d2741cc07e7ac80f074d7a1e319b976ea2d674 100644 |
--- a/ppapi/cpp/dev/video_capture_dev.cc |
+++ b/ppapi/cpp/dev/video_capture_dev.cc |
@@ -14,10 +14,6 @@ namespace pp { |
namespace { |
-template <> const char* interface_name<PPB_VideoCapture_Dev_0_2>() { |
- return PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2; |
-} |
- |
template <> const char* interface_name<PPB_VideoCapture_Dev_0_3>() { |
return PPB_VIDEOCAPTURE_DEV_INTERFACE_0_3; |
} |
@@ -28,9 +24,6 @@ VideoCapture_Dev::VideoCapture_Dev(const InstanceHandle& instance) { |
if (has_interface<PPB_VideoCapture_Dev_0_3>()) { |
PassRefFromConstructor(get_interface<PPB_VideoCapture_Dev_0_3>()->Create( |
instance.pp_instance())); |
- } else if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
- PassRefFromConstructor(get_interface<PPB_VideoCapture_Dev_0_2>()->Create( |
- instance.pp_instance())); |
} |
} |
@@ -43,8 +36,7 @@ VideoCapture_Dev::~VideoCapture_Dev() { |
// static |
bool VideoCapture_Dev::IsAvailable() { |
- return has_interface<PPB_VideoCapture_Dev_0_3>() || |
- has_interface<PPB_VideoCapture_Dev_0_2>(); |
+ return has_interface<PPB_VideoCapture_Dev_0_3>(); |
} |
int32_t VideoCapture_Dev::EnumerateDevices( |
@@ -54,20 +46,6 @@ int32_t VideoCapture_Dev::EnumerateDevices( |
pp_resource(), callback.output(), callback.pp_completion_callback()); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
- if (!callback.pp_completion_callback().func) |
- return callback.MayForce(PP_ERROR_BLOCKS_MAIN_THREAD); |
- |
- // ArrayOutputCallbackConverter is responsible to delete it. |
- ResourceArray_Dev::ArrayOutputCallbackData* data = |
- new ResourceArray_Dev::ArrayOutputCallbackData( |
- callback.output(), callback.pp_completion_callback()); |
- return get_interface<PPB_VideoCapture_Dev_0_2>()->EnumerateDevices( |
- pp_resource(), &data->resource_array_output, |
- PP_MakeCompletionCallback( |
- &ResourceArray_Dev::ArrayOutputCallbackConverter, data)); |
- } |
- |
return callback.MayForce(PP_ERROR_NOINTERFACE); |
} |
@@ -92,11 +70,6 @@ int32_t VideoCapture_Dev::Open( |
pp_resource(), device_ref.pp_resource(), &requested_info, buffer_count, |
callback.pp_completion_callback()); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
- return get_interface<PPB_VideoCapture_Dev_0_2>()->Open( |
- pp_resource(), device_ref.pp_resource(), &requested_info, buffer_count, |
- callback.pp_completion_callback()); |
- } |
return callback.MayForce(PP_ERROR_NOINTERFACE); |
} |
@@ -106,10 +79,6 @@ int32_t VideoCapture_Dev::StartCapture() { |
return get_interface<PPB_VideoCapture_Dev_0_3>()->StartCapture( |
pp_resource()); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
- return get_interface<PPB_VideoCapture_Dev_0_2>()->StartCapture( |
- pp_resource()); |
- } |
return PP_ERROR_NOINTERFACE; |
} |
@@ -119,10 +88,6 @@ int32_t VideoCapture_Dev::ReuseBuffer(uint32_t buffer) { |
return get_interface<PPB_VideoCapture_Dev_0_3>()->ReuseBuffer(pp_resource(), |
buffer); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
- return get_interface<PPB_VideoCapture_Dev_0_2>()->ReuseBuffer(pp_resource(), |
- buffer); |
- } |
return PP_ERROR_NOINTERFACE; |
} |
@@ -132,10 +97,6 @@ int32_t VideoCapture_Dev::StopCapture() { |
return get_interface<PPB_VideoCapture_Dev_0_3>()->StopCapture( |
pp_resource()); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
- return get_interface<PPB_VideoCapture_Dev_0_2>()->StopCapture( |
- pp_resource()); |
- } |
return PP_ERROR_NOINTERFACE; |
} |
@@ -143,8 +104,6 @@ int32_t VideoCapture_Dev::StopCapture() { |
void VideoCapture_Dev::Close() { |
if (has_interface<PPB_VideoCapture_Dev_0_3>()) { |
get_interface<PPB_VideoCapture_Dev_0_3>()->Close(pp_resource()); |
- } else if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
- get_interface<PPB_VideoCapture_Dev_0_2>()->Close(pp_resource()); |
} |
} |