| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override { | 48 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override { |
| 49 if (metrics_ == metrics) | 49 if (metrics_ == metrics) |
| 50 return false; | 50 return false; |
| 51 metrics_ = metrics; | 51 metrics_ = metrics; |
| 52 return true; | 52 return true; |
| 53 } | 53 } |
| 54 gfx::AcceleratedWidget GetAcceleratedWidget() const override { | 54 gfx::AcceleratedWidget GetAcceleratedWidget() const override { |
| 55 return gfx::kNullAcceleratedWidget; | 55 return gfx::kNullAcceleratedWidget; |
| 56 } | 56 } |
| 57 FrameGenerator* GetFrameGenerator() override { return nullptr; } | 57 FrameGenerator* GetFrameGenerator() override { return nullptr; } |
| 58 EventSink* GetEventSink() override { return nullptr; } |
| 58 | 59 |
| 59 private: | 60 private: |
| 60 display::ViewportMetrics metrics_; | 61 display::ViewportMetrics metrics_; |
| 61 mojom::Cursor* cursor_storage_; | 62 mojom::Cursor* cursor_storage_; |
| 62 | 63 |
| 63 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); | 64 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); |
| 64 }; | 65 }; |
| 65 | 66 |
| 66 ClientWindowId NextUnusedClientWindowId(WindowTree* tree) { | 67 ClientWindowId NextUnusedClientWindowId(WindowTree* tree) { |
| 67 ClientWindowId client_id; | 68 ClientWindowId client_id; |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 if (!tree->AddWindow(parent_client_id, client_window_id)) | 646 if (!tree->AddWindow(parent_client_id, client_window_id)) |
| 646 return nullptr; | 647 return nullptr; |
| 647 if (client_id) | 648 if (client_id) |
| 648 *client_id = client_window_id; | 649 *client_id = client_window_id; |
| 649 return tree->GetWindowByClientId(client_window_id); | 650 return tree->GetWindowByClientId(client_window_id); |
| 650 } | 651 } |
| 651 | 652 |
| 652 } // namespace test | 653 } // namespace test |
| 653 } // namespace ws | 654 } // namespace ws |
| 654 } // namespace ui | 655 } // namespace ui |
| OLD | NEW |