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_host_x11.h" | 5 #include "ui/aura/root_window_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/Xfixes.h> | 9 #include <X11/extensions/Xfixes.h> |
10 #include <X11/extensions/XInput2.h> | 10 #include <X11/extensions/XInput2.h> |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 CreateCompositor(GetAcceleratedWidget()); | 382 CreateCompositor(GetAcceleratedWidget()); |
383 } | 383 } |
384 | 384 |
385 WindowTreeHostX11::~WindowTreeHostX11() { | 385 WindowTreeHostX11::~WindowTreeHostX11() { |
386 Env::GetInstance()->RemoveObserver(this); | 386 Env::GetInstance()->RemoveObserver(this); |
387 base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this); | 387 base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this); |
388 base::MessagePumpX11::Current()->RemoveDispatcherForWindow(xwindow_); | 388 base::MessagePumpX11::Current()->RemoveDispatcherForWindow(xwindow_); |
389 | 389 |
390 UnConfineCursor(); | 390 UnConfineCursor(); |
391 | 391 |
| 392 DestroyCompositor(); |
392 XDestroyWindow(xdisplay_, xwindow_); | 393 XDestroyWindow(xdisplay_, xwindow_); |
393 } | 394 } |
394 | 395 |
395 bool WindowTreeHostX11::Dispatch(const base::NativeEvent& event) { | 396 bool WindowTreeHostX11::Dispatch(const base::NativeEvent& event) { |
396 XEvent* xev = event; | 397 XEvent* xev = event; |
397 | 398 |
398 if (FindEventTarget(event) == x_root_window_) | 399 if (FindEventTarget(event) == x_root_window_) |
399 return DispatchEventForRootWindow(event); | 400 return DispatchEventForRootWindow(event); |
400 | 401 |
401 switch (xev->type) { | 402 switch (xev->type) { |
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1052 } | 1053 } |
1053 | 1054 |
1054 namespace test { | 1055 namespace test { |
1055 | 1056 |
1056 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) { | 1057 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) { |
1057 default_override_redirect = override_redirect; | 1058 default_override_redirect = override_redirect; |
1058 } | 1059 } |
1059 | 1060 |
1060 } // namespace test | 1061 } // namespace test |
1061 } // namespace aura | 1062 } // namespace aura |
OLD | NEW |