| Index: cc/test/fake_output_surface.h
|
| diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
|
| index 6eff484d450e00c7a3114710f5d74e1e04d741e9..7460f93b1baa29baa6bbf5cab9251c820ce239bc 100644
|
| --- a/cc/test/fake_output_surface.h
|
| +++ b/cc/test/fake_output_surface.h
|
| @@ -58,9 +58,10 @@ class FakeOutputSurface : public OutputSurface {
|
| }
|
|
|
| static scoped_ptr<FakeOutputSurface> CreateDeferredGL(
|
| + scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
|
| scoped_ptr<SoftwareOutputDevice> software_device) {
|
| scoped_ptr<FakeOutputSurface> result(
|
| - new FakeOutputSurface(software_device.Pass(), false));
|
| + new FakeOutputSurface(context3d.Pass(), software_device.Pass(), false));
|
| result->capabilities_.deferred_gl_initialization = true;
|
| return result.Pass();
|
| }
|
| @@ -90,6 +91,11 @@ class FakeOutputSurface : public OutputSurface {
|
| scoped_ptr<SoftwareOutputDevice> software_device,
|
| bool has_parent);
|
|
|
| + FakeOutputSurface(
|
| + scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
|
| + scoped_ptr<SoftwareOutputDevice> software_device,
|
| + bool has_parent);
|
| +
|
| void SendFrameAck();
|
|
|
| CompositorFrame last_sent_frame_;
|
|
|