Chromium Code Reviews| Index: content/browser/compositor/onscreen_display_client.h |
| diff --git a/content/browser/compositor/onscreen_display_client.h b/content/browser/compositor/onscreen_display_client.h |
| index 7dc073cf9e951b58e5e64e021fbacaabaa6fe68d..930addd13379cff762db81e4e6bec37eb7ff4c28 100644 |
| --- a/content/browser/compositor/onscreen_display_client.h |
| +++ b/content/browser/compositor/onscreen_display_client.h |
| @@ -18,6 +18,7 @@ class SurfaceManager; |
| } |
| namespace content { |
| +class SurfaceDisplayOutputSurface; |
| // This class provides a DisplayClient implementation for drawing directly to an |
| // onscreen context. |
| @@ -30,10 +31,15 @@ class OnscreenDisplayClient : cc::DisplayClient { |
| virtual ~OnscreenDisplayClient(); |
| cc::Display* display() { return display_.get(); } |
| + void set_surface_output_surface(SurfaceDisplayOutputSurface* surface) { |
|
jamesr
2014/09/17 05:47:11
there's a tongue twister
|
| + surface_display_output_surface_ = surface; |
| + } |
| // cc::DisplayClient implementation. |
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface() OVERRIDE; |
| virtual void DisplayDamaged() OVERRIDE; |
| + virtual void CommitVSyncParameters(base::TimeTicks timebase, |
| + base::TimeDelta interval) OVERRIDE; |
| private: |
| void Draw(); |
| @@ -41,6 +47,7 @@ class OnscreenDisplayClient : cc::DisplayClient { |
| scoped_ptr<cc::OutputSurface> output_surface_; |
| scoped_ptr<cc::Display> display_; |
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| + SurfaceDisplayOutputSurface* surface_display_output_surface_; |
| bool scheduled_draw_; |
| base::WeakPtrFactory<OnscreenDisplayClient> weak_ptr_factory_; |