| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| index a58c5e6d2b4f7524b1f53841fe3c4de7681db0f6..f28cc4387e7832e07bdf8335f303ff646fd0293c 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -594,7 +594,6 @@
|
| const std::vector<int32_t>& attribs) override;
|
| void Destroy(bool have_context) override;
|
| void SetSurface(const scoped_refptr<gfx::GLSurface>& surface) override;
|
| - void ReleaseSurface() override;
|
| void ProduceFrontBuffer(const Mailbox& mailbox) override;
|
| bool ResizeOffscreenFrameBuffer(const gfx::Size& size) override;
|
| void UpdateParentTextureInfo();
|
| @@ -3684,7 +3683,6 @@
|
| // } // anonymous namespace
|
|
|
| bool GLES2DecoderImpl::MakeCurrent() {
|
| - DCHECK(surface_);
|
| if (!context_.get())
|
| return false;
|
|
|
| @@ -4242,20 +4240,9 @@
|
| void GLES2DecoderImpl::SetSurface(
|
| const scoped_refptr<gfx::GLSurface>& surface) {
|
| DCHECK(context_->IsCurrent(NULL));
|
| - DCHECK(surface);
|
| + DCHECK(surface_.get());
|
| surface_ = surface;
|
| RestoreCurrentFramebufferBindings();
|
| -}
|
| -
|
| -void GLES2DecoderImpl::ReleaseSurface() {
|
| - if (!context_.get())
|
| - return;
|
| - if (WasContextLost()) {
|
| - DLOG(ERROR) << " GLES2DecoderImpl: Trying to release lost context.";
|
| - return;
|
| - }
|
| - context_->ReleaseCurrent(surface_.get());
|
| - surface_ = nullptr;
|
| }
|
|
|
| void GLES2DecoderImpl::ProduceFrontBuffer(const Mailbox& mailbox) {
|
|
|