diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc b/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc index 2a1682941ce..650f0da130d 100644 --- a/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc +++ b/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc @@ -148,10 +148,10 @@ class VideoCaptureImplTest : public ::testing::Test { void(const Vector<media::VideoCaptureFormat>&)); void StartCapture(int client_id, const media::VideoCaptureParams& params) { - const auto state_update_callback = base::Bind( + const auto state_update_callback = WTF::BindRepeating( &VideoCaptureImplTest::OnStateUpdate, base::Unretained(this)); - const auto frame_ready_callback = - base::Bind(&VideoCaptureImplTest::OnFrameReady, base::Unretained(this)); + const auto frame_ready_callback = WTF::BindRepeating( + &VideoCaptureImplTest::OnFrameReady, base::Unretained(this)); video_capture_impl_->StartCapture(client_id, params, state_update_callback, frame_ready_callback); @@ -199,8 +199,8 @@ class VideoCaptureImplTest : public ::testing::Test { info->timestamp = now - base::TimeTicks(); info->pixel_format = pixel_format; - info->coded_size = WebSize(size); - info->visible_rect = WebRect(gfx::Rect(size)); + info->coded_size = size; + info->visible_rect = gfx::Rect(size); info->color_space = gfx::ColorSpace(); video_capture_impl_->OnBufferReady(buffer_id, std::move(info)); @@ -211,17 +211,14 @@ class VideoCaptureImplTest : public ::testing::Test { } void GetDeviceSupportedFormats() { - const base::Callback<void(const Vector<media::VideoCaptureFormat>&)> - callback = base::Bind(&VideoCaptureImplTest::OnDeviceSupportedFormats, - base::Unretained(this)); - video_capture_impl_->GetDeviceSupportedFormats(callback); + video_capture_impl_->GetDeviceSupportedFormats( + WTF::Bind(&VideoCaptureImplTest::OnDeviceSupportedFormats, + base::Unretained(this))); } void GetDeviceFormatsInUse() { - const base::Callback<void(const Vector<media::VideoCaptureFormat>&)> - callback = base::Bind(&VideoCaptureImplTest::OnDeviceFormatsInUse, - base::Unretained(this)); - video_capture_impl_->GetDeviceFormatsInUse(callback); + video_capture_impl_->GetDeviceFormatsInUse(WTF::Bind( + &VideoCaptureImplTest::OnDeviceFormatsInUse, base::Unretained(this))); } void OnStateChanged(media::mojom::VideoCaptureState state) { |