| Index: cc/test/fake_output_surface.h
|
| diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
|
| index a564eef1546e09f1a828d0af04e2571c6c080f17..39a78ead5946bb537ed6d4c909eafd0c7c3d6e9e 100644
|
| --- a/cc/test/fake_output_surface.h
|
| +++ b/cc/test/fake_output_surface.h
|
| @@ -24,7 +24,7 @@ class FakeOutputSurface : public OutputSurface {
|
|
|
| static scoped_ptr<FakeOutputSurface> Create3d() {
|
| return make_scoped_ptr(new FakeOutputSurface(
|
| - TestContextProvider::Create(), false));
|
| + TestContextProvider::Create(), TestContextProvider::Create(), false));
|
| }
|
|
|
| static scoped_ptr<FakeOutputSurface> Create3d(
|
| @@ -33,6 +33,13 @@ class FakeOutputSurface : public OutputSurface {
|
| }
|
|
|
| static scoped_ptr<FakeOutputSurface> Create3d(
|
| + scoped_refptr<ContextProvider> context_provider,
|
| + scoped_refptr<ContextProvider> worker_context_provider) {
|
| + return make_scoped_ptr(new FakeOutputSurface(
|
| + context_provider, worker_context_provider, false));
|
| + }
|
| +
|
| + static scoped_ptr<FakeOutputSurface> Create3d(
|
| scoped_ptr<TestWebGraphicsContext3D> context) {
|
| return make_scoped_ptr(new FakeOutputSurface(
|
| TestContextProvider::Create(context.Pass()), false));
|
| @@ -46,7 +53,7 @@ class FakeOutputSurface : public OutputSurface {
|
|
|
| static scoped_ptr<FakeOutputSurface> CreateDelegating3d() {
|
| return make_scoped_ptr(new FakeOutputSurface(
|
| - TestContextProvider::Create(), true));
|
| + TestContextProvider::Create(), TestContextProvider::Create(), true));
|
| }
|
|
|
| static scoped_ptr<FakeOutputSurface> CreateDelegating3d(
|
| @@ -128,9 +135,12 @@ class FakeOutputSurface : public OutputSurface {
|
| scoped_refptr<ContextProvider> context_provider,
|
| bool delegated_rendering);
|
|
|
| - FakeOutputSurface(
|
| - scoped_ptr<SoftwareOutputDevice> software_device,
|
| - bool delegated_rendering);
|
| + FakeOutputSurface(scoped_refptr<ContextProvider> context_provider,
|
| + scoped_refptr<ContextProvider> worker_context_provider,
|
| + bool delegated_rendering);
|
| +
|
| + FakeOutputSurface(scoped_ptr<SoftwareOutputDevice> software_device,
|
| + bool delegated_rendering);
|
|
|
| FakeOutputSurface(
|
| scoped_refptr<ContextProvider> context_provider,
|
|
|