| Index: mojo/gles2/gles2_context.cc
|
| diff --git a/mojo/gles2/gles2_context.cc b/mojo/gles2/gles2_context.cc
|
| index 58b86bd90d9d8e9d494b0f4c680c606d9e86a0fd..90ba14e8c957a8d4d5edce7ca41098126a1d0f92 100644
|
| --- a/mojo/gles2/gles2_context.cc
|
| +++ b/mojo/gles2/gles2_context.cc
|
| @@ -28,7 +28,7 @@
|
| mojo::ScopedMessagePipeHandle command_buffer_handle,
|
| MojoGLES2ContextLost lost_callback,
|
| void* closure)
|
| - : command_buffer_(attribs, std::move(command_buffer_handle)),
|
| + : command_buffer_(this, attribs, std::move(command_buffer_handle)),
|
| lost_callback_(lost_callback),
|
| closure_(closure) {}
|
|
|
| @@ -57,18 +57,12 @@
|
| lose_context_when_out_of_memory,
|
| support_client_side_arrays,
|
| &command_buffer_));
|
| - if (!implementation_->Initialize(kDefaultStartTransferBufferSize,
|
| - kDefaultMinTransferBufferSize,
|
| - kDefaultMaxTransferBufferSize,
|
| - gpu::gles2::GLES2Implementation::kNoLimit))
|
| - return false;
|
| - implementation_->SetLostContextCallback(
|
| - base::Bind(&GLES2Context::OnLostContext, base::Unretained(this)));
|
| - return true;
|
| + return implementation_->Initialize(kDefaultStartTransferBufferSize,
|
| + kDefaultMinTransferBufferSize,
|
| + kDefaultMaxTransferBufferSize,
|
| + gpu::gles2::GLES2Implementation::kNoLimit);
|
| }
|
|
|
| -void GLES2Context::OnLostContext() {
|
| - lost_callback_(closure_);
|
| -}
|
| +void GLES2Context::ContextLost() { lost_callback_(closure_); }
|
|
|
| } // namespace gles2
|
|
|