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 GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ | 5 #ifndef GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
6 #define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ | 6 #define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
7 | 7 |
8 #include <list> | 8 #include <list> |
| 9 #include <memory> |
9 #include <vector> | 10 #include <vector> |
10 | 11 |
11 #import "base/mac/scoped_nsobject.h" | 12 #import "base/mac/scoped_nsobject.h" |
12 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
13 #include "gpu/ipc/service/gpu_command_buffer_stub.h" | 14 #include "gpu/ipc/service/gpu_command_buffer_stub.h" |
14 #include "gpu/ipc/service/image_transport_surface.h" | 15 #include "gpu/ipc/service/image_transport_surface.h" |
15 #include "ui/base/cocoa/remote_layer_api.h" | 16 #include "ui/base/cocoa/remote_layer_api.h" |
16 #include "ui/gl/gl_surface.h" | 17 #include "ui/gl/gl_surface.h" |
17 #include "ui/gl/gpu_switching_observer.h" | 18 #include "ui/gl/gpu_switching_observer.h" |
18 #include "ui/latency_info/latency_info.h" | 19 #include "ui/latency_info/latency_info.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 | 93 |
93 gfx::Size pixel_size_; | 94 gfx::Size pixel_size_; |
94 float scale_factor_; | 95 float scale_factor_; |
95 | 96 |
96 // The renderer ID that all contexts made current to this surface should be | 97 // The renderer ID that all contexts made current to this surface should be |
97 // targeting. | 98 // targeting. |
98 GLint gl_renderer_id_; | 99 GLint gl_renderer_id_; |
99 | 100 |
100 // Planes that have been scheduled, but have not had a subsequent SwapBuffers | 101 // Planes that have been scheduled, but have not had a subsequent SwapBuffers |
101 // call made yet. | 102 // call made yet. |
102 scoped_ptr<CALayerPartialDamageTree> pending_partial_damage_tree_; | 103 std::unique_ptr<CALayerPartialDamageTree> pending_partial_damage_tree_; |
103 scoped_ptr<CALayerTree> pending_ca_layer_tree_; | 104 std::unique_ptr<CALayerTree> pending_ca_layer_tree_; |
104 | 105 |
105 // The planes that are currently being displayed on the screen. | 106 // The planes that are currently being displayed on the screen. |
106 scoped_ptr<CALayerPartialDamageTree> current_partial_damage_tree_; | 107 std::unique_ptr<CALayerPartialDamageTree> current_partial_damage_tree_; |
107 scoped_ptr<CALayerTree> current_ca_layer_tree_; | 108 std::unique_ptr<CALayerTree> current_ca_layer_tree_; |
108 | 109 |
109 // The vsync information provided by the browser. | 110 // The vsync information provided by the browser. |
110 bool vsync_parameters_valid_; | 111 bool vsync_parameters_valid_; |
111 base::TimeTicks vsync_timebase_; | 112 base::TimeTicks vsync_timebase_; |
112 base::TimeDelta vsync_interval_; | 113 base::TimeDelta vsync_interval_; |
113 }; | 114 }; |
114 | 115 |
115 } // namespace gpu | 116 } // namespace gpu |
116 | 117 |
117 #endif // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ | 118 #endif // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
OLD | NEW |