OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/events/event_source.h" | 5 #include "ui/events/event_source.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ui/events/event_processor.h" | 9 #include "ui/events/event_processor.h" |
10 #include "ui/events/event_rewriter.h" | 10 #include "ui/events/event_rewriter.h" |
(...skipping 12 matching lines...) Expand all Loading... | |
23 } | 23 } |
24 | 24 |
25 void EventSource::RemoveEventRewriter(EventRewriter* rewriter) { | 25 void EventSource::RemoveEventRewriter(EventRewriter* rewriter) { |
26 EventRewriterList::iterator find = | 26 EventRewriterList::iterator find = |
27 std::find(rewriter_list_.begin(), rewriter_list_.end(), rewriter); | 27 std::find(rewriter_list_.begin(), rewriter_list_.end(), rewriter); |
28 if (find != rewriter_list_.end()) | 28 if (find != rewriter_list_.end()) |
29 rewriter_list_.erase(find); | 29 rewriter_list_.erase(find); |
30 } | 30 } |
31 | 31 |
32 EventDispatchDetails EventSource::SendEventToProcessor(Event* event) { | 32 EventDispatchDetails EventSource::SendEventToProcessor(Event* event) { |
33 LOG(ERROR) << "EventSource::SendEventToProcessor"; | |
Daniel Erat
2014/04/18 00:44:08
delete
| |
33 scoped_ptr<Event> rewritten_event; | 34 scoped_ptr<Event> rewritten_event; |
34 EventRewriteStatus status = EVENT_REWRITE_CONTINUE; | 35 EventRewriteStatus status = EVENT_REWRITE_CONTINUE; |
35 EventRewriterList::const_iterator it = rewriter_list_.begin(), | 36 EventRewriterList::const_iterator it = rewriter_list_.begin(), |
36 end = rewriter_list_.end(); | 37 end = rewriter_list_.end(); |
37 for (; it != end; ++it) { | 38 for (; it != end; ++it) { |
38 status = (*it)->RewriteEvent(*event, &rewritten_event); | 39 status = (*it)->RewriteEvent(*event, &rewritten_event); |
39 if (status == EVENT_REWRITE_DISCARD) { | 40 if (status == EVENT_REWRITE_DISCARD) { |
40 CHECK(!rewritten_event); | 41 CHECK(!rewritten_event); |
41 return EventDispatchDetails(); | 42 return EventDispatchDetails(); |
42 } | 43 } |
(...skipping 18 matching lines...) Expand all Loading... | |
61 CHECK(new_event); | 62 CHECK(new_event); |
62 details = DeliverEventToProcessor(new_event.get()); | 63 details = DeliverEventToProcessor(new_event.get()); |
63 if (details.dispatcher_destroyed) | 64 if (details.dispatcher_destroyed) |
64 return details; | 65 return details; |
65 rewritten_event.reset(new_event.release()); | 66 rewritten_event.reset(new_event.release()); |
66 } | 67 } |
67 return EventDispatchDetails(); | 68 return EventDispatchDetails(); |
68 } | 69 } |
69 | 70 |
70 EventDispatchDetails EventSource::DeliverEventToProcessor(Event* event) { | 71 EventDispatchDetails EventSource::DeliverEventToProcessor(Event* event) { |
72 LOG(ERROR) << "EventSource::DeliverEventToProcessor"; | |
71 EventProcessor* processor = GetEventProcessor(); | 73 EventProcessor* processor = GetEventProcessor(); |
72 CHECK(processor); | 74 CHECK(processor); |
73 return processor->OnEventFromSource(event); | 75 return processor->OnEventFromSource(event); |
74 } | 76 } |
75 | 77 |
76 } // namespace ui | 78 } // namespace ui |
OLD | NEW |