Index: cc/surfaces/onscreen_display_client.h |
diff --git a/cc/surfaces/onscreen_display_client.h b/cc/surfaces/onscreen_display_client.h |
index ec147df80af37e56bcf74603ef3d78563a93b027..5769595c03676b905d2d0aee63cd9f69743b9ed9 100644 |
--- a/cc/surfaces/onscreen_display_client.h |
+++ b/cc/surfaces/onscreen_display_client.h |
@@ -28,13 +28,12 @@ class SurfaceDisplayOutputSurface; |
class CC_SURFACES_EXPORT OnscreenDisplayClient |
: NON_EXPORTED_BASE(DisplayClient) { |
public: |
- OnscreenDisplayClient( |
- scoped_ptr<OutputSurface> output_surface, |
- SurfaceManager* manager, |
- SharedBitmapManager* bitmap_manager, |
- gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
- const RendererSettings& settings, |
- scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
+ OnscreenDisplayClient(scoped_ptr<OutputSurface> output_surface, |
+ SurfaceManager* manager, |
+ SharedBitmapManager* bitmap_manager, |
+ gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
+ const RendererSettings& settings, |
+ base::SingleThreadTaskRunner* task_runner); |
~OnscreenDisplayClient() override; |
bool Initialize(); |
@@ -54,10 +53,10 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient |
protected: |
scoped_ptr<OutputSurface> output_surface_; |
scoped_ptr<Display> display_; |
- VSyncParameterObserver* vsync_observer_; |
- scoped_ptr<BeginFrameSource> begin_frame_source_; |
+ scoped_ptr<SyntheticBeginFrameSource> synthetic_frame_source_; |
+ scoped_ptr<BackToBackBeginFrameSource> unthrottled_frame_source_; |
scoped_ptr<DisplayScheduler> scheduler_; |
- scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
+ base::SingleThreadTaskRunner* task_runner_; |
SurfaceDisplayOutputSurface* surface_display_output_surface_; |
bool output_surface_lost_; |
bool disable_gpu_vsync_; |