| OLD | NEW |
| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 EventResult EventTarget::OnKeyEvent(KeyEvent* event) { | 55 EventResult EventTarget::OnKeyEvent(KeyEvent* event) { |
| 56 CHECK_EQ(this, event->target()); | 56 CHECK_EQ(this, event->target()); |
| 57 return target_handler_ ? target_handler_->OnKeyEvent(event) : ER_UNHANDLED; | 57 return target_handler_ ? target_handler_->OnKeyEvent(event) : ER_UNHANDLED; |
| 58 } | 58 } |
| 59 | 59 |
| 60 EventResult EventTarget::OnMouseEvent(MouseEvent* event) { | 60 EventResult EventTarget::OnMouseEvent(MouseEvent* event) { |
| 61 CHECK_EQ(this, event->target()); | 61 CHECK_EQ(this, event->target()); |
| 62 return target_handler_ ? target_handler_->OnMouseEvent(event) : ER_UNHANDLED; | 62 return target_handler_ ? target_handler_->OnMouseEvent(event) : ER_UNHANDLED; |
| 63 } | 63 } |
| 64 | 64 |
| 65 EventResult EventTarget::OnScrollEvent(ScrollEvent* event) { | 65 void EventTarget::OnScrollEvent(ScrollEvent* event) { |
| 66 CHECK_EQ(this, event->target()); | 66 CHECK_EQ(this, event->target()); |
| 67 return target_handler_ ? target_handler_->OnScrollEvent(event) : ER_UNHANDLED; | 67 if (target_handler_) |
| 68 target_handler_->OnScrollEvent(event); |
| 68 } | 69 } |
| 69 | 70 |
| 70 EventResult EventTarget::OnTouchEvent(TouchEvent* event) { | 71 void EventTarget::OnTouchEvent(TouchEvent* event) { |
| 71 CHECK_EQ(this, event->target()); | 72 CHECK_EQ(this, event->target()); |
| 72 return target_handler_ ? target_handler_->OnTouchEvent(event) : | 73 if (target_handler_) |
| 73 ER_UNHANDLED; | 74 target_handler_->OnTouchEvent(event); |
| 74 } | 75 } |
| 75 | 76 |
| 76 void EventTarget::OnGestureEvent(GestureEvent* event) { | 77 void EventTarget::OnGestureEvent(GestureEvent* event) { |
| 77 CHECK_EQ(this, event->target()); | 78 CHECK_EQ(this, event->target()); |
| 78 if (target_handler_) | 79 if (target_handler_) |
| 79 target_handler_->OnGestureEvent(event); | 80 target_handler_->OnGestureEvent(event); |
| 80 } | 81 } |
| 81 | 82 |
| 82 void EventTarget::GetPreTargetHandlers(EventHandlerList* list) { | 83 void EventTarget::GetPreTargetHandlers(EventHandlerList* list) { |
| 83 EventTarget* target = this; | 84 EventTarget* target = this; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 98 while (target) { | 99 while (target) { |
| 99 for (EventHandlerList::iterator it = target->post_target_list_.begin(), | 100 for (EventHandlerList::iterator it = target->post_target_list_.begin(), |
| 100 end = target->post_target_list_.end(); it != end; ++it) { | 101 end = target->post_target_list_.end(); it != end; ++it) { |
| 101 list->push_back(*it); | 102 list->push_back(*it); |
| 102 } | 103 } |
| 103 target = target->GetParentTarget(); | 104 target = target->GetParentTarget(); |
| 104 } | 105 } |
| 105 } | 106 } |
| 106 | 107 |
| 107 } // namespace ui | 108 } // namespace ui |
| OLD | NEW |