| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 if (display_metrics_ == metrics) | 58 if (display_metrics_ == metrics) |
| 59 return false; | 59 return false; |
| 60 display_metrics_ = metrics; | 60 display_metrics_ = metrics; |
| 61 return true; | 61 return true; |
| 62 } | 62 } |
| 63 const display::ViewportMetrics& GetViewportMetrics() const override { | 63 const display::ViewportMetrics& GetViewportMetrics() const override { |
| 64 return display_metrics_; | 64 return display_metrics_; |
| 65 } | 65 } |
| 66 void OnGpuChannelEstablished( | 66 void OnGpuChannelEstablished( |
| 67 scoped_refptr<gpu::GpuChannelHost> host) override {} | 67 scoped_refptr<gpu::GpuChannelHost> host) override {} |
| 68 FrameGenerator* GetFrameGenerator() override { return nullptr; } |
| 68 | 69 |
| 69 private: | 70 private: |
| 70 const int64_t id_; | 71 const int64_t id_; |
| 71 display::ViewportMetrics display_metrics_; | 72 display::ViewportMetrics display_metrics_; |
| 72 mojom::Cursor* cursor_storage_; | 73 mojom::Cursor* cursor_storage_; |
| 73 | 74 |
| 74 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); | 75 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); |
| 75 }; | 76 }; |
| 76 | 77 |
| 77 ClientWindowId NextUnusedClientWindowId(WindowTree* tree) { | 78 ClientWindowId NextUnusedClientWindowId(WindowTree* tree) { |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 return nullptr; | 625 return nullptr; |
| 625 if (!tree->AddWindow(parent_client_id, client_window_id)) | 626 if (!tree->AddWindow(parent_client_id, client_window_id)) |
| 626 return nullptr; | 627 return nullptr; |
| 627 *client_id = client_window_id; | 628 *client_id = client_window_id; |
| 628 return tree->GetWindowByClientId(client_window_id); | 629 return tree->GetWindowByClientId(client_window_id); |
| 629 } | 630 } |
| 630 | 631 |
| 631 } // namespace test | 632 } // namespace test |
| 632 } // namespace ws | 633 } // namespace ws |
| 633 } // namespace ui | 634 } // namespace ui |
| OLD | NEW |