OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_PLATFORM_DISPLAY_H_ | 5 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_H_ |
6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_H_ | 6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 19 matching lines...) Expand all Loading... | |
30 } // namespace cc | 30 } // namespace cc |
31 | 31 |
32 namespace gfx { | 32 namespace gfx { |
33 class Rect; | 33 class Rect; |
34 } | 34 } |
35 | 35 |
36 namespace ui { | 36 namespace ui { |
37 class CursorLoader; | 37 class CursorLoader; |
38 class PlatformWindow; | 38 class PlatformWindow; |
39 struct TextInputState; | 39 struct TextInputState; |
40 } // namespace ui | 40 } // namespace ui |
sadrul
2016/08/22 15:18:14
whoa. While you are here, mind merging this down t
Alex Z.
2016/08/22 15:26:02
Done.
| |
41 | 41 |
42 namespace ui { | 42 namespace ui { |
43 | 43 |
44 class FrameGenerator; | 44 class FrameGenerator; |
45 class ImageCursors; | |
45 | 46 |
46 namespace ws { | 47 namespace ws { |
47 | 48 |
48 class EventDispatcher; | 49 class EventDispatcher; |
49 class PlatformDisplayFactory; | 50 class PlatformDisplayFactory; |
50 struct PlatformDisplayInitParams; | 51 struct PlatformDisplayInitParams; |
51 class ServerWindow; | 52 class ServerWindow; |
52 | 53 |
53 // PlatformDisplay is used to connect the root ServerWindow to a display. | 54 // PlatformDisplay is used to connect the root ServerWindow to a display. |
54 class PlatformDisplay { | 55 class PlatformDisplay { |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
157 // FrameGeneratorDelegate: | 158 // FrameGeneratorDelegate: |
158 ServerWindow* GetRootWindow() override; | 159 ServerWindow* GetRootWindow() override; |
159 void OnCompositorFrameDrawn() override; | 160 void OnCompositorFrameDrawn() override; |
160 bool IsInHighContrastMode() override; | 161 bool IsInHighContrastMode() override; |
161 const ViewportMetrics& GetViewportMetrics() override; | 162 const ViewportMetrics& GetViewportMetrics() override; |
162 | 163 |
163 int64_t id_; | 164 int64_t id_; |
164 display::PlatformScreen* platform_screen_; | 165 display::PlatformScreen* platform_screen_; |
165 | 166 |
166 #if !defined(OS_ANDROID) | 167 #if !defined(OS_ANDROID) |
167 std::unique_ptr<ui::CursorLoader> cursor_loader_; | 168 std::unique_ptr<ui::ImageCursors> image_cursors_; |
168 #endif | 169 #endif |
169 | 170 |
170 PlatformDisplayDelegate* delegate_ = nullptr; | 171 PlatformDisplayDelegate* delegate_ = nullptr; |
171 std::unique_ptr<FrameGenerator> frame_generator_; | 172 std::unique_ptr<FrameGenerator> frame_generator_; |
172 | 173 |
173 ViewportMetrics metrics_; | 174 ViewportMetrics metrics_; |
174 std::unique_ptr<ui::PlatformWindow> platform_window_; | 175 std::unique_ptr<ui::PlatformWindow> platform_window_; |
175 | 176 |
176 DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay); | 177 DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay); |
177 }; | 178 }; |
178 | 179 |
179 } // namespace ws | 180 } // namespace ws |
180 | 181 |
181 } // namespace ui | 182 } // namespace ui |
182 | 183 |
183 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_H_ | 184 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_H_ |
OLD | NEW |