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 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
849 } | 849 } |
850 | 850 |
851 bool RootWindow::DispatchLongPressGestureEvent(ui::GestureEvent* event) { | 851 bool RootWindow::DispatchLongPressGestureEvent(ui::GestureEvent* event) { |
852 return DispatchGestureEvent(static_cast<GestureEvent*>(event)); | 852 return DispatchGestureEvent(static_cast<GestureEvent*>(event)); |
853 } | 853 } |
854 | 854 |
855 bool RootWindow::DispatchCancelTouchEvent(ui::TouchEvent* event) { | 855 bool RootWindow::DispatchCancelTouchEvent(ui::TouchEvent* event) { |
856 return DispatchTouchEvent(static_cast<TouchEvent*>(event)); | 856 return DispatchTouchEvent(static_cast<TouchEvent*>(event)); |
857 } | 857 } |
858 | 858 |
859 ui::GestureEvent* RootWindow::CreateGestureEvent(ui::EventType type, | 859 ui::GestureEvent* RootWindow::CreateGestureEvent( |
| 860 const ui::GestureEventDetails& details, |
860 const gfx::Point& location, | 861 const gfx::Point& location, |
861 int flags, | 862 int flags, |
862 base::Time time, | 863 base::Time time, |
863 float param_first, | |
864 float param_second, | |
865 unsigned int touch_id_bitfield) { | 864 unsigned int touch_id_bitfield) { |
866 return new GestureEvent(type, location.x(), location.y(), flags, time, | 865 return new GestureEvent(details.type(), location.x(), location.y(), |
867 param_first, param_second, touch_id_bitfield); | 866 flags, time, details, |
| 867 touch_id_bitfield); |
868 } | 868 } |
869 | 869 |
870 ui::TouchEvent* RootWindow::CreateTouchEvent(ui::EventType type, | 870 ui::TouchEvent* RootWindow::CreateTouchEvent(ui::EventType type, |
871 const gfx::Point& location, | 871 const gfx::Point& location, |
872 int touch_id, | 872 int touch_id, |
873 base::TimeDelta time_stamp) { | 873 base::TimeDelta time_stamp) { |
874 return new TouchEvent(type, location, touch_id, time_stamp); | 874 return new TouchEvent(type, location, touch_id, time_stamp); |
875 } | 875 } |
876 | 876 |
877 void RootWindow::OnLayerAnimationEnded( | 877 void RootWindow::OnLayerAnimationEnded( |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
983 void RootWindow::UnlockCompositor() { | 983 void RootWindow::UnlockCompositor() { |
984 DCHECK(compositor_lock_); | 984 DCHECK(compositor_lock_); |
985 compositor_lock_ = NULL; | 985 compositor_lock_ = NULL; |
986 if (draw_on_compositor_unlock_) { | 986 if (draw_on_compositor_unlock_) { |
987 draw_on_compositor_unlock_ = false; | 987 draw_on_compositor_unlock_ = false; |
988 ScheduleDraw(); | 988 ScheduleDraw(); |
989 } | 989 } |
990 } | 990 } |
991 | 991 |
992 } // namespace aura | 992 } // namespace aura |
OLD | NEW |