| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 ALLOW_THIS_IN_INITIALIZER_LIST( | 113 ALLOW_THIS_IN_INITIALIZER_LIST( |
| 114 host_(RootWindowHost::Create(this, initial_bounds))), | 114 host_(RootWindowHost::Create(this, initial_bounds))), |
| 115 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), | 115 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), |
| 116 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), | 116 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), |
| 117 mouse_button_flags_(0), | 117 mouse_button_flags_(0), |
| 118 touch_ids_down_(0), | 118 touch_ids_down_(0), |
| 119 last_cursor_(ui::kCursorNull), | 119 last_cursor_(ui::kCursorNull), |
| 120 mouse_pressed_handler_(NULL), | 120 mouse_pressed_handler_(NULL), |
| 121 mouse_moved_handler_(NULL), | 121 mouse_moved_handler_(NULL), |
| 122 mouse_event_dispatch_target_(NULL), | 122 mouse_event_dispatch_target_(NULL), |
| 123 focus_manager_(NULL), |
| 123 ALLOW_THIS_IN_INITIALIZER_LIST( | 124 ALLOW_THIS_IN_INITIALIZER_LIST( |
| 124 gesture_recognizer_(ui::GestureRecognizer::Create(this))), | 125 gesture_recognizer_(ui::GestureRecognizer::Create(this))), |
| 125 synthesize_mouse_move_(false), | 126 synthesize_mouse_move_(false), |
| 126 waiting_on_compositing_end_(false), | 127 waiting_on_compositing_end_(false), |
| 127 draw_on_compositing_end_(false), | 128 draw_on_compositing_end_(false), |
| 128 defer_draw_scheduling_(false), | 129 defer_draw_scheduling_(false), |
| 129 mouse_move_hold_count_(0), | 130 mouse_move_hold_count_(0), |
| 130 ALLOW_THIS_IN_INITIALIZER_LIST(held_mouse_event_factory_(this)), | 131 ALLOW_THIS_IN_INITIALIZER_LIST(held_mouse_event_factory_(this)), |
| 131 compositor_lock_(NULL), | 132 compositor_lock_(NULL), |
| 132 draw_on_compositor_unlock_(false) { | 133 draw_on_compositor_unlock_(false) { |
| (...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1086 void RootWindow::UnlockCompositor() { | 1087 void RootWindow::UnlockCompositor() { |
| 1087 DCHECK(compositor_lock_); | 1088 DCHECK(compositor_lock_); |
| 1088 compositor_lock_ = NULL; | 1089 compositor_lock_ = NULL; |
| 1089 if (draw_on_compositor_unlock_) { | 1090 if (draw_on_compositor_unlock_) { |
| 1090 draw_on_compositor_unlock_ = false; | 1091 draw_on_compositor_unlock_ = false; |
| 1091 ScheduleDraw(); | 1092 ScheduleDraw(); |
| 1092 } | 1093 } |
| 1093 } | 1094 } |
| 1094 | 1095 |
| 1095 } // namespace aura | 1096 } // namespace aura |
| OLD | NEW |