Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: services/ui/ws/test_utils.cc

Issue 2481263002: Introduce Display Compositor mojo interface. Use InProcessContextProvider. (Closed)
Patch Set: Speculative fix for android build issue Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 gfx::Rect GetBounds() const override { return display_metrics_.bounds; } 56 gfx::Rect GetBounds() const override { return display_metrics_.bounds; }
57 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override { 57 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override {
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(
67 scoped_refptr<gpu::GpuChannelHost> host) override {}
68 FrameGenerator* GetFrameGenerator() override { return nullptr; } 66 FrameGenerator* GetFrameGenerator() override { return nullptr; }
69 67
70 private: 68 private:
71 const int64_t id_; 69 const int64_t id_;
72 display::ViewportMetrics display_metrics_; 70 display::ViewportMetrics display_metrics_;
73 mojom::Cursor* cursor_storage_; 71 mojom::Cursor* cursor_storage_;
74 72
75 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); 73 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay);
76 }; 74 };
77 75
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 return nullptr; 623 return nullptr;
626 if (!tree->AddWindow(parent_client_id, client_window_id)) 624 if (!tree->AddWindow(parent_client_id, client_window_id))
627 return nullptr; 625 return nullptr;
628 *client_id = client_window_id; 626 *client_id = client_window_id;
629 return tree->GetWindowByClientId(client_window_id); 627 return tree->GetWindowByClientId(client_window_id);
630 } 628 }
631 629
632 } // namespace test 630 } // namespace test
633 } // namespace ws 631 } // namespace ws
634 } // namespace ui 632 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698