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/events/event_target.cc

Issue 1411833006: Refactoring to make adding ink drop animations easier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactor ink drop animations (more comments in ui/views/, test) Created 5 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
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/events/event_target.h" 5 #include "ui/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/events/event.h" 10 #include "ui/events/event.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 post_target_list_.end(), 49 post_target_list_.end(),
50 handler); 50 handler);
51 if (find != post_target_list_.end()) 51 if (find != post_target_list_.end())
52 post_target_list_.erase(find); 52 post_target_list_.erase(find);
53 } 53 }
54 54
55 bool EventTarget::IsPreTargetListEmpty() const { 55 bool EventTarget::IsPreTargetListEmpty() const {
56 return pre_target_list_.empty(); 56 return pre_target_list_.empty();
57 } 57 }
58 58
59 EventHandler* EventTarget::SetTargetHandler(EventHandler* target_handler) {
60 EventHandler* original_target_handler = target_handler_;
61 target_handler_ = target_handler;
62 return original_target_handler;
63 }
64
59 void EventTarget::OnEvent(Event* event) { 65 void EventTarget::OnEvent(Event* event) {
60 CHECK_EQ(this, event->target()); 66 CHECK_EQ(this, event->target());
61 if (target_handler_) 67 if (target_handler_)
62 target_handler_->OnEvent(event); 68 target_handler_->OnEvent(event);
63 else 69 else
64 EventHandler::OnEvent(event); 70 EventHandler::OnEvent(event);
65 } 71 }
66 72
67 void EventTarget::OnKeyEvent(KeyEvent* event) { 73 void EventTarget::OnKeyEvent(KeyEvent* event) {
68 CHECK_EQ(this, event->target()); 74 CHECK_EQ(this, event->target());
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 while (target) { 119 while (target) {
114 for (EventHandlerList::iterator it = target->post_target_list_.begin(), 120 for (EventHandlerList::iterator it = target->post_target_list_.begin(),
115 end = target->post_target_list_.end(); it != end; ++it) { 121 end = target->post_target_list_.end(); it != end; ++it) {
116 list->push_back(*it); 122 list->push_back(*it);
117 } 123 }
118 target = target->GetParentTarget(); 124 target = target->GetParentTarget();
119 } 125 }
120 } 126 }
121 127
122 } // namespace ui 128 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698