exo: Add support for subcompositor interface.

components/exo/shell_surface.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/shell_surface.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 34 matching lines @@
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellSurface, public:
 
 ShellSurface::ShellSurface(Surface* surface)
     : surface_(surface), show_state_(ui::SHOW_STATE_END) {
   surface_->SetSurfaceDelegate(this);
+  surface_->AddSurfaceObserver(this);
 }
 
 ShellSurface::~ShellSurface() {
-  if (surface_)
+  if (surface_) {
     surface_->SetSurfaceDelegate(nullptr);
+    surface_->RemoveSurfaceObserver(this);
+  }
   if (widget_)
     widget_->CloseNow();
 }
 
 void ShellSurface::Show() {
   TRACE_EVENT0("exo", "ShellSurface::Show");
 
   if (!widget_ && show_state_ == ui::SHOW_STATE_END)
     show_state_ = ui::SHOW_STATE_DEFAULT;
 }
@@ skipping 29 matching lines @@
     const {
   scoped_refptr<base::trace_event::TracedValue> value =
       new base::trace_event::TracedValue;
   value->SetString("title", base::UTF16ToUTF8(title_));
   return value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SurfaceDelegate overrides:
 
-void ShellSurface::OnSurfaceDestroying() {
-  surface_ = nullptr;
-}
-
 void ShellSurface::OnSurfaceCommit() {
-  if (widget_ || show_state_ == ui::SHOW_STATE_END)
+  if (widget_ || show_state_ == ui::SHOW_STATE_END) {
+    surface_->CommitSurfaceHierarchy();
     return;
+  }
 
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = this;
   params.shadow_type = show_state_ == ui::SHOW_STATE_NORMAL
                            ? views::Widget::InitParams::SHADOW_TYPE_DROP
                            : views::Widget::InitParams::SHADOW_TYPE_NONE;
   params.opacity = show_state_ == ui::SHOW_STATE_NORMAL
                        ? views::Widget::InitParams::OPAQUE_WINDOW
                        : views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.show_state = show_state_;
   params.parent = ash::Shell::GetContainer(
       ash::Shell::GetPrimaryRootWindow(), ash::kShellWindowId_DefaultContainer);
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
   widget_->GetNativeView()->SetName("ShellSurface");
+
+  surface_->CommitSurfaceHierarchy();
+  surface_->SetVisible(true);
+  surface_->SetEnabled(true);
+
   widget_->Show();
 }
 
+bool ShellSurface::IsSurfaceSynchronized() const {
+  // A shell surface is always desynchronized.
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// SurfaceObserver overrides:
+
+void ShellSurface::OnSurfaceDestroying(Surface* surface) {
+  surface->RemoveSurfaceObserver(this);
+  surface_ = nullptr;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // views::WidgetDelegate overrides:
 
 base::string16 ShellSurface::GetWindowTitle() const {
   return title_;
 }
 
 views::Widget* ShellSurface::GetWidget() {
   return widget_.get();
 }
 
 const views::Widget* ShellSurface::GetWidget() const {
   return widget_.get();
 }
 
 views::View* ShellSurface::GetContentsView() {
   return surface_;
 }
 
 views::NonClientFrameView* ShellSurface::CreateNonClientFrameView(
     views::Widget* widget) {
   // Default show state is borderless and requires a custom frame view as the
   // default one does not support this.
   return show_state_ != ui::SHOW_STATE_NORMAL ? new CustomFrameView(widget)
                                               : nullptr;
 }
 
 }  // namespace exo