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 81fac47832da5c8989b2a1fd5d0b2822bec76354..767a7ca75f8e5306bedcff7f8eb66dd74f1a6642 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(); |
@@ -3707,7 +3706,6 @@ |
// } // anonymous namespace |
bool GLES2DecoderImpl::MakeCurrent() { |
- DCHECK(surface_); |
if (!context_.get()) |
return false; |
@@ -4265,20 +4263,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) { |