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/aura/root_window.h" | 5 #include "ui/aura/root_window.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
868 gesture_recognizer_->GetTouchLockedTarget(event)); | 868 gesture_recognizer_->GetTouchLockedTarget(event)); |
869 if (!target) { | 869 if (!target) { |
870 target = ConsumerToWindow( | 870 target = ConsumerToWindow( |
871 gesture_recognizer_->GetTargetForLocation(event->location())); | 871 gesture_recognizer_->GetTargetForLocation(event->location())); |
872 } | 872 } |
873 } | 873 } |
874 | 874 |
875 if (!target && !bounds().Contains(event->location())) { | 875 if (!target && !bounds().Contains(event->location())) { |
876 // If the initial touch is outside the root window, target the root. | 876 // If the initial touch is outside the root window, target the root. |
877 target = this; | 877 target = this; |
| 878 status = ProcessTouchEvent(target, event); |
| 879 CHECK_EQ(ui::TOUCH_STATUS_UNKNOWN, status); |
878 } else { | 880 } else { |
879 // We only come here when the first contact was within the root window. | 881 // We only come here when the first contact was within the root window. |
880 if (!target) { | 882 if (!target) { |
881 target = GetEventHandlerForPoint(event->location()); | 883 target = GetEventHandlerForPoint(event->location()); |
882 if (!target) | 884 if (!target) |
883 return false; | 885 return false; |
884 } | 886 } |
885 | 887 |
886 ui::TouchEvent translated_event( | 888 ui::TouchEvent translated_event( |
887 *event, static_cast<Window*>(this), target); | 889 *event, static_cast<Window*>(this), target); |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1035 void RootWindow::UnlockCompositor() { | 1037 void RootWindow::UnlockCompositor() { |
1036 DCHECK(compositor_lock_); | 1038 DCHECK(compositor_lock_); |
1037 compositor_lock_ = NULL; | 1039 compositor_lock_ = NULL; |
1038 if (draw_on_compositor_unlock_) { | 1040 if (draw_on_compositor_unlock_) { |
1039 draw_on_compositor_unlock_ = false; | 1041 draw_on_compositor_unlock_ = false; |
1040 ScheduleDraw(); | 1042 ScheduleDraw(); |
1041 } | 1043 } |
1042 } | 1044 } |
1043 | 1045 |
1044 } // namespace aura | 1046 } // namespace aura |
OLD | NEW |