Chromium Code Reviews| Index: cc/surfaces/onscreen_display_client.h |
| diff --git a/cc/surfaces/onscreen_display_client.h b/cc/surfaces/onscreen_display_client.h |
| index ef61e53ef580fa82afb6c2b43e6048b5778a1272..5303992c50cc9d5afb2bbb449df135077b71310b 100644 |
| --- a/cc/surfaces/onscreen_display_client.h |
| +++ b/cc/surfaces/onscreen_display_client.h |
| @@ -16,8 +16,10 @@ |
| namespace cc { |
| class ContextProvider; |
| +class DisplayScheduler; |
| class SurfaceManager; |
| class SurfaceDisplayOutputSurface; |
| +class SyntheticBeginFrameSource; |
| // This class provides a DisplayClient implementation for drawing directly to an |
| // onscreen context. |
| @@ -40,9 +42,6 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient |
| } |
| // DisplayClient implementation. |
| - void DisplayDamaged() override; |
| - void DidSwapBuffers() override; |
| - void DidSwapBuffersComplete() override; |
| void CommitVSyncParameters(base::TimeTicks timebase, |
| base::TimeDelta interval) override; |
| void OutputSurfaceLost() override; |
| @@ -51,21 +50,13 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient |
| bool output_surface_lost() { return output_surface_lost_; } |
| private: |
| - void ScheduleDraw(); |
| - void Draw(); |
| - |
| scoped_ptr<OutputSurface> output_surface_; |
| scoped_ptr<Display> display_; |
| + scoped_ptr<DisplayScheduler> scheduler_; |
| + scoped_ptr<SyntheticBeginFrameSource> synthetic_begin_frame_source_; |
|
brianderson
2015/04/07 02:32:19
I wanted to always give the scheduler an external
jbauman
2015/04/07 23:51:29
Seems fine.
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| SurfaceDisplayOutputSurface* surface_display_output_surface_; |
| - bool scheduled_draw_; |
| bool output_surface_lost_; |
| - // True if a draw should be scheduled, but it's hit the limit on max frames |
| - // pending. |
| - bool deferred_draw_; |
| - int pending_frames_; |
| - |
| - base::WeakPtrFactory<OnscreenDisplayClient> weak_ptr_factory_; |
| DISALLOW_COPY_AND_ASSIGN(OnscreenDisplayClient); |
| }; |