| Index: content/renderer/pepper/pepper_platform_video_capture_impl.cc
|
| diff --git a/content/renderer/pepper/pepper_platform_video_capture_impl.cc b/content/renderer/pepper/pepper_platform_video_capture_impl.cc
|
| index c688d3ddeae5a06de969f1fe3e7ca301ecee6b05..35bfd584e2141a919c121120baed7d3710151e22 100644
|
| --- a/content/renderer/pepper/pepper_platform_video_capture_impl.cc
|
| +++ b/content/renderer/pepper/pepper_platform_video_capture_impl.cc
|
| @@ -42,17 +42,6 @@ PepperPlatformVideoCaptureImpl::PepperPlatformVideoCaptureImpl(
|
| }
|
| }
|
|
|
| -PepperPlatformVideoCaptureImpl::~PepperPlatformVideoCaptureImpl() {
|
| - if (video_capture_) {
|
| - VideoCaptureImplManager* manager =
|
| - RenderThreadImpl::current()->video_capture_impl_manager();
|
| - manager->RemoveDevice(session_id_, handler_proxy_.get());
|
| - }
|
| -
|
| - if (plugin_delegate_ && !label_.empty())
|
| - plugin_delegate_->CloseDevice(label_);
|
| -}
|
| -
|
| void PepperPlatformVideoCaptureImpl::StartCapture(
|
| media::VideoCapture::EventHandler* handler,
|
| const media::VideoCaptureCapability& capability) {
|
| @@ -155,6 +144,17 @@ void PepperPlatformVideoCaptureImpl::OnDeviceInfoReceived(
|
| handler_->OnDeviceInfoReceived(capture, device_info);
|
| }
|
|
|
| +PepperPlatformVideoCaptureImpl::~PepperPlatformVideoCaptureImpl() {
|
| + if (video_capture_) {
|
| + VideoCaptureImplManager* manager =
|
| + RenderThreadImpl::current()->video_capture_impl_manager();
|
| + manager->RemoveDevice(session_id_, handler_proxy_.get());
|
| + }
|
| +
|
| + if (plugin_delegate_ && !label_.empty())
|
| + plugin_delegate_->CloseDevice(label_);
|
| +}
|
| +
|
| void PepperPlatformVideoCaptureImpl::Initialize() {
|
| VideoCaptureImplManager* manager =
|
| RenderThreadImpl::current()->video_capture_impl_manager();
|
|
|