| 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 12fac97b458d25c1c24d15d4d9cae87359b7682a..be6b052c921b87885ea0359b2d3590dc94219818 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,12 +31,17 @@ class OnscreenDisplayClient : cc::DisplayClient {
|
| virtual ~OnscreenDisplayClient();
|
|
|
| cc::Display* display() { return display_.get(); }
|
| + void set_surface_output_surface(SurfaceDisplayOutputSurface* surface) {
|
| + surface_display_output_surface_ = surface;
|
| + }
|
|
|
| // cc::DisplayClient implementation.
|
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface() OVERRIDE;
|
| virtual void DisplayDamaged() OVERRIDE;
|
| virtual void DidSwapBuffers() OVERRIDE;
|
| virtual void DidSwapBuffersComplete() OVERRIDE;
|
| + virtual void CommitVSyncParameters(base::TimeTicks timebase,
|
| + base::TimeDelta interval) OVERRIDE;
|
|
|
| private:
|
| void ScheduleDraw();
|
| @@ -44,6 +50,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_;
|
| // True if a draw should be scheduled, but it's hit the limit on max frames
|
| // pending.
|
|
|