| 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..c2f69f1bf2c7e9163aaf67893d51f448bdb46712 100644
|
| --- a/cc/surfaces/onscreen_display_client.h
|
| +++ b/cc/surfaces/onscreen_display_client.h
|
| @@ -54,14 +54,15 @@ 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_;
|
| SurfaceDisplayOutputSurface* surface_display_output_surface_;
|
| bool output_surface_lost_;
|
| bool disable_gpu_vsync_;
|
|
|
| + private:
|
| DISALLOW_COPY_AND_ASSIGN(OnscreenDisplayClient);
|
| };
|
|
|
|
|