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

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

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
« no previous file with comments | « ui/base/events/event_target.h ('k') | ui/message_center/message_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 CHECK_EQ(this, event->target()); 58 CHECK_EQ(this, event->target());
59 return target_handler_ ? target_handler_->OnScrollEvent(event) : ER_UNHANDLED; 59 return target_handler_ ? target_handler_->OnScrollEvent(event) : ER_UNHANDLED;
60 } 60 }
61 61
62 EventResult EventTarget::OnTouchEvent(TouchEvent* event) { 62 EventResult EventTarget::OnTouchEvent(TouchEvent* event) {
63 CHECK_EQ(this, event->target()); 63 CHECK_EQ(this, event->target());
64 return target_handler_ ? target_handler_->OnTouchEvent(event) : 64 return target_handler_ ? target_handler_->OnTouchEvent(event) :
65 ER_UNHANDLED; 65 ER_UNHANDLED;
66 } 66 }
67 67
68 EventResult EventTarget::OnGestureEvent(GestureEvent* event) { 68 void EventTarget::OnGestureEvent(GestureEvent* event) {
69 CHECK_EQ(this, event->target()); 69 CHECK_EQ(this, event->target());
70 return target_handler_ ? target_handler_->OnGestureEvent(event) : 70 if (target_handler_)
71 ER_UNHANDLED; 71 target_handler_->OnGestureEvent(event);
72 } 72 }
73 73
74 void EventTarget::GetPreTargetHandlers(EventHandlerList* list) { 74 void EventTarget::GetPreTargetHandlers(EventHandlerList* list) {
75 EventTarget* target = this; 75 EventTarget* target = this;
76 while (target) { 76 while (target) {
77 EventHandlerList::reverse_iterator it, rend; 77 EventHandlerList::reverse_iterator it, rend;
78 for (it = target->pre_target_list_.rbegin(), 78 for (it = target->pre_target_list_.rbegin(),
79 rend = target->pre_target_list_.rend(); 79 rend = target->pre_target_list_.rend();
80 it != rend; 80 it != rend;
81 ++it) { 81 ++it) {
82 list->insert(list->begin(), *it); 82 list->insert(list->begin(), *it);
83 } 83 }
84 target = target->GetParentTarget(); 84 target = target->GetParentTarget();
85 } 85 }
86 } 86 }
87 87
88 void EventTarget::GetPostTargetHandlers(EventHandlerList* list) { 88 void EventTarget::GetPostTargetHandlers(EventHandlerList* list) {
89 EventTarget* target = this; 89 EventTarget* target = this;
90 while (target) { 90 while (target) {
91 for (EventHandlerList::iterator it = target->post_target_list_.begin(), 91 for (EventHandlerList::iterator it = target->post_target_list_.begin(),
92 end = target->post_target_list_.end(); it != end; ++it) { 92 end = target->post_target_list_.end(); it != end; ++it) {
93 list->push_back(*it); 93 list->push_back(*it);
94 } 94 }
95 target = target->GetParentTarget(); 95 target = target->GetParentTarget();
96 } 96 }
97 } 97 }
98 98
99 } // namespace ui 99 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/events/event_target.h ('k') | ui/message_center/message_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698