| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 void OnWindowOpacityChanged(uint32_t window, | 350 void OnWindowOpacityChanged(uint32_t window, |
| 351 float old_opacity, | 351 float old_opacity, |
| 352 float new_opacity) override { | 352 float new_opacity) override { |
| 353 tracker()->OnWindowOpacityChanged(window, new_opacity); | 353 tracker()->OnWindowOpacityChanged(window, new_opacity); |
| 354 } | 354 } |
| 355 void OnWindowParentDrawnStateChanged(uint32_t window, bool drawn) override { | 355 void OnWindowParentDrawnStateChanged(uint32_t window, bool drawn) override { |
| 356 tracker()->OnWindowParentDrawnStateChanged(window, drawn); | 356 tracker()->OnWindowParentDrawnStateChanged(window, drawn); |
| 357 } | 357 } |
| 358 void OnWindowInputEvent(uint32_t event_id, | 358 void OnWindowInputEvent(uint32_t event_id, |
| 359 Id window_id, | 359 Id window_id, |
| 360 EventPtr event) override { | 360 EventPtr event, |
| 361 uint32_t event_observer_id) override { |
| 361 // Ack input events to clear the state on the server. These can be received | 362 // Ack input events to clear the state on the server. These can be received |
| 362 // during test startup. X11Window::DispatchEvent sends a synthetic move | 363 // during test startup. X11Window::DispatchEvent sends a synthetic move |
| 363 // event to notify of entry. | 364 // event to notify of entry. |
| 364 tree()->OnWindowInputEventAck(event_id, mojom::EventResult::HANDLED); | 365 tree()->OnWindowInputEventAck(event_id, mojom::EventResult::HANDLED); |
| 365 // Don't log input events as none of the tests care about them and they | 366 // Don't log input events as none of the tests care about them and they |
| 366 // may come in at random points. | 367 // may come in at random points. |
| 367 } | 368 } |
| 369 void OnEventObserved(EventPtr event, uint32_t event_observer_id) override {} |
| 368 void OnWindowSharedPropertyChanged(uint32_t window, | 370 void OnWindowSharedPropertyChanged(uint32_t window, |
| 369 const String& name, | 371 const String& name, |
| 370 Array<uint8_t> new_data) override { | 372 Array<uint8_t> new_data) override { |
| 371 tracker_.OnWindowSharedPropertyChanged(window, name, std::move(new_data)); | 373 tracker_.OnWindowSharedPropertyChanged(window, name, std::move(new_data)); |
| 372 } | 374 } |
| 373 // TODO(sky): add testing coverage. | 375 // TODO(sky): add testing coverage. |
| 374 void OnWindowFocused(uint32_t focused_window_id) override {} | 376 void OnWindowFocused(uint32_t focused_window_id) override {} |
| 375 void OnWindowPredefinedCursorChanged(uint32_t window_id, | 377 void OnWindowPredefinedCursorChanged(uint32_t window_id, |
| 376 mojom::Cursor cursor_id) override { | 378 mojom::Cursor cursor_id) override { |
| 377 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); | 379 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); |
| (...skipping 1655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2033 | 2035 |
| 2034 // TODO(sky): make sure coverage of what was | 2036 // TODO(sky): make sure coverage of what was |
| 2035 // WindowManagerTest.SecondEmbedRoot_InitService and | 2037 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 2036 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 2038 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 2037 // manager | 2039 // manager |
| 2038 // tests. | 2040 // tests. |
| 2039 | 2041 |
| 2040 } // namespace test | 2042 } // namespace test |
| 2041 } // namespace ws | 2043 } // namespace ws |
| 2042 } // namespace mus | 2044 } // namespace mus |
| OLD | NEW |