Improve some debug tools for mus.

services/ui/ws/window_manager_state.cc

 // Copyright 2016 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 "services/ui/ws/window_manager_state.h"
 
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/ui/common/event_matcher_util.h"
 #include "services/ui/ws/accelerator.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/user_id_tracker.h"
 #include "services/ui/ws/window_manager_display_root.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_tree.h"
 #include "ui/events/event.h"
 
 namespace ui {
 namespace ws {
 namespace {
 
+// Flags that matter when checking if a key event matches an accelerator.
+const int kAcceleratorEventFlags =
+    EF_SHIFT_DOWN | EF_CONTROL_DOWN | EF_ALT_DOWN | EF_COMMAND_DOWN;
+
 base::TimeDelta GetDefaultAckTimerDelay() {
 #if defined(NDEBUG)
   return base::TimeDelta::FromMilliseconds(100);
 #else
   return base::TimeDelta::FromMilliseconds(1000);
 #endif
 }
 
 bool EventsCanBeCoalesced(const ui::Event& one, const ui::Event& two) {
   if (one.type() != two.type() || one.flags() != two.flags())
@@ skipping 52 matching lines @@
   base::WeakPtr<Accelerator> accelerator() { return accelerator_; }
 
  private:
   ServerWindowTracker tracker_;
   const ClientSpecificId client_id_;
   base::WeakPtr<Accelerator> accelerator_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessedEventTarget);
 };
 
+bool WindowManagerState::DebugAccelerator::Matches(
+    const ui::KeyEvent& event) const {
+  return key_code == event.key_code() &&
+         event_flags == (kAcceleratorEventFlags & event.flags());
+}
+
 WindowManagerState::QueuedEvent::QueuedEvent() {}
 WindowManagerState::QueuedEvent::~QueuedEvent() {}
 
 WindowManagerState::WindowManagerState(WindowTree* window_tree)
     : window_tree_(window_tree), event_dispatcher_(this), weak_factory_(this) {
   frame_decoration_values_ = mojom::FrameDecorationValues::New();
   frame_decoration_values_->max_title_bar_button_width = 0u;
 
   AddDebugAccelerators();
 }
@@ skipping 263 matching lines @@
       ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN};
   debug_accelerators_.push_back(accelerator);
 }
 
 void WindowManagerState::ProcessDebugAccelerator(const ui::Event& event) {
   if (event.type() != ui::ET_KEY_PRESSED)
     return;
 
   const ui::KeyEvent& key_event = *event.AsKeyEvent();
   for (const DebugAccelerator& accelerator : debug_accelerators_) {
-    if (accelerator.key_code == key_event.key_code() &&
-        accelerator.event_flags == key_event.flags()) {
+    if (accelerator.Matches(key_event)) {
       HandleDebugAccelerator(accelerator.type);
       break;
     }
   }
 }
 
 void WindowManagerState::HandleDebugAccelerator(DebugAcceleratorType type) {
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
   // Error so it will be collected in system logs.
   for (Display* display : display_manager()->displays()) {
     WindowManagerDisplayRoot* display_root =
         display->GetWindowManagerDisplayRootForUser(user_id());
     if (display_root) {
       LOG(ERROR) << "ServerWindow hierarchy:\n"
                  << display_root->root()->GetDebugWindowHierarchy();
     }
   }
 #endif
@@ skipping 154 matching lines @@
   return display_root->root();
 }
 
 void WindowManagerState::OnEventTargetNotFound(const ui::Event& event) {
   window_server()->SendToPointerWatchers(event, user_id(), nullptr, /* window */
                                          nullptr /* ignore_tree */);
 }
 
 }  // namespace ws
 }  // namespace ui