Chromium Code Reviews| 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 CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ |
| 7 | 7 |
| 8 #include "cc/layers/delegated_frame_provider.h" | 8 #include "cc/layers/delegated_frame_provider.h" |
| 9 #include "cc/layers/delegated_frame_resource_collection.h" | 9 #include "cc/layers/delegated_frame_resource_collection.h" |
| 10 #include "cc/output/copy_output_result.h" | 10 #include "cc/output/copy_output_result.h" |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 261 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; | 261 scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_; |
| 262 | 262 |
| 263 // Provides delegated frame updates to the cc::DelegatedRendererLayer. | 263 // Provides delegated frame updates to the cc::DelegatedRendererLayer. |
| 264 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; | 264 scoped_refptr<cc::DelegatedFrameProvider> frame_provider_; |
| 265 | 265 |
| 266 // State for rendering into a Surface. | 266 // State for rendering into a Surface. |
| 267 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_; | 267 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_; |
| 268 scoped_ptr<cc::SurfaceFactory> surface_factory_; | 268 scoped_ptr<cc::SurfaceFactory> surface_factory_; |
| 269 cc::SurfaceId surface_id_; | 269 cc::SurfaceId surface_id_; |
| 270 gfx::Size current_surface_size_; | 270 gfx::Size current_surface_size_; |
| 271 float current_scale_factor_; | |
|
piman
2014/11/12 04:20:10
new field needs initializer
| |
| 271 cc::ReturnedResourceArray surface_returned_resources_; | 272 cc::ReturnedResourceArray surface_returned_resources_; |
| 272 | 273 |
| 273 // This lock is the one waiting for a frame of the right size to come back | 274 // This lock is the one waiting for a frame of the right size to come back |
| 274 // from the renderer/GPU process. It is set from the moment the aura window | 275 // from the renderer/GPU process. It is set from the moment the aura window |
| 275 // got resized, to the moment we committed the renderer frame of the same | 276 // got resized, to the moment we committed the renderer frame of the same |
| 276 // size. It keeps track of the size we expect from the renderer, and locks the | 277 // size. It keeps track of the size we expect from the renderer, and locks the |
| 277 // compositor, as well as the UI for a short time to give a chance to the | 278 // compositor, as well as the UI for a short time to give a chance to the |
| 278 // renderer of producing a frame of the right size. | 279 // renderer of producing a frame of the right size. |
| 279 scoped_ptr<ResizeLock> resize_lock_; | 280 scoped_ptr<ResizeLock> resize_lock_; |
| 280 | 281 |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 304 // YUV readback pipeline. | 305 // YUV readback pipeline. |
| 305 scoped_ptr<content::ReadbackYUVInterface> | 306 scoped_ptr<content::ReadbackYUVInterface> |
| 306 yuv_readback_pipeline_; | 307 yuv_readback_pipeline_; |
| 307 | 308 |
| 308 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; | 309 scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; |
| 309 }; | 310 }; |
| 310 | 311 |
| 311 } // namespace content | 312 } // namespace content |
| 312 | 313 |
| 313 #endif // CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ | 314 #endif // CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_ |
| OLD | NEW |