Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: ui/base/events/event_target.cc

Issue 10916210: events: Inlcude the event-phase and event-result in Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/base/events/event_target.h" 5 #include "ui/base/events/event_target.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/base/events/event.h" 10 #include "ui/base/events/event.h"
(...skipping 19 matching lines...) Expand all
30 void EventTarget::AddPostTargetHandler(EventHandler* handler) { 30 void EventTarget::AddPostTargetHandler(EventHandler* handler) {
31 post_target_list_.push_back(handler); 31 post_target_list_.push_back(handler);
32 } 32 }
33 33
34 void EventTarget::RemovePostTargetHandler(EventHandler* handler) { 34 void EventTarget::RemovePostTargetHandler(EventHandler* handler) {
35 post_target_list_.erase(std::remove(post_target_list_.begin(), 35 post_target_list_.erase(std::remove(post_target_list_.begin(),
36 post_target_list_.end(), handler)); 36 post_target_list_.end(), handler));
37 } 37 }
38 38
39 void EventTarget::GetPreTargetHandlers(EventHandlerList* list) { 39 void EventTarget::GetPreTargetHandlers(EventHandlerList* list) {
40 EventTarget* target = this->GetParentTarget() ? this->GetParentTarget() 40 EventTarget* target = this;
Ben Goodger (Google) 2012/09/10 18:07:14 I don't think you meant for this to sneak into thi
sadrul 2012/09/10 18:35:24 Whoops. Removed.
41 : this;
42 while (target) { 41 while (target) {
43 EventHandlerList::reverse_iterator it, rend; 42 EventHandlerList::reverse_iterator it, rend;
44 for (it = target->pre_target_list().rbegin(), 43 for (it = target->pre_target_list().rbegin(),
45 rend = target->pre_target_list().rend(); 44 rend = target->pre_target_list().rend();
46 it != rend; 45 it != rend;
47 ++it) { 46 ++it) {
48 list->insert(list->begin(), *it); 47 list->insert(list->begin(), *it);
49 } 48 }
50 target = target->GetParentTarget(); 49 target = target->GetParentTarget();
51 } 50 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 TOUCH_STATUS_UNKNOWN; 82 TOUCH_STATUS_UNKNOWN;
84 } 83 }
85 84
86 EventResult EventTarget::OnGestureEvent(GestureEvent* event) { 85 EventResult EventTarget::OnGestureEvent(GestureEvent* event) {
87 CHECK_EQ(this, event->target()); 86 CHECK_EQ(this, event->target());
88 return target_handler_ ? target_handler_->OnGestureEvent(event) : 87 return target_handler_ ? target_handler_->OnGestureEvent(event) :
89 ER_UNHANDLED; 88 ER_UNHANDLED;
90 } 89 }
91 90
92 } // namespace ui 91 } // namespace ui
OLDNEW
« ui/base/events/event_dispatcher.h ('K') | « ui/base/events/event_dispatcher_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698