| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/ui/ws/test_utils.h" | 5 #include "services/ui/ws/test_utils.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "cc/output/copy_output_request.h" | 10 #include "cc/output/copy_output_request.h" |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 | 352 |
| 353 void TestWindowTreeClient::OnWindowSharedPropertyChanged( | 353 void TestWindowTreeClient::OnWindowSharedPropertyChanged( |
| 354 uint32_t window, | 354 uint32_t window, |
| 355 const std::string& name, | 355 const std::string& name, |
| 356 const base::Optional<std::vector<uint8_t>>& new_data) { | 356 const base::Optional<std::vector<uint8_t>>& new_data) { |
| 357 tracker_.OnWindowSharedPropertyChanged(window, name, new_data); | 357 tracker_.OnWindowSharedPropertyChanged(window, name, new_data); |
| 358 } | 358 } |
| 359 | 359 |
| 360 void TestWindowTreeClient::OnWindowInputEvent(uint32_t event_id, | 360 void TestWindowTreeClient::OnWindowInputEvent(uint32_t event_id, |
| 361 uint32_t window, | 361 uint32_t window, |
| 362 int64_t display_id, |
| 362 std::unique_ptr<ui::Event> event, | 363 std::unique_ptr<ui::Event> event, |
| 363 bool matches_pointer_watcher) { | 364 bool matches_pointer_watcher) { |
| 364 tracker_.OnWindowInputEvent(window, *event.get(), matches_pointer_watcher); | 365 tracker_.OnWindowInputEvent(window, *event.get(), matches_pointer_watcher); |
| 365 } | 366 } |
| 366 | 367 |
| 367 void TestWindowTreeClient::OnPointerEventObserved( | 368 void TestWindowTreeClient::OnPointerEventObserved( |
| 368 std::unique_ptr<ui::Event> event, | 369 std::unique_ptr<ui::Event> event, |
| 369 uint32_t window_id) { | 370 uint32_t window_id, |
| 371 int64_t display_id) { |
| 370 tracker_.OnPointerEventObserved(*event.get(), window_id); | 372 tracker_.OnPointerEventObserved(*event.get(), window_id); |
| 371 } | 373 } |
| 372 | 374 |
| 373 void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) { | 375 void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) { |
| 374 tracker_.OnWindowFocused(focused_window_id); | 376 tracker_.OnWindowFocused(focused_window_id); |
| 375 } | 377 } |
| 376 | 378 |
| 377 void TestWindowTreeClient::OnWindowPredefinedCursorChanged( | 379 void TestWindowTreeClient::OnWindowPredefinedCursorChanged( |
| 378 uint32_t window_id, | 380 uint32_t window_id, |
| 379 mojom::Cursor cursor_id) { | 381 mojom::Cursor cursor_id) { |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 if (!tree->AddWindow(parent_client_id, client_window_id)) | 638 if (!tree->AddWindow(parent_client_id, client_window_id)) |
| 637 return nullptr; | 639 return nullptr; |
| 638 if (client_id) | 640 if (client_id) |
| 639 *client_id = client_window_id; | 641 *client_id = client_window_id; |
| 640 return tree->GetWindowByClientId(client_window_id); | 642 return tree->GetWindowByClientId(client_window_id); |
| 641 } | 643 } |
| 642 | 644 |
| 643 } // namespace test | 645 } // namespace test |
| 644 } // namespace ws | 646 } // namespace ws |
| 645 } // namespace ui | 647 } // namespace ui |
| OLD | NEW |