| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 CancelLock(); | 97 CancelLock(); |
| 98 } | 98 } |
| 99 | 99 |
| 100 void CompositorLock::CancelLock() { | 100 void CompositorLock::CancelLock() { |
| 101 if (!root_window_) | 101 if (!root_window_) |
| 102 return; | 102 return; |
| 103 root_window_->UnlockCompositor(); | 103 root_window_->UnlockCompositor(); |
| 104 root_window_ = NULL; | 104 root_window_ = NULL; |
| 105 } | 105 } |
| 106 | 106 |
| 107 bool RootWindow::hide_host_cursor_ = false; | |
| 108 | |
| 109 //////////////////////////////////////////////////////////////////////////////// | 107 //////////////////////////////////////////////////////////////////////////////// |
| 110 // RootWindow, public: | 108 // RootWindow, public: |
| 111 | 109 |
| 112 RootWindow::RootWindow(const gfx::Rect& initial_bounds) | 110 RootWindow::RootWindow(const gfx::Rect& initial_bounds) |
| 113 : Window(NULL), | 111 : Window(NULL), |
| 114 ALLOW_THIS_IN_INITIALIZER_LIST( | 112 ALLOW_THIS_IN_INITIALIZER_LIST( |
| 115 host_(RootWindowHost::Create(this, initial_bounds))), | 113 host_(RootWindowHost::Create(this, initial_bounds))), |
| 116 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), | 114 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), |
| 117 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), | 115 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), |
| 118 mouse_button_flags_(0), | 116 mouse_button_flags_(0), |
| (...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1064 void RootWindow::UnlockCompositor() { | 1062 void RootWindow::UnlockCompositor() { |
| 1065 DCHECK(compositor_lock_); | 1063 DCHECK(compositor_lock_); |
| 1066 compositor_lock_ = NULL; | 1064 compositor_lock_ = NULL; |
| 1067 if (draw_on_compositor_unlock_) { | 1065 if (draw_on_compositor_unlock_) { |
| 1068 draw_on_compositor_unlock_ = false; | 1066 draw_on_compositor_unlock_ = false; |
| 1069 ScheduleDraw(); | 1067 ScheduleDraw(); |
| 1070 } | 1068 } |
| 1071 } | 1069 } |
| 1072 | 1070 |
| 1073 } // namespace aura | 1071 } // namespace aura |
| OLD | NEW |