| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef SERVICES_UI_WS_DISPLAY_H_ | 5 #ifndef SERVICES_UI_WS_DISPLAY_H_ |
| 6 #define SERVICES_UI_WS_DISPLAY_H_ | 6 #define SERVICES_UI_WS_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 // Initializes state that depends on the existence of a Display. | 65 // Initializes state that depends on the existence of a Display. |
| 66 void Init(std::unique_ptr<DisplayBinding> binding); | 66 void Init(std::unique_ptr<DisplayBinding> binding); |
| 67 | 67 |
| 68 int64_t GetId() const; | 68 int64_t GetId() const; |
| 69 | 69 |
| 70 DisplayManager* display_manager(); | 70 DisplayManager* display_manager(); |
| 71 const DisplayManager* display_manager() const; | 71 const DisplayManager* display_manager() const; |
| 72 | 72 |
| 73 PlatformDisplay* platform_display() { return platform_display_.get(); } | 73 PlatformDisplay* platform_display() { return platform_display_.get(); } |
| 74 | 74 |
| 75 // Returns a mojom::WsDisplay for the specified display. WindowManager | 75 // Returns a display::Display corresponding to this ws::Display. |
| 76 // specific values are not set. | |
| 77 mojom::WsDisplayPtr ToWsDisplay() const; | |
| 78 | |
| 79 // Returns a display::Display for the specficied display. | |
| 80 display::Display ToDisplay() const; | 76 display::Display ToDisplay() const; |
| 81 | 77 |
| 82 // Schedules a paint for the specified region in the coordinates of |window|. | 78 // Schedules a paint for the specified region in the coordinates of |window|. |
| 83 void SchedulePaint(const ServerWindow* window, const gfx::Rect& bounds); | 79 void SchedulePaint(const ServerWindow* window, const gfx::Rect& bounds); |
| 84 | 80 |
| 85 gfx::Size GetSize() const; | 81 gfx::Size GetSize() const; |
| 86 | 82 |
| 87 WindowServer* window_server() { return window_server_; } | 83 WindowServer* window_server() { return window_server_; } |
| 88 | 84 |
| 89 // Returns the root of the Display. The root's children are the roots | 85 // Returns the root of the Display. The root's children are the roots |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 | 201 |
| 206 WindowManagerDisplayRootMap window_manager_display_root_map_; | 202 WindowManagerDisplayRootMap window_manager_display_root_map_; |
| 207 | 203 |
| 208 DISALLOW_COPY_AND_ASSIGN(Display); | 204 DISALLOW_COPY_AND_ASSIGN(Display); |
| 209 }; | 205 }; |
| 210 | 206 |
| 211 } // namespace ws | 207 } // namespace ws |
| 212 } // namespace ui | 208 } // namespace ui |
| 213 | 209 |
| 214 #endif // SERVICES_UI_WS_DISPLAY_H_ | 210 #endif // SERVICES_UI_WS_DISPLAY_H_ |
| OLD | NEW |