Fix crash when rotating screen after resume

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 <list>
@@ skipping 3610 matching lines @@
 void GLES2DecoderImpl::AddProcessingCommandsTime(base::TimeDelta time) {
   total_processing_commands_time_ += time;
 }
 
 void GLES2DecoderImpl::Destroy(bool have_context) {
   if (!initialized())
     return;
 
   DCHECK(!have_context || context_->IsCurrent(NULL));
 
+  if (vertex_array_manager_ .get()) {
+    // Destroy needs to be called before the VertexAttribManagers are destoryed

[jamesr, 2015/04/30 00:11:21]

s/destoryed/destroyed/

[etiennej, 2015/04/30 12:27:08]

Done.

+    // so that they know the context is no longer available and do not attempts
+    // to call gl* functions.
+    vertex_array_manager_->Destroy(have_context);
+  }
+
   // Unbind everything.
   state_.vertex_attrib_manager = NULL;
   state_.default_vertex_attrib_manager = NULL;
   state_.texture_units.clear();
   state_.bound_array_buffer = NULL;
   state_.current_queries.clear();
   framebuffer_state_.bound_read_framebuffer = NULL;
   framebuffer_state_.bound_draw_framebuffer = NULL;
   state_.bound_renderbuffer = NULL;
   state_.bound_valuebuffer = NULL;
@@ skipping 79 matching lines @@
 
   copy_texture_CHROMIUM_.reset();
   clear_framebuffer_blit_.reset();
 
   if (query_manager_.get()) {
     query_manager_->Destroy(have_context);
     query_manager_.reset();
   }
 
   if (vertex_array_manager_ .get()) {
-    vertex_array_manager_->Destroy(have_context);
     vertex_array_manager_.reset();
   }
 
   if (image_manager_.get()) {
     image_manager_->Destroy(have_context);
     image_manager_.reset();
   }
 
   offscreen_target_frame_buffer_.reset();
   offscreen_target_color_texture_.reset();
@@ skipping 204 matching lines @@
   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);
-    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 8465 matching lines @@
   }
 }
 
 // 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