| 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 3b45922c697f3ca0a0dc16125a005582064c124a..40c5f9b35755dc7d657071a642dd34b3e862abd0 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -877,9 +877,6 @@ class GLES2DecoderImpl : public GLES2Decoder, public ErrorStateClient {
|
|
|
| void WaitForReadPixels(base::Closure callback) override;
|
|
|
| - void SetResizeCallback(
|
| - const base::Callback<void(gfx::Size, float)>& callback) override;
|
| -
|
| Logger* GetLogger() override;
|
|
|
| void BeginDecoding() override;
|
| @@ -2194,8 +2191,6 @@ class GLES2DecoderImpl : public GLES2Decoder, public ErrorStateClient {
|
|
|
| scoped_ptr<ImageManager> image_manager_;
|
|
|
| - base::Callback<void(gfx::Size, float)> resize_callback_;
|
| -
|
| WaitSyncPointCallback wait_sync_point_callback_;
|
| FenceSyncReleaseCallback fence_sync_release_callback_;
|
| WaitFenceSyncCallback wait_fence_sync_callback_;
|
| @@ -4135,11 +4130,6 @@ void GLES2DecoderImpl::UpdateParentTextureInfo() {
|
| glBindTexture(target, texture_ref ? texture_ref->service_id() : 0);
|
| }
|
|
|
| -void GLES2DecoderImpl::SetResizeCallback(
|
| - const base::Callback<void(gfx::Size, float)>& callback) {
|
| - resize_callback_ = callback;
|
| -}
|
| -
|
| Logger* GLES2DecoderImpl::GetLogger() {
|
| return &logger_;
|
| }
|
| @@ -4536,10 +4526,11 @@ error::Error GLES2DecoderImpl::HandleResizeCHROMIUM(uint32 immediate_data_size,
|
| << "ResizeOffscreenFrameBuffer failed.";
|
| return error::kLostContext;
|
| }
|
| - }
|
| -
|
| - if (!resize_callback_.is_null()) {
|
| - resize_callback_.Run(gfx::Size(width, height), scale_factor);
|
| + } else {
|
| + if (!surface_->Resize(gfx::Size(width, height), scale_factor)) {
|
| + LOG(ERROR) << "GLES2DecoderImpl: Context lost because resize failed.";
|
| + return error::kLostContext;
|
| + }
|
| DCHECK(context_->IsCurrent(surface_.get()));
|
| if (!context_->IsCurrent(surface_.get())) {
|
| LOG(ERROR) << "GLES2DecoderImpl: Context lost because context no longer "
|
|
|