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/remote_root_window_host_win.h" | 5 #include "ui/aura/remote_root_window_host_win.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 : remote_window_(NULL), | 160 : remote_window_(NULL), |
161 host_(NULL), | 161 host_(NULL), |
162 ignore_mouse_moves_until_set_cursor_ack_(false), | 162 ignore_mouse_moves_until_set_cursor_ack_(false), |
163 event_flags_(0), | 163 event_flags_(0), |
164 window_size_(aura::RootWindowHost::GetNativeScreenSize()) { | 164 window_size_(aura::RootWindowHost::GetNativeScreenSize()) { |
165 prop_.reset(new ui::ViewProp(NULL, kRootWindowHostWinKey, this)); | 165 prop_.reset(new ui::ViewProp(NULL, kRootWindowHostWinKey, this)); |
166 CreateCompositor(GetAcceleratedWidget()); | 166 CreateCompositor(GetAcceleratedWidget()); |
167 } | 167 } |
168 | 168 |
169 RemoteRootWindowHostWin::~RemoteRootWindowHostWin() { | 169 RemoteRootWindowHostWin::~RemoteRootWindowHostWin() { |
| 170 DestroyCompositor(); |
170 g_instance = NULL; | 171 g_instance = NULL; |
171 } | 172 } |
172 | 173 |
173 void RemoteRootWindowHostWin::Connected(IPC::Sender* host, HWND remote_window) { | 174 void RemoteRootWindowHostWin::Connected(IPC::Sender* host, HWND remote_window) { |
174 CHECK(host_ == NULL); | 175 CHECK(host_ == NULL); |
175 host_ = host; | 176 host_ = host; |
176 remote_window_ = remote_window; | 177 remote_window_ = remote_window; |
177 } | 178 } |
178 | 179 |
179 void RemoteRootWindowHostWin::Disconnected() { | 180 void RemoteRootWindowHostWin::Disconnected() { |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 } | 722 } |
722 | 723 |
723 void RemoteRootWindowHostWin::SetEventFlags(uint32 flags) { | 724 void RemoteRootWindowHostWin::SetEventFlags(uint32 flags) { |
724 if (flags == event_flags_) | 725 if (flags == event_flags_) |
725 return; | 726 return; |
726 event_flags_ = flags; | 727 event_flags_ = flags; |
727 SetVirtualKeyStates(event_flags_); | 728 SetVirtualKeyStates(event_flags_); |
728 } | 729 } |
729 | 730 |
730 } // namespace aura | 731 } // namespace aura |
OLD | NEW |