| Index: cc/output/output_surface.cc
|
| diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
|
| index 7818849cc55facef5e5eb226a6d1c9d0b86347bd..436e37cb624d8d22cce07ed09db67ed380c4dd4e 100644
|
| --- a/cc/output/output_surface.cc
|
| +++ b/cc/output/output_surface.cc
|
| @@ -263,8 +263,7 @@ bool OutputSurface::BindToClient(OutputSurfaceClient* client) {
|
| }
|
|
|
| bool OutputSurface::InitializeAndSetContext3d(
|
| - scoped_refptr<ContextProvider> context_provider,
|
| - scoped_refptr<ContextProvider> offscreen_context_provider) {
|
| + scoped_refptr<ContextProvider> context_provider) {
|
| DCHECK(!context_provider_);
|
| DCHECK(context_provider);
|
| DCHECK(client_);
|
| @@ -273,8 +272,8 @@ bool OutputSurface::InitializeAndSetContext3d(
|
| if (context_provider->BindToCurrentThread()) {
|
| context_provider_ = context_provider;
|
| SetUpContext3d();
|
| - if (client_->DeferredInitialize(offscreen_context_provider))
|
| - success = true;
|
| + client_->DeferredInitialize();
|
| + success = true;
|
| }
|
|
|
| if (!success)
|
|
|