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/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 mouse_button_flags_(0), | 126 mouse_button_flags_(0), |
127 touch_ids_down_(0), | 127 touch_ids_down_(0), |
128 last_cursor_(ui::kCursorNull), | 128 last_cursor_(ui::kCursorNull), |
129 // TODO(ivankr): this currently tracks the default state in | 129 // TODO(ivankr): this currently tracks the default state in |
130 // RootWindowHostLinux. Other platforms do not implement ShowCursor(). | 130 // RootWindowHostLinux. Other platforms do not implement ShowCursor(). |
131 cursor_shown_(true), | 131 cursor_shown_(true), |
132 mouse_pressed_handler_(NULL), | 132 mouse_pressed_handler_(NULL), |
133 mouse_moved_handler_(NULL), | 133 mouse_moved_handler_(NULL), |
134 mouse_event_dispatch_target_(NULL), | 134 mouse_event_dispatch_target_(NULL), |
135 event_dispatch_target_(NULL), | 135 event_dispatch_target_(NULL), |
| 136 focus_manager_(NULL), |
136 ALLOW_THIS_IN_INITIALIZER_LIST( | 137 ALLOW_THIS_IN_INITIALIZER_LIST( |
137 gesture_recognizer_(ui::GestureRecognizer::Create(this))), | 138 gesture_recognizer_(ui::GestureRecognizer::Create(this))), |
138 synthesize_mouse_move_(false), | 139 synthesize_mouse_move_(false), |
139 waiting_on_compositing_end_(false), | 140 waiting_on_compositing_end_(false), |
140 draw_on_compositing_end_(false), | 141 draw_on_compositing_end_(false), |
141 defer_draw_scheduling_(false), | 142 defer_draw_scheduling_(false), |
142 mouse_move_hold_count_(0), | 143 mouse_move_hold_count_(0), |
143 ALLOW_THIS_IN_INITIALIZER_LIST(held_mouse_event_factory_(this)), | 144 ALLOW_THIS_IN_INITIALIZER_LIST(held_mouse_event_factory_(this)), |
144 compositor_lock_(NULL), | 145 compositor_lock_(NULL), |
145 draw_on_compositor_unlock_(false) { | 146 draw_on_compositor_unlock_(false) { |
(...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1095 void RootWindow::UnlockCompositor() { | 1096 void RootWindow::UnlockCompositor() { |
1096 DCHECK(compositor_lock_); | 1097 DCHECK(compositor_lock_); |
1097 compositor_lock_ = NULL; | 1098 compositor_lock_ = NULL; |
1098 if (draw_on_compositor_unlock_) { | 1099 if (draw_on_compositor_unlock_) { |
1099 draw_on_compositor_unlock_ = false; | 1100 draw_on_compositor_unlock_ = false; |
1100 ScheduleDraw(); | 1101 ScheduleDraw(); |
1101 } | 1102 } |
1102 } | 1103 } |
1103 | 1104 |
1104 } // namespace aura | 1105 } // namespace aura |
OLD | NEW |