Allow GLES2CmdDecoder to change the GLSurface associated with the default FBO.

content/common/gpu/gpu_command_buffer_stub.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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 196 matching lines @@
     delayed_echos_.pop_front();
   }
 
   if (decoder_.get())
     decoder_->MakeCurrent();
   FOR_EACH_OBSERVER(DestructionObserver,
                     destruction_observers_,
                     OnWillDestroyStub(this));
 
   if (decoder_.get()) {
-    decoder_->Destroy();
+    decoder_->Destroy(true);
     decoder_.reset();
   }
 
   command_buffer_.reset();
 
   context_ = NULL;
   surface_ = NULL;
 
   channel_->gpu_channel_manager()->gpu_memory_manager()->ScheduleManage();
 }
@@ skipping 61 matching lines @@
       gpu_preference);
   if (!context_.get()) {
     // Ensure the decoder is not destroyed if it is not initialized.
     decoder_.reset();
 
     DLOG(ERROR) << "Failed to create context.\n";
     OnInitializeFailed(reply_message);
     return;
   }
 
+  if (!context_->MakeCurrent(surface_.get())) {
+    LOG(ERROR) << "Failed to make context current.";
+    OnInitializeFailed(reply_message);
+    return;
+  }
+
   // Initialize the decoder with either the view or pbuffer GLContext.
-  if (!decoder_->Initialize(surface_.get(),
-                            context_.get(),
+  if (!decoder_->Initialize(surface_,
+                            context_,
                             !surface_id(),
                             initial_size_,
                             disallowed_features_,
                             allowed_extensions_.c_str(),
                             requested_attribs_)) {
     DLOG(ERROR) << "Failed to initialize decoder.";
     OnInitializeFailed(reply_message);
     return;
   }
 
@@ skipping 330 matching lines @@
 
 void GpuCommandBufferStub::SetMemoryAllocation(
     const GpuMemoryAllocation& allocation) {
   Send(new GpuCommandBufferMsg_SetMemoryAllocation(route_id_, allocation));
   if (!surface_)
     return;
   surface_->SetFrontbufferAllocation(allocation.suggest_have_frontbuffer);
 }
 
 #endif  // defined(ENABLE_GPU)