| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/host/ash_window_tree_host_x11.h" | 5 #include "ash/host/ash_window_tree_host_x11.h" |
| 6 | 6 |
| 7 #include <X11/extensions/Xfixes.h> | 7 #include <X11/extensions/Xfixes.h> |
| 8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
| 9 #include <X11/Xatom.h> | 9 #include <X11/Xatom.h> |
| 10 #include <X11/Xlib.h> | 10 #include <X11/Xlib.h> |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 } | 134 } |
| 135 | 135 |
| 136 void AshWindowTreeHostX11::SetRootTransform(const gfx::Transform& transform) { | 136 void AshWindowTreeHostX11::SetRootTransform(const gfx::Transform& transform) { |
| 137 transformer_helper_.SetTransform(transform); | 137 transformer_helper_.SetTransform(transform); |
| 138 } | 138 } |
| 139 | 139 |
| 140 gfx::Transform AshWindowTreeHostX11::GetInverseRootTransform() const { | 140 gfx::Transform AshWindowTreeHostX11::GetInverseRootTransform() const { |
| 141 return transformer_helper_.GetInverseTransform(); | 141 return transformer_helper_.GetInverseTransform(); |
| 142 } | 142 } |
| 143 | 143 |
| 144 void AshWindowTreeHostX11::UpdateRootWindowSize(const gfx::Size& host_size) { | 144 void AshWindowTreeHostX11::UpdateRootWindowSizeInPixels( |
| 145 transformer_helper_.UpdateWindowSize(host_size); | 145 const gfx::Size& host_size_in_pixels) { |
| 146 transformer_helper_.UpdateWindowSize(host_size_in_pixels); |
| 146 } | 147 } |
| 147 | 148 |
| 148 void AshWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) { | 149 void AshWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) { |
| 149 #if defined(OS_CHROMEOS) | 150 #if defined(OS_CHROMEOS) |
| 150 SetCrOSTapPaused(!show); | 151 SetCrOSTapPaused(!show); |
| 151 #endif | 152 #endif |
| 152 } | 153 } |
| 153 | 154 |
| 154 void AshWindowTreeHostX11::OnWindowInitialized(aura::Window* window) {} | 155 void AshWindowTreeHostX11::OnWindowInitialized(aura::Window* window) {} |
| 155 | 156 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 continue; | 251 continue; |
| 251 XFree(data); | 252 XFree(data); |
| 252 XIChangeProperty(xdisplay(), dev_list[i].deviceid, prop, XA_INTEGER, 8, | 253 XIChangeProperty(xdisplay(), dev_list[i].deviceid, prop, XA_INTEGER, 8, |
| 253 PropModeReplace, &value, 1); | 254 PropModeReplace, &value, 1); |
| 254 } | 255 } |
| 255 } | 256 } |
| 256 } | 257 } |
| 257 #endif // defined(OS_CHROMEOS) | 258 #endif // defined(OS_CHROMEOS) |
| 258 | 259 |
| 259 } // namespace ash | 260 } // namespace ash |
| OLD | NEW |