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 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
884 if (!target) | 884 if (!target) |
885 return false; | 885 return false; |
886 } | 886 } |
887 | 887 |
888 ui::TouchEvent translated_event( | 888 ui::TouchEvent translated_event( |
889 *event, static_cast<Window*>(this), target); | 889 *event, static_cast<Window*>(this), target); |
890 status = ProcessTouchEvent(target, &translated_event); | 890 status = ProcessTouchEvent(target, &translated_event); |
891 handled = status != ui::TOUCH_STATUS_UNKNOWN; | 891 handled = status != ui::TOUCH_STATUS_UNKNOWN; |
892 | 892 |
893 if (status == ui::TOUCH_STATUS_QUEUED || | 893 if (status == ui::TOUCH_STATUS_QUEUED || |
894 status == ui::TOUCH_STATUS_QUEUED_END) | 894 status == ui::TOUCH_STATUS_QUEUED_END) { |
895 gesture_recognizer_->QueueTouchEventForGesture(target, *event); | 895 gesture_recognizer_->QueueTouchEventForGesture(target, *event); |
| 896 return true; |
| 897 } |
896 } | 898 } |
897 | 899 |
898 // Get the list of GestureEvents from GestureRecognizer. | 900 // Get the list of GestureEvents from GestureRecognizer. |
899 scoped_ptr<ui::GestureRecognizer::Gestures> gestures; | 901 scoped_ptr<ui::GestureRecognizer::Gestures> gestures; |
900 gestures.reset(gesture_recognizer_->ProcessTouchEventForGesture( | 902 gestures.reset(gesture_recognizer_->ProcessTouchEventForGesture( |
901 *event, status, target)); | 903 *event, status, target)); |
902 | 904 |
903 return ProcessGestures(gestures.get()) ? true : handled; | 905 return ProcessGestures(gestures.get()) ? true : handled; |
904 } | 906 } |
905 | 907 |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1037 void RootWindow::UnlockCompositor() { | 1039 void RootWindow::UnlockCompositor() { |
1038 DCHECK(compositor_lock_); | 1040 DCHECK(compositor_lock_); |
1039 compositor_lock_ = NULL; | 1041 compositor_lock_ = NULL; |
1040 if (draw_on_compositor_unlock_) { | 1042 if (draw_on_compositor_unlock_) { |
1041 draw_on_compositor_unlock_ = false; | 1043 draw_on_compositor_unlock_ = false; |
1042 ScheduleDraw(); | 1044 ScheduleDraw(); |
1043 } | 1045 } |
1044 } | 1046 } |
1045 | 1047 |
1046 } // namespace aura | 1048 } // namespace aura |
OLD | NEW |