mus: Server-side implementation of modal windows

components/mus/ws/connection_manager.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 "components/mus/ws/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/mus/ws/connection_manager_delegate.h"
 #include "components/mus/ws/display.h"
@@ skipping 296 matching lines @@
   }
 }
 
 void ConnectionManager::ProcessWindowHierarchyChanged(
     const ServerWindow* window,
     const ServerWindow* new_parent,
     const ServerWindow* old_parent) {
   for (auto& pair : tree_map_) {
     pair.second->ProcessWindowHierarchyChanged(window, new_parent, old_parent,
                                                IsOperationSource(pair.first));
   }

[sky, 2016/03/08 17:07:53]

Do you need to call ReleaseCaptureForModalWindow here too?

[mohsen, 2016/03/09 08:26:48]

Yeah, we should release capture if necessary in this case too. However, we can't
use ReleaseCaptureForModalWindow as it needs the modal window suspected to block
the capture. I've moved around codes a bit to be able to do this.

Also, added this code to OnWindowHierarchyChanged instead of here, because
windows are passed as const here which makes things a bit complicated.

 }
 
 void ConnectionManager::ProcessWindowReorder(
     const ServerWindow* window,
     const ServerWindow* relative_window,
     const mojom::OrderDirection direction) {
   // We'll probably do a bit of reshuffling when we add a transient window.
   if ((current_operation_type() == OperationType::ADD_TRANSIENT_WINDOW) ||
       (current_operation_type() ==
        OperationType::REMOVE_TRANSIENT_WINDOW_FROM_PARENT)) {
@@ skipping 192 matching lines @@
        (!window->visible() && window->parent()->IsDrawn()))) {
     SchedulePaint(window->parent(), window->bounds());
   }
 
   for (auto& pair : tree_map_) {
     pair.second->ProcessWillChangeWindowVisibility(
         window, IsOperationSource(pair.first));
   }
 }
 
+void ConnectionManager::OnWindowVisibilityChanged(ServerWindow* window) {
+  Display* display = display_manager_->GetDisplayContaining(window);
+  if (display)
+    display->ReleaseCaptureForModalWindow(window);
+}
+
 void ConnectionManager::OnWindowPredefinedCursorChanged(ServerWindow* window,
                                                         int32_t cursor_id) {
   if (in_destructor_)
     return;
 
   ProcessWillChangeWindowPredefinedCursor(window, cursor_id);
 }
 
 void ConnectionManager::OnWindowSharedPropertyChanged(
     ServerWindow* window,
@@ skipping 40 matching lines @@
 void ConnectionManager::OnFirstDisplayReady() {
   delegate_->OnFirstDisplayReady();
 }
 
 void ConnectionManager::OnNoMoreDisplays() {
   delegate_->OnNoMoreDisplays();
 }
 
 }  // namespace ws
 }  // namespace mus