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/window_tree_host_x11.h" | 5 #include "ui/aura/window_tree_host_x11.h" |
6 | 6 |
7 #include <strings.h> | 7 #include <strings.h> |
8 #include <X11/cursorfont.h> | 8 #include <X11/cursorfont.h> |
9 #include <X11/extensions/XInput2.h> | 9 #include <X11/extensions/XInput2.h> |
10 #include <X11/extensions/Xrandr.h> | 10 #include <X11/extensions/Xrandr.h> |
(...skipping 258 matching lines...) Loading... |
269 XA_CARDINAL, | 269 XA_CARDINAL, |
270 32, | 270 32, |
271 PropModeReplace, | 271 PropModeReplace, |
272 reinterpret_cast<unsigned char*>(&pid), 1); | 272 reinterpret_cast<unsigned char*>(&pid), 1); |
273 | 273 |
274 // Allow subclasses to create and cache additional atoms. | 274 // Allow subclasses to create and cache additional atoms. |
275 atom_cache_.allow_uncached_atoms(); | 275 atom_cache_.allow_uncached_atoms(); |
276 | 276 |
277 XRRSelectInput(xdisplay_, x_root_window_, | 277 XRRSelectInput(xdisplay_, x_root_window_, |
278 RRScreenChangeNotifyMask | RROutputChangeNotifyMask); | 278 RRScreenChangeNotifyMask | RROutputChangeNotifyMask); |
279 CreateCompositor(GetAcceleratedWidget()); | 279 CreateCompositor(); |
| 280 OnAcceleratedWidgetAvailable(); |
280 } | 281 } |
281 | 282 |
282 WindowTreeHostX11::~WindowTreeHostX11() { | 283 WindowTreeHostX11::~WindowTreeHostX11() { |
283 if (ui::PlatformEventSource::GetInstance()) | 284 if (ui::PlatformEventSource::GetInstance()) |
284 ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this); | 285 ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this); |
285 | 286 |
286 DestroyCompositor(); | 287 DestroyCompositor(); |
287 DestroyDispatcher(); | 288 DestroyDispatcher(); |
288 XDestroyWindow(xdisplay_, xwindow_); | 289 XDestroyWindow(xdisplay_, xwindow_); |
289 } | 290 } |
(...skipping 377 matching lines...) Loading... |
667 } | 668 } |
668 | 669 |
669 namespace test { | 670 namespace test { |
670 | 671 |
671 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) { | 672 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) { |
672 default_override_redirect = override_redirect; | 673 default_override_redirect = override_redirect; |
673 } | 674 } |
674 | 675 |
675 } // namespace test | 676 } // namespace test |
676 } // namespace aura | 677 } // namespace aura |
OLD | NEW |