Relocate ozone gbm overlay config cache to manager

ui/ozone/platform/drm/host/drm_window_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/drm/host/drm_window_host.h"
 
 #include "base/bind.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/events_ozone.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/display.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
 #include "ui/ozone/platform/drm/host/drm_cursor.h"
 #include "ui/ozone/platform/drm/host/drm_display_host.h"
 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h"
 #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
-#include "ui/ozone/platform/drm/host/drm_overlay_candidates_host.h"
+// #include "ui/ozone/platform/drm/host/drm_overlay_candidates_host.h"

[dnicoara, 2016/01/26 14:14:23]

Remove commented include

[rjkroege, 2016/01/26 23:58:56]

Done.

+#include "ui/ozone/platform/drm/host/drm_overlay_manager.h"
 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 DrmWindowHost::DrmWindowHost(PlatformWindowDelegate* delegate,
                              const gfx::Rect& bounds,
                              DrmGpuPlatformSupportHost* sender,
                              EventFactoryEvdev* event_factory,
                              DrmCursor* cursor,
                              DrmWindowHostManager* window_manager,
-                             DrmDisplayHostManager* display_manager)
+                             DrmDisplayHostManager* display_manager,
+                             DrmOverlayManager* overlay_manager)
     : delegate_(delegate),
       sender_(sender),
       event_factory_(event_factory),
       cursor_(cursor),
       window_manager_(window_manager),
       display_manager_(display_manager),
-      overlay_candidates_host_(nullptr),
+      overlay_manager_(overlay_manager),
       bounds_(bounds),
       widget_(window_manager->NextAcceleratedWidget()) {
   window_manager_->AddWindow(widget_, this);
 }
 
 DrmWindowHost::~DrmWindowHost() {
   PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
   window_manager_->RemoveWindow(widget_);
   cursor_->OnWindowRemoved(widget_);
 
@@ skipping 139 matching lines @@
 }
 
 void DrmWindowHost::OnChannelEstablished() {
   sender_->Send(new OzoneGpuMsg_CreateWindow(widget_));
   SendBoundsChange();
 }
 
 void DrmWindowHost::OnChannelDestroyed() {
 }
 
-void DrmWindowHost::SetOverlayCandidatesHost(
-    DrmOverlayCandidatesHostCore* host) {
-  overlay_candidates_host_ = host;
-}
-
 void DrmWindowHost::SendBoundsChange() {
   // Update the cursor before the window so that the cursor stays within the
   // window bounds when the window size shrinks.
   cursor_->CommitBoundsChange(widget_, bounds_, GetCursorConfinedBounds());
   sender_->Send(new OzoneGpuMsg_WindowBoundsChanged(widget_, bounds_));
 
-  if (overlay_candidates_host_)
-    overlay_candidates_host_->ResetCache();
+  overlay_manager_->ResetCache();
 }
 
 }  // namespace ui