Commit a74582d9 authored by Mario Sanchez Prada's avatar Mario Sanchez Prada Committed by Commit Bot

Migrate references of blink::mojom::SurfaceEmbedder to new Mojo types

Convert the couple of references of the blink::mojom::SurfaceEmbedder
interface inside of Blink.

Bug: 955171, 978694
Change-Id: I326ae1e5537e0670dd3346b57ceff705f61be6ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1837611Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#702754}
parent 9f5364be
...@@ -325,7 +325,7 @@ void VideoFrameSubmitter::StartSubmitting() { ...@@ -325,7 +325,7 @@ void VideoFrameSubmitter::StartSubmitting() {
mojo::MakeRequest(&compositor_frame_sink_)); mojo::MakeRequest(&compositor_frame_sink_));
if (!surface_embedder_.is_bound()) { if (!surface_embedder_.is_bound()) {
provider->ConnectToEmbedder(frame_sink_id_, provider->ConnectToEmbedder(frame_sink_id_,
mojo::MakeRequest(&surface_embedder_)); surface_embedder_.BindNewPipeAndPassReceiver());
} else { } else {
GenerateNewSurfaceId(); GenerateNewSurfaceId();
} }
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "components/viz/common/resources/shared_bitmap.h" #include "components/viz/common/resources/shared_bitmap.h"
#include "components/viz/common/surfaces/child_local_surface_id_allocator.h" #include "components/viz/common/surfaces/child_local_surface_id_allocator.h"
#include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/system/buffer.h" #include "mojo/public/cpp/system/buffer.h"
#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h" #include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
#include "services/viz/public/mojom/compositing/frame_timing_details.mojom-blink.h" #include "services/viz/public/mojom/compositing/frame_timing_details.mojom-blink.h"
...@@ -132,7 +133,7 @@ class PLATFORM_EXPORT VideoFrameSubmitter ...@@ -132,7 +133,7 @@ class PLATFORM_EXPORT VideoFrameSubmitter
cc::VideoFrameProvider* video_frame_provider_ = nullptr; cc::VideoFrameProvider* video_frame_provider_ = nullptr;
scoped_refptr<viz::RasterContextProvider> context_provider_; scoped_refptr<viz::RasterContextProvider> context_provider_;
viz::mojom::blink::CompositorFrameSinkPtr compositor_frame_sink_; viz::mojom::blink::CompositorFrameSinkPtr compositor_frame_sink_;
mojom::blink::SurfaceEmbedderPtr surface_embedder_; mojo::Remote<mojom::blink::SurfaceEmbedder> surface_embedder_;
mojo::Receiver<viz::mojom::blink::CompositorFrameSinkClient> receiver_{this}; mojo::Receiver<viz::mojom::blink::CompositorFrameSinkClient> receiver_{this};
WebContextProviderCallback context_provider_callback_; WebContextProviderCallback context_provider_callback_;
std::unique_ptr<VideoFrameResourceProvider> resource_provider_; std::unique_ptr<VideoFrameResourceProvider> resource_provider_;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/memory/read_only_shared_memory_region.h" #include "base/memory/read_only_shared_memory_region.h"
#include "base/test/simple_test_tick_clock.h" #include "base/test/simple_test_tick_clock.h"
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
#include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h" #include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h" #include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
...@@ -184,8 +186,8 @@ class VideoFrameSubmitterTest : public testing::Test { ...@@ -184,8 +186,8 @@ class VideoFrameSubmitterTest : public testing::Test {
submitter_->SetIsSurfaceVisible(true); submitter_->SetIsSurfaceVisible(true);
submitter_->compositor_frame_sink_ = submitter_->compositor_frame_sink_ =
viz::mojom::blink::CompositorFrameSinkPtr(std::move(submitter_sink)); viz::mojom::blink::CompositorFrameSinkPtr(std::move(submitter_sink));
mojom::blink::SurfaceEmbedderPtr embedder; mojo::Remote<mojom::blink::SurfaceEmbedder> embedder;
mojo::MakeRequest(&embedder); ignore_result(embedder.BindNewPipeAndPassReceiver());
submitter_->surface_embedder_ = std::move(embedder); submitter_->surface_embedder_ = std::move(embedder);
auto surface_id = viz::SurfaceId( auto surface_id = viz::SurfaceId(
viz::FrameSinkId(1, 1), viz::FrameSinkId(1, 1),
......
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