exo: Add support for subcompositor interface.

components/exo/display.cc

 // Copyright 2015 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 "components/exo/display.h"
 
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
+#include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
 
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Display, public:
 
 Display::Display() {}
 
 Display::~Display() {}
@@ skipping 12 matching lines @@
   if (!base::SharedMemory::IsHandleValid(handle))
     return nullptr;
 
   return make_scoped_ptr(new SharedMemory(handle));
 }
 
 scoped_ptr<ShellSurface> Display::CreateShellSurface(Surface* surface) {
   TRACE_EVENT1("exo", "Display::CreateShellSurface", "surface",
                surface->AsTracedValue());
 
+  if (surface->HasSurfaceDelegate()) {
+    LOG(ERROR) << "Surface has already been assigned a role";

[piman, 2015/11/19 21:59:10]

nit: DLOG here and below

[reveman, 2015/11/20 05:19:48]

Done.

+    return nullptr;
+  }
+
   return make_scoped_ptr(new ShellSurface(surface));
 }
 
+scoped_ptr<SubSurface> Display::CreateSubSurface(Surface* surface,
+                                                 Surface* parent) {
+  TRACE_EVENT2("exo", "Display::CreateSubSurface", "surface",
+               surface->AsTracedValue(), "parent", parent->AsTracedValue());
+
+  if (surface == parent) {

[piman, 2015/11/19 21:59:10]

Is there a possibility that indirect cycles might be created? What would happen?

[reveman, 2015/11/20 05:19:48]

Yes, that would cause bad behavior. I changed this to check if surface contains
parent in latest patch and improved the unit test to verify that this works
properly. Thanks for pointing it out.

+    LOG(ERROR) << "Surface cannot be its own parent";
+    return nullptr;
+  }
+
+  if (surface->HasSurfaceDelegate()) {
+    LOG(ERROR) << "Surface has already been assigned a role";
+    return nullptr;
+  }
+
+  return make_scoped_ptr(new SubSurface(surface, parent));
+}
+
 }  // namespace exo