Relocate ozone gbm overlay config cache to manager

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

Index: ui/ozone/platform/drm/host/drm_overlay_manager_core.cc
diff --git a/ui/ozone/platform/drm/host/drm_overlay_candidates_host_core.cc b/ui/ozone/platform/drm/host/drm_overlay_manager_core.cc
similarity index 64%
rename from ui/ozone/platform/drm/host/drm_overlay_candidates_host_core.cc
rename to ui/ozone/platform/drm/host/drm_overlay_manager_core.cc
index bc0f6c4c0bfe20d552f876356d2c6e724b883bfc..fb445fb93f3078399f393e757bda0620804c1a78 100644
--- a/ui/ozone/platform/drm/host/drm_overlay_candidates_host_core.cc
+++ b/ui/ozone/platform/drm/host/drm_overlay_manager_core.cc
@@ -2,39 +2,55 @@
 // 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_overlay_candidates_host_core.h"
+#include "ui/ozone/platform/drm/host/drm_overlay_manager_core.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
+#include "base/command_line.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
+#include "ui/ozone/platform/drm/host/drm_overlay_candidates_host.h"
 #include "ui/ozone/platform/drm/host/drm_window_host.h"
+#include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
+#include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
 
+typedef OverlayCandidatesOzone::OverlaySurfaceCandidateList
+    OverlaySurfaceCandidateList;
+typedef OverlayCandidatesOzone::OverlaySurfaceCandidate OverlaySurfaceCandidate;
+
 namespace {
 const size_t kMaxCacheSize = 200;
 }  // namespace
 
-DrmOverlayCandidatesHostProxy::~DrmOverlayCandidatesHostProxy() {}
+DrmOverlayManagerProxy::~DrmOverlayManagerProxy() {}
 
-DrmOverlayCandidatesHostCore::DrmOverlayCandidatesHostCore(
-    DrmOverlayCandidatesHostProxy* proxy,
-    DrmWindowHost* window)
-    : proxy_(proxy), window_(window), cache_(kMaxCacheSize) {
+DrmOverlayManagerCore::DrmOverlayManagerCore(
+    DrmOverlayManagerProxy* proxy,
+    DrmWindowHostManager* window_manager)
+    : proxy_(proxy), window_manager_(window_manager), cache_(kMaxCacheSize) {
+  is_supported_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kOzoneTestSingleOverlaySupport);
   proxy_->RegisterHandler();
-  window_->SetOverlayCandidatesHost(this);
 }
 
-DrmOverlayCandidatesHostCore::~DrmOverlayCandidatesHostCore() {
+DrmOverlayManagerCore::~DrmOverlayManagerCore() {
   proxy_->UnregisterHandler();
-  window_->SetOverlayCandidatesHost(nullptr);
 }
 
-void DrmOverlayCandidatesHostCore::CheckOverlaySupport(
-    OverlaySurfaceCandidateList* candidates) {
+scoped_ptr<OverlayCandidatesOzone>
+DrmOverlayManagerCore::CreateOverlayCandidates(gfx::AcceleratedWidget w) {
+  if (!is_supported_)
+    return nullptr;
+  return make_scoped_ptr(new DrmOverlayCandidatesHost(this, w));
+}
+
+void DrmOverlayManagerCore::CheckOverlaySupport(
+    OverlayCandidatesOzone::OverlaySurfaceCandidateList* candidates,
+    gfx::AcceleratedWidget widget) {
   std::vector<OverlayCheck_Params> overlay_params;
   for (auto& candidate : *candidates) {
     // Reject candidates that don't fall on a pixel boundary.
@@ -68,7 +84,7 @@ void DrmOverlayCandidatesHostCore::CheckOverlaySupport(
         continue;
 
       const OverlaySurfaceCandidate& candidate = candidates->at(i);
-      if (!CanHandleCandidate(candidate)) {
+      if (!CanHandleCandidate(candidate, widget)) {
         DCHECK(candidate.plane_z_order != 0);
         overlay_params.at(i).is_overlay_candidate = false;
         continue;
@@ -80,7 +96,7 @@ void DrmOverlayCandidatesHostCore::CheckOverlaySupport(
     cache_.Put(overlay_params, needs_gpu_validation);
 
     if (needs_gpu_validation)
-      SendOverlayValidationRequest(overlay_params);
+      SendOverlayValidationRequest(overlay_params, widget);
   } else {
     const std::vector<OverlayCheck_Params>& validated_params = iter->first;

[kalyank, 2016/01/26 00:43:40]

After thinking bit more about this, I don't feel comfortable that we ignore
widget here. For example even though layer combination might be same the widget
might be associated with a different display controller which could make these
results invalid.

[rjkroege, 2016/01/26 01:38:40]

This is why I wanted you to look at the patch. 

I think that that a widget will only be associated with a display controller on
creation or via a bounds change. In particular: the only way to change the
controller associated with a widget is to call DrmWindowHost::SetBounds. But
DrmWindowHost::SetBounds flushes the cache and WindowHost creation ends up
calling SetBounds (and hence flushes the cache).

Am I wrong? Do we invoke ScreenManager::UpdateControllerToWindowMapping any
other way?

[kalyank_, 2016/01/26 02:36:39]

Acknowledged.

[kalyank_, 2016/01/26 02:36:39]

Ya that should be it. Also, I think as a future exercise with Mus we can get rid
of one the cache we have currently here and OverlayValidator.

     DCHECK(size == validated_params.size());
@@ -92,32 +108,34 @@ void DrmOverlayCandidatesHostCore::CheckOverlaySupport(
   }
 }
 
-void DrmOverlayCandidatesHostCore::ResetCache() {
+void DrmOverlayManagerCore::ResetCache() {
   cache_.Clear();
 }
 
-void DrmOverlayCandidatesHostCore::SendOverlayValidationRequest(
-    const std::vector<OverlayCheck_Params>& new_params) const {
+void DrmOverlayManagerCore::SendOverlayValidationRequest(
+    const std::vector<OverlayCheck_Params>& new_params,
+    gfx::AcceleratedWidget widget) const {
   if (!proxy_->IsConnected())
     return;
 
-  proxy_->CheckOverlayCapabilities(window_->GetAcceleratedWidget(), new_params);
+  proxy_->CheckOverlayCapabilities(widget, new_params);
 }
 
 // TODO(rjkroege) Remove the IPC component of OverlayCheck_Params in the future.
-void DrmOverlayCandidatesHostCore::GpuSentOverlayResult(
+void DrmOverlayManagerCore::GpuSentOverlayResult(
     bool* handled,
     gfx::AcceleratedWidget widget,
     const std::vector<OverlayCheck_Params>& params) {
-  if (widget != window_->GetAcceleratedWidget())
-    return;
+  //  if (widget != window_->GetAcceleratedWidget())

[kalyank, 2016/01/25 23:43:43]

Forgot to remove this ?

[rjkroege, 2016/01/26 01:38:40]

Done.

+  //    return;
 
   *handled = true;
   cache_.Put(params, false);
 }
 
-bool DrmOverlayCandidatesHostCore::CanHandleCandidate(
-    const OverlaySurfaceCandidate& candidate) const {
+bool DrmOverlayManagerCore::CanHandleCandidate(
+    const OverlaySurfaceCandidate& candidate,
+    gfx::AcceleratedWidget widget) const {
   if (candidate.buffer_size.IsEmpty())
     return false;
 
@@ -130,7 +148,8 @@ bool DrmOverlayCandidatesHostCore::CanHandleCandidate(
     // blocking overlaying or cc clipping it, but in case it wasn't properly
     // clipped (since GL will render this situation fine) just ignore it
     // here. This should be an extremely rare occurrance.
-    if (!window_->GetBounds().Contains(
+    DrmWindowHost* window = window_manager_->GetWindow(widget);
+    if (!window->GetBounds().Contains(
             gfx::ToNearestRect(candidate.display_rect))) {
       return false;
     }