Adds ability for pre-target accelerators to not consume events

services/ui/ws/event_dispatcher.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 "services/ui/ws/event_dispatcher.h"
 
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "services/ui/ws/accelerator.h"
@@ skipping 235 matching lines @@
   return true;
 }
 
 void EventDispatcher::RemoveAccelerator(uint32_t id) {
   auto it = accelerators_.find(id);
   // Clients may pass bogus ids.
   if (it != accelerators_.end())
     accelerators_.erase(it);
 }
 
-void EventDispatcher::ProcessEvent(const ui::Event& event) {
+void EventDispatcher::ProcessEvent(const ui::Event& event,
+                                   AcceleratorMatchPhase match_phase) {
   if (event.IsKeyEvent()) {

[sadrul, 2016/07/08 15:40:43]

Should we add some debug check here to verify that we are sending the right
event with the expected phase (e.g. of match_phase is POST_ONLY, then the
previous |match_phase| was ANY and |event| was the same)?

[sky, 2016/07/08 16:23:51]

Done.

     const ui::KeyEvent* key_event = event.AsKeyEvent();
-    if (event.type() == ui::ET_KEY_PRESSED && !key_event->is_char()) {
+    if (event.type() == ui::ET_KEY_PRESSED && !key_event->is_char() &&
+        match_phase == AcceleratorMatchPhase::ANY) {
       Accelerator* pre_target =
           FindAccelerator(*key_event, ui::mojom::AcceleratorPhase::PRE_TARGET);
       if (pre_target) {
-        delegate_->OnAccelerator(pre_target->id(), event);
+        delegate_->OnAccelerator(
+            pre_target->id(), event,
+            EventDispatcherDelegate::AcceleratorPhase::PRE);
         return;
       }
     }
-    ProcessKeyEvent(*key_event);
+    ProcessKeyEvent(*key_event, match_phase);
     return;
   }
 
   if (event.IsPointerEvent() || event.IsMouseWheelEvent()) {
     ProcessLocatedEvent(*event.AsLocatedEvent());
     return;
   }
 
   NOTREACHED();
 }
 
-void EventDispatcher::ProcessKeyEvent(const ui::KeyEvent& event) {
+void EventDispatcher::ProcessKeyEvent(const ui::KeyEvent& event,
+                                      AcceleratorMatchPhase match_phase) {
   Accelerator* post_target =
       FindAccelerator(event, ui::mojom::AcceleratorPhase::POST_TARGET);
   ServerWindow* focused_window =
       delegate_->GetFocusedWindowForEventDispatcher();
   if (focused_window) {
     // Assume key events are for the client area.
     const bool in_nonclient_area = false;
     const ClientSpecificId client_id =
         delegate_->GetEventTargetClientId(focused_window, in_nonclient_area);
     delegate_->DispatchInputEventToWindow(focused_window, client_id, event,
                                           post_target);
     return;
   }
   delegate_->OnEventTargetNotFound(event);
   if (post_target)
-    delegate_->OnAccelerator(post_target->id(), event);
+    delegate_->OnAccelerator(post_target->id(), event,
+                             EventDispatcherDelegate::AcceleratorPhase::POST);
 }
 
 void EventDispatcher::ProcessLocatedEvent(const ui::LocatedEvent& event) {
   DCHECK(event.IsPointerEvent() || event.IsMouseWheelEvent());
   const bool is_mouse_event =
       event.IsMousePointerEvent() || event.IsMouseWheelEvent();
 
   if (is_mouse_event) {
     mouse_pointer_last_location_ = event.location();
     delegate_->OnMouseCursorLocationChanged(event.root_location());
@@ skipping 198 matching lines @@
   if (!it->second) {
     window->RemoveObserver(this);
     observed_windows_.erase(it);
   }
 }
 
 Accelerator* EventDispatcher::FindAccelerator(
     const ui::KeyEvent& event,
     const ui::mojom::AcceleratorPhase phase) {
   for (const auto& pair : accelerators_) {
-    if (pair.second->MatchesEvent(event, phase)) {
+    if (pair.second->MatchesEvent(event, phase))
       return pair.second.get();
-    }
   }
   return nullptr;
 }
 
 ServerWindow* EventDispatcher::FindDeepestVisibleWindowForEvents(
     gfx::Point* location) {
   ServerWindow* root = delegate_->GetRootWindowContaining(*location);
   if (!root)
     return nullptr;
 
@@ skipping 23 matching lines @@
 
 void EventDispatcher::OnWindowDestroyed(ServerWindow* window) {
   CancelPointerEventsToTarget(window);
 
   if (mouse_cursor_source_window_ == window)
     mouse_cursor_source_window_ = nullptr;
 }
 
 }  // namespace ws
 }  // namespace ui