GLES2CmdDecoder should resize GLSurface using GLSurface::Resize

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 859 matching lines @@
   }
 
   bool HasPendingQueries() const override;
   void ProcessPendingQueries(bool did_finish) override;
 
   bool HasMoreIdleWork() const override;
   void PerformIdleWork() override;
 
   void WaitForReadPixels(base::Closure callback) override;
 
-  void SetResizeCallback(
-      const base::Callback<void(gfx::Size, float)>& callback) override;
-
   Logger* GetLogger() override;
 
   void BeginDecoding() override;
   void EndDecoding() override;
 
   ErrorState* GetErrorState() override;
   const ContextState* GetContextState() override { return &state_; }
 
   void SetShaderCacheCallback(const ShaderCacheCallback& callback) override;
   void SetWaitSyncPointCallback(const WaitSyncPointCallback& callback) override;
@@ skipping 1294 matching lines @@
   scoped_ptr<BackFramebuffer> offscreen_resolved_frame_buffer_;
   scoped_ptr<BackTexture> offscreen_resolved_color_texture_;
   GLenum offscreen_saved_color_format_;
 
   scoped_ptr<QueryManager> query_manager_;
 
   scoped_ptr<VertexArrayManager> vertex_array_manager_;
 
   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_;
 
   ShaderCacheCallback shader_cache_callback_;
 
   // The format of the back buffer_
   GLenum back_buffer_color_format_;
   bool back_buffer_has_depth_;
   bool back_buffer_has_stencil_;
@@ skipping 1919 matching lines @@
       "UpdateParentTextureInfo",
       GetErrorState(),
       offscreen_saved_color_texture_info_.get(),
       GL_TEXTURE_WRAP_T,
       GL_CLAMP_TO_EDGE);
   TextureRef* texture_ref = texture_manager()->GetTextureInfoForTarget(
       &state_, target);
   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_;
 }
 
 void GLES2DecoderImpl::BeginDecoding() {
   gpu_tracer_->BeginDecoding();
   gpu_trace_commands_ = gpu_tracer_->IsTracing() && *gpu_decoder_category_;
   gpu_debug_commands_ = log_commands() || debug() || gpu_trace_commands_;
   query_manager_->ProcessFrameBeginUpdates();
 }
@@ skipping 376 matching lines @@
   // Make sure that we are done drawing to the back buffer before resizing.
   glFinish();
 #endif
   bool is_offscreen = !!offscreen_target_frame_buffer_.get();
   if (is_offscreen) {
     if (!ResizeOffscreenFrameBuffer(gfx::Size(width, height))) {
       LOG(ERROR) << "GLES2DecoderImpl: Context lost because "
                  << "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 "
                  << "current after resize callback.";
       return error::kLostContext;
     }
   }
 
   return error::kNoError;
 }
@@ skipping 10427 matching lines @@
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu