Commit d2b678b4 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Clean up old Mojo types for mojom::ScopedAccessPermission

This CL cleans up old Mojo types for mojom::ScopedAccessPermission
with using PendingRemote and MakeSelfOwnedReceiver.

Bug: 955171
Change-Id: I6d5de865728ebc3f5ef18de9b6d3d75d1fe6b89c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1930534Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#718406}
parent e4924764
...@@ -18,7 +18,7 @@ namespace media { ...@@ -18,7 +18,7 @@ namespace media {
// cannot be posted back to. The mostly equivalent interface // cannot be posted back to. The mostly equivalent interface
// video_capture::mojom::VideoFrameHandler cannot be used by // video_capture::mojom::VideoFrameHandler cannot be used by
// VideoCaptureDeviceClient directly, because creating a // VideoCaptureDeviceClient directly, because creating a
// video_catpure::mojom::ScopedAccessPermissionPtr for passing into // video_catpure::mojom::ScopedAccessPermission for passing into
// OnFrameReadyInBuffer() requires a thread with a task runner. // OnFrameReadyInBuffer() requires a thread with a task runner.
class CAPTURE_EXPORT VideoFrameReceiver { class CAPTURE_EXPORT VideoFrameReceiver {
public: public:
......
...@@ -56,7 +56,8 @@ class MockVideoFrameHandler : public mojom::VideoFrameHandler { ...@@ -56,7 +56,8 @@ class MockVideoFrameHandler : public mojom::VideoFrameHandler {
const mojo::Receiver<mojom::VideoFrameHandler> video_frame_handler_; const mojo::Receiver<mojom::VideoFrameHandler> video_frame_handler_;
std::vector<int32_t> known_buffer_ids_; std::vector<int32_t> known_buffer_ids_;
bool should_store_access_permissions_; bool should_store_access_permissions_;
std::vector<mojom::ScopedAccessPermissionPtr> access_permissions_; std::vector<mojo::PendingRemote<mojom::ScopedAccessPermission>>
access_permissions_;
}; };
} // namespace video_capture } // namespace video_capture
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "services/video_capture/receiver_mojo_to_media_adapter.h" #include "services/video_capture/receiver_mojo_to_media_adapter.h"
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
#include "services/video_capture/scoped_access_permission_media_to_mojo_adapter.h" #include "services/video_capture/scoped_access_permission_media_to_mojo_adapter.h"
namespace video_capture { namespace video_capture {
...@@ -34,7 +34,7 @@ void ReceiverMojoToMediaAdapter::OnFrameReadyInBuffer( ...@@ -34,7 +34,7 @@ void ReceiverMojoToMediaAdapter::OnFrameReadyInBuffer(
access_permission, access_permission,
media::mojom::VideoFrameInfoPtr frame_info) { media::mojom::VideoFrameInfoPtr frame_info) {
mojo::PendingRemote<mojom::ScopedAccessPermission> access_permission_proxy; mojo::PendingRemote<mojom::ScopedAccessPermission> access_permission_proxy;
mojo::MakeStrongBinding<mojom::ScopedAccessPermission>( mojo::MakeSelfOwnedReceiver<mojom::ScopedAccessPermission>(
std::make_unique<ScopedAccessPermissionMediaToMojoAdapter>( std::make_unique<ScopedAccessPermissionMediaToMojoAdapter>(
std::move(access_permission)), std::move(access_permission)),
access_permission_proxy.InitWithNewPipeAndPassReceiver()); access_permission_proxy.InitWithNewPipeAndPassReceiver());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment