OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ | 5 #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ |
6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ | 6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
149 const cc::RenderPassList& render_passes) override {} | 149 const cc::RenderPassList& render_passes) override {} |
150 void DisplayDidDrawAndSwap() override {} | 150 void DisplayDidDrawAndSwap() override {} |
151 }; | 151 }; |
152 | 152 |
153 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface | 153 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface |
154 // is owned/destroyed on the compositor thread. | 154 // is owned/destroyed on the compositor thread. |
155 std::unique_ptr<cc::SurfaceManager> surface_manager_; | 155 std::unique_ptr<cc::SurfaceManager> surface_manager_; |
156 std::unique_ptr<cc::LocalSurfaceIdAllocator> local_surface_id_allocator_; | 156 std::unique_ptr<cc::LocalSurfaceIdAllocator> local_surface_id_allocator_; |
157 cc::LocalSurfaceId child_local_surface_id_; | 157 cc::LocalSurfaceId child_local_surface_id_; |
158 cc::LocalSurfaceId root_local_surface_id_; | 158 cc::LocalSurfaceId root_local_surface_id_; |
159 gfx::Size child_size_; | |
160 gfx::Size display_size_; | |
161 float device_scale_factor_; | |
piman
2017/05/23 18:03:17
new POD field needs new initializer
Saman Sami
2017/05/23 18:31:08
Done.
| |
159 // Uses surface_manager_. | 162 // Uses surface_manager_. |
160 std::unique_ptr<cc::CompositorFrameSinkSupport> root_support_; | 163 std::unique_ptr<cc::CompositorFrameSinkSupport> root_support_; |
161 // Uses surface_manager_. | 164 // Uses surface_manager_. |
162 std::unique_ptr<cc::CompositorFrameSinkSupport> child_support_; | 165 std::unique_ptr<cc::CompositorFrameSinkSupport> child_support_; |
163 StubDisplayClient display_client_; | 166 StubDisplayClient display_client_; |
164 // Uses surface_manager_. | 167 // Uses surface_manager_. |
165 std::unique_ptr<cc::Display> display_; | 168 std::unique_ptr<cc::Display> display_; |
166 // Owned by |display_|. | 169 // Owned by |display_|. |
167 SoftwareOutputSurface* software_output_surface_ = nullptr; | 170 SoftwareOutputSurface* software_output_surface_ = nullptr; |
168 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_; | 171 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_; |
169 | 172 |
170 gfx::Rect sw_viewport_for_current_draw_; | 173 gfx::Rect sw_viewport_for_current_draw_; |
171 | 174 |
172 base::ThreadChecker thread_checker_; | 175 base::ThreadChecker thread_checker_; |
173 | 176 |
174 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFrameSink); | 177 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFrameSink); |
175 }; | 178 }; |
176 | 179 |
177 } // namespace content | 180 } // namespace content |
178 | 181 |
179 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ | 182 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ |
OLD | NEW |