| Index: cc/surfaces/display.h
|
| diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
|
| index 94202c5628369e65ebaecaa524504bc0b270fa05..2064b85da53a13b335268667e6a43e96a6d46721 100644
|
| --- a/cc/surfaces/display.h
|
| +++ b/cc/surfaces/display.h
|
| @@ -24,6 +24,7 @@ class BlockingTaskRunner;
|
| class DirectRenderer;
|
| class DisplayClient;
|
| class OutputSurface;
|
| +class RendererSettings;
|
| class ResourceProvider;
|
| class SharedBitmapManager;
|
| class Surface;
|
| @@ -42,7 +43,8 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
|
| Display(DisplayClient* client,
|
| SurfaceManager* manager,
|
| SharedBitmapManager* bitmap_manager,
|
| - GpuMemoryBufferManager* gpu_memory_buffer_manager);
|
| + GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| + const RendererSettings& settings);
|
| ~Display() override;
|
|
|
| bool Initialize(scoped_ptr<OutputSurface> output_surface);
|
| @@ -88,7 +90,7 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
|
| GpuMemoryBufferManager* gpu_memory_buffer_manager_;
|
| SurfaceId current_surface_id_;
|
| gfx::Size current_surface_size_;
|
| - LayerTreeSettings settings_;
|
| + RendererSettings settings_;
|
| scoped_ptr<OutputSurface> output_surface_;
|
| scoped_ptr<ResourceProvider> resource_provider_;
|
| scoped_ptr<SurfaceAggregator> aggregator_;
|
|
|