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 4fc11d5f16a7307d8b26d17d6a2744a72f1f4772..3aa234fcefd9d14f4a8a61b25ddd9dc2d4fee732 100644 |
--- a/ppapi/cpp/dev/video_capture_dev.cc |
+++ b/ppapi/cpp/dev/video_capture_dev.cc |
@@ -18,28 +18,17 @@ 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_1>() { |
- return PPB_VIDEOCAPTURE_DEV_INTERFACE_0_1; |
-} |
- |
} // namespace |
-VideoCapture_Dev::VideoCapture_Dev(const InstanceHandle& instance) |
- : requested_info_(), |
- buffer_count_(0) { |
+VideoCapture_Dev::VideoCapture_Dev(const InstanceHandle& instance) { |
if (has_interface<PPB_VideoCapture_Dev_0_2>()) { |
PassRefFromConstructor(get_interface<PPB_VideoCapture_Dev_0_2>()->Create( |
instance.pp_instance())); |
- } else if (has_interface<PPB_VideoCapture_Dev_0_1>()) { |
- PassRefFromConstructor(get_interface<PPB_VideoCapture_Dev_0_1>()->Create( |
- instance.pp_instance())); |
} |
} |
VideoCapture_Dev::VideoCapture_Dev(PP_Resource resource) |
- : Resource(resource), |
- requested_info_(), |
- buffer_count_(0) { |
+ : Resource(resource) { |
} |
VideoCapture_Dev::~VideoCapture_Dev() { |
@@ -47,8 +36,7 @@ VideoCapture_Dev::~VideoCapture_Dev() { |
// static |
bool VideoCapture_Dev::IsAvailable() { |
- return has_interface<PPB_VideoCapture_Dev_0_2>() || |
- has_interface<PPB_VideoCapture_Dev_0_1>(); |
+ return has_interface<PPB_VideoCapture_Dev_0_2>(); |
} |
int32_t VideoCapture_Dev::EnumerateDevices( |
@@ -79,15 +67,6 @@ int32_t VideoCapture_Dev::Open( |
callback.pp_completion_callback()); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_1>()) { |
- if (device_ref.is_null()) { |
- requested_info_ = requested_info; |
- buffer_count_ = buffer_count; |
- return callback.MayForce(PP_OK); |
- } |
- return callback.MayForce(PP_ERROR_NOTSUPPORTED); |
- } |
- |
return callback.MayForce(PP_ERROR_NOINTERFACE); |
} |
@@ -97,11 +76,6 @@ int32_t VideoCapture_Dev::StartCapture() { |
pp_resource()); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_1>()) { |
- return get_interface<PPB_VideoCapture_Dev_0_1>()->StartCapture( |
- pp_resource(), &requested_info_, buffer_count_); |
- } |
- |
return PP_ERROR_NOINTERFACE; |
} |
@@ -111,11 +85,6 @@ int32_t VideoCapture_Dev::ReuseBuffer(uint32_t buffer) { |
buffer); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_1>()) { |
- return get_interface<PPB_VideoCapture_Dev_0_1>()->ReuseBuffer(pp_resource(), |
- buffer); |
- } |
- |
return PP_ERROR_NOINTERFACE; |
} |
@@ -125,11 +94,6 @@ int32_t VideoCapture_Dev::StopCapture() { |
pp_resource()); |
} |
- if (has_interface<PPB_VideoCapture_Dev_0_1>()) { |
- return get_interface<PPB_VideoCapture_Dev_0_1>()->StopCapture( |
- pp_resource()); |
- } |
- |
return PP_ERROR_NOINTERFACE; |
} |