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

Side by Side Diff: ui/events/event_targeter.cc

Issue 388893003: Fixes for re-enabling more MSVC level 4 warnings: ui/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_targeter.h" 5 #include "ui/events/event_targeter.h"
6 6
7 #include "ui/events/event.h" 7 #include "ui/events/event.h"
8 #include "ui/events/event_target.h" 8 #include "ui/events/event_target.h"
9 #include "ui/events/event_target_iterator.h" 9 #include "ui/events/event_target_iterator.h"
10 10
(...skipping 12 matching lines...) Expand all
23 static_cast<LocatedEvent*>(event)); 23 static_cast<LocatedEvent*>(event));
24 } 24 }
25 return root; 25 return root;
26 } 26 }
27 27
28 EventTarget* EventTargeter::FindTargetForLocatedEvent(EventTarget* root, 28 EventTarget* EventTargeter::FindTargetForLocatedEvent(EventTarget* root,
29 LocatedEvent* event) { 29 LocatedEvent* event) {
30 scoped_ptr<EventTargetIterator> iter = root->GetChildIterator(); 30 scoped_ptr<EventTargetIterator> iter = root->GetChildIterator();
31 if (iter) { 31 if (iter) {
32 EventTarget* target = root; 32 EventTarget* target = root;
33 EventTarget* child = NULL; 33 for (EventTarget* child = iter->GetNextTarget(); child;
34 while ((child = iter->GetNextTarget())) { 34 child = iter->GetNextTarget()) {
35 EventTargeter* targeter = child->GetEventTargeter(); 35 EventTargeter* targeter = child->GetEventTargeter();
36 if (!targeter) 36 if (!targeter)
37 targeter = this; 37 targeter = this;
38 if (!targeter->SubtreeShouldBeExploredForEvent(child, *event)) 38 if (!targeter->SubtreeShouldBeExploredForEvent(child, *event))
39 continue; 39 continue;
40 target->ConvertEventToTarget(child, event); 40 target->ConvertEventToTarget(child, event);
41 target = child; 41 target = child;
42 EventTarget* child_target = targeter ? 42 EventTarget* child_target = targeter ?
43 targeter->FindTargetForLocatedEvent(child, event) : 43 targeter->FindTargetForLocatedEvent(child, event) :
44 FindTargetForLocatedEvent(child, event); 44 FindTargetForLocatedEvent(child, event);
(...skipping 20 matching lines...) Expand all
65 const LocatedEvent& event) const { 65 const LocatedEvent& event) const {
66 return true; 66 return true;
67 } 67 }
68 68
69 bool EventTargeter::EventLocationInsideBounds(EventTarget* target, 69 bool EventTargeter::EventLocationInsideBounds(EventTarget* target,
70 const LocatedEvent& event) const { 70 const LocatedEvent& event) const {
71 return true; 71 return true;
72 } 72 }
73 73
74 } // namespace ui 74 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698