| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 9d0c812f005482a716ba98b6228ddde141e5e0ef..09fa63515be789768eca4f26ea39272a0cb2fbf8 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -111,6 +111,7 @@
|
| #include "content/renderer/input/input_event_filter.h"
|
| #include "content/renderer/input/input_handler_manager.h"
|
| #include "content/renderer/input/main_thread_input_event_filter.h"
|
| +#include "content/renderer/input/target_frame_for_input_impl.h"
|
| #include "content/renderer/media/audio_input_message_filter.h"
|
| #include "content/renderer/media/audio_message_filter.h"
|
| #include "content/renderer/media/audio_renderer_mixer_manager.h"
|
| @@ -1962,13 +1963,18 @@ void RenderThreadImpl::RequestNewLayerTreeFrameSink(
|
| viz::mojom::CompositorFrameSinkClientRequest client_request =
|
| mojo::MakeRequest(&client);
|
|
|
| + viz::mojom::TargetFrameForInputDelegatePtr hit_test;
|
| + viz::mojom::TargetFrameForInputDelegateRequest hit_test_request =
|
| + mojo::MakeRequest(&hit_test);
|
| +
|
| if (command_line.HasSwitch(switches::kEnableVulkan)) {
|
| scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider =
|
| cc::VulkanInProcessContextProvider::Create();
|
| if (vulkan_context_provider) {
|
| DCHECK(!layout_test_mode());
|
| frame_sink_provider_->CreateForWidget(routing_id, std::move(sink_request),
|
| - std::move(client));
|
| + std::move(client),
|
| + std::move(hit_test));
|
| callback.Run(base::MakeUnique<viz::ClientLayerTreeFrameSink>(
|
| std::move(vulkan_context_provider),
|
| std::move(synthetic_begin_frame_source), std::move(sink_info),
|
| @@ -1998,7 +2004,8 @@ void RenderThreadImpl::RequestNewLayerTreeFrameSink(
|
| if (use_software) {
|
| DCHECK(!layout_test_mode());
|
| frame_sink_provider_->CreateForWidget(routing_id, std::move(sink_request),
|
| - std::move(client));
|
| + std::move(client),
|
| + std::move(hit_test));
|
| callback.Run(base::MakeUnique<viz::ClientLayerTreeFrameSink>(
|
| nullptr, nullptr, nullptr, shared_bitmap_manager(),
|
| std::move(synthetic_begin_frame_source), std::move(sink_info),
|
| @@ -2072,7 +2079,7 @@ void RenderThreadImpl::RequestNewLayerTreeFrameSink(
|
| }
|
| #endif
|
| frame_sink_provider_->CreateForWidget(routing_id, std::move(sink_request),
|
| - std::move(client));
|
| + std::move(client), std::move(hit_test));
|
| callback.Run(base::MakeUnique<viz::ClientLayerTreeFrameSink>(
|
| std::move(context_provider), std::move(worker_context_provider),
|
| GetGpuMemoryBufferManager(), nullptr,
|
|
|