| Index: cc/test/fake_output_surface.h
|
| diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
|
| index 1150b05b0619bb11f1737f79586db405a468058e..f21e0580f628ddbb238d6416e6459a6d3e2d2280 100644
|
| --- a/cc/test/fake_output_surface.h
|
| +++ b/cc/test/fake_output_surface.h
|
| @@ -20,12 +20,24 @@ class FakeOutputSurface : public OutputSurface {
|
|
|
| static inline scoped_ptr<FakeOutputSurface> Create3d(
|
| scoped_ptr<WebKit::WebGraphicsContext3D> context3d) {
|
| - return make_scoped_ptr(new FakeOutputSurface(context3d.Pass()));
|
| + return make_scoped_ptr(new FakeOutputSurface(context3d.Pass(), false));
|
| }
|
|
|
| static inline scoped_ptr<FakeOutputSurface> CreateSoftware(
|
| scoped_ptr<SoftwareOutputDevice> software_device) {
|
| - return make_scoped_ptr(new FakeOutputSurface(software_device.Pass()));
|
| + return make_scoped_ptr(
|
| + new FakeOutputSurface(software_device.Pass(), false));
|
| + }
|
| +
|
| + static inline scoped_ptr<FakeOutputSurface> CreateDelegating3d(
|
| + scoped_ptr<WebKit::WebGraphicsContext3D> context3d) {
|
| + return make_scoped_ptr(new FakeOutputSurface(context3d.Pass(), true));
|
| + }
|
| +
|
| + static inline scoped_ptr<FakeOutputSurface> CreateDelegatingSoftware(
|
| + scoped_ptr<SoftwareOutputDevice> software_device) {
|
| + return make_scoped_ptr(
|
| + new FakeOutputSurface(software_device.Pass(), true));
|
| }
|
|
|
| virtual bool BindToClient(OutputSurfaceClient* client) OVERRIDE;
|
| @@ -39,9 +51,9 @@ class FakeOutputSurface : public OutputSurface {
|
|
|
| private:
|
| explicit FakeOutputSurface(
|
| - scoped_ptr<WebKit::WebGraphicsContext3D> context3d);
|
| + scoped_ptr<WebKit::WebGraphicsContext3D> context3d, bool has_parent);
|
| explicit FakeOutputSurface(
|
| - scoped_ptr<SoftwareOutputDevice> software_device);
|
| + scoped_ptr<SoftwareOutputDevice> software_device, bool has_parent);
|
|
|
| scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
|
| scoped_ptr<SoftwareOutputDevice> software_device_;
|
|
|