| Index: services/ui/ws/event_dispatcher.cc
|
| diff --git a/services/ui/ws/event_dispatcher.cc b/services/ui/ws/event_dispatcher.cc
|
| index d6536cc9c8c5f50dd0a89caa1f0adcf42e9ded33..9dc217cd39197d158cdfc0a24fa751ea8e2532f9 100644
|
| --- a/services/ui/ws/event_dispatcher.cc
|
| +++ b/services/ui/ws/event_dispatcher.cc
|
| @@ -249,8 +249,17 @@ bool EventDispatcher::AddAccelerator(uint32_t id,
|
| std::unique_ptr<Accelerator> accelerator(new Accelerator(id, *event_matcher));
|
| // If an accelerator with the same id or matcher already exists, then abort.
|
| for (const auto& pair : accelerators_) {
|
| - if (pair.first == id || accelerator->EqualEventMatcher(pair.second.get()))
|
| + if (pair.first == id) {
|
| + DVLOG(1) << "duplicate accelerator. Accelerator id=" << accelerator->id()
|
| + << " type=" << event_matcher->type_matcher->type
|
| + << " flags=" << event_matcher->flags_matcher->flags;
|
| return false;
|
| + } else if (accelerator->EqualEventMatcher(pair.second.get())) {
|
| + DVLOG(1) << "duplicate matcher. Accelerator id=" << accelerator->id()
|
| + << " type=" << event_matcher->type_matcher->type
|
| + << " flags=" << event_matcher->flags_matcher->flags;
|
| + return false;
|
| + }
|
| }
|
| accelerators_.insert(Entry(id, std::move(accelerator)));
|
| return true;
|
|
|