| Index: ui/ozone/platform/drm/host/drm_overlay_candidates_host.cc
|
| diff --git a/ui/ozone/platform/drm/host/drm_overlay_candidates_host.cc b/ui/ozone/platform/drm/host/drm_overlay_candidates_host.cc
|
| index b5500d5fee91c7605a848a51fe31abf6da0a5e4b..6527f6783f7a0bc329bd5b6d86740de43dc3849a 100644
|
| --- a/ui/ozone/platform/drm/host/drm_overlay_candidates_host.cc
|
| +++ b/ui/ozone/platform/drm/host/drm_overlay_candidates_host.cc
|
| @@ -11,75 +11,24 @@
|
| #include "ui/gfx/geometry/rect_conversions.h"
|
| #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
|
| #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
|
| +#include "ui/ozone/platform/drm/host/drm_overlay_manager_core.h"
|
| #include "ui/ozone/platform/drm/host/drm_window_host.h"
|
| +#include "ui/ozone/public/overlay_manager_ozone.h"
|
|
|
| namespace ui {
|
|
|
| DrmOverlayCandidatesHost::DrmOverlayCandidatesHost(
|
| - DrmGpuPlatformSupportHost* platform_support,
|
| - DrmWindowHost* window)
|
| - : sender_(new OverlayCandidatesIPC(platform_support, this)),
|
| - core_(new DrmOverlayCandidatesHostCore(sender_.get(), window)) {}
|
| + DrmOverlayManagerCore* manager_core,
|
| + gfx::AcceleratedWidget widget)
|
| + : manager_core_(manager_core), widget_(widget) {}
|
|
|
| DrmOverlayCandidatesHost::~DrmOverlayCandidatesHost() {
|
| }
|
|
|
| void DrmOverlayCandidatesHost::CheckOverlaySupport(
|
| OverlaySurfaceCandidateList* candidates) {
|
| - core_->CheckOverlaySupport(candidates);
|
| + manager_core_->CheckOverlaySupport(candidates, widget_);
|
| }
|
|
|
| -void DrmOverlayCandidatesHost::OnChannelEstablished(
|
| - int host_id,
|
| - scoped_refptr<base::SingleThreadTaskRunner> send_runner,
|
| - const base::Callback<void(IPC::Message*)>& sender) {
|
| - core_->ResetCache();
|
| -}
|
| -
|
| -void DrmOverlayCandidatesHost::OnChannelDestroyed(int host_id) {
|
| -}
|
| -
|
| -bool DrmOverlayCandidatesHost::OnMessageReceived(const IPC::Message& message) {
|
| - bool handled = false;
|
| - IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(DrmOverlayCandidatesHost, message, &handled)
|
| - IPC_MESSAGE_FORWARD(OzoneHostMsg_OverlayCapabilitiesReceived, this,
|
| - DrmOverlayCandidatesHost::OnOverlayResult)
|
| - IPC_END_MESSAGE_MAP()
|
| - return handled;
|
| -}
|
| -
|
| -void DrmOverlayCandidatesHost::OnOverlayResult(
|
| - bool* handled,
|
| - gfx::AcceleratedWidget widget,
|
| - const std::vector<OverlayCheck_Params>& params) {
|
| - core_->GpuSentOverlayResult(handled, widget, params);
|
| -}
|
| -
|
| -// TODO(rjkroege): There is a refactoring opportunity in the sender pattern.
|
| -DrmOverlayCandidatesHost::OverlayCandidatesIPC::OverlayCandidatesIPC(
|
| - DrmGpuPlatformSupportHost* platform_support,
|
| - DrmOverlayCandidatesHost* parent)
|
| - : platform_support_(platform_support), parent_(parent) {}
|
| -
|
| -DrmOverlayCandidatesHost::OverlayCandidatesIPC::~OverlayCandidatesIPC() {}
|
| -
|
| -void DrmOverlayCandidatesHost::OverlayCandidatesIPC::UnregisterHandler() {
|
| - platform_support_->UnregisterHandler(parent_);
|
| -}
|
| -
|
| -void DrmOverlayCandidatesHost::OverlayCandidatesIPC::RegisterHandler() {
|
| - platform_support_->RegisterHandler(parent_);
|
| -}
|
| -
|
| -bool DrmOverlayCandidatesHost::OverlayCandidatesIPC::IsConnected() {
|
| - return platform_support_->IsConnected();
|
| -}
|
| -
|
| -bool DrmOverlayCandidatesHost::OverlayCandidatesIPC::CheckOverlayCapabilities(
|
| - gfx::AcceleratedWidget widget,
|
| - const std::vector<OverlayCheck_Params>& new_params) {
|
| - return platform_support_->Send(
|
| - new OzoneGpuMsg_CheckOverlayCapabilities(widget, new_params));
|
| -}
|
|
|
| } // namespace ui
|
|
|