Revert 205481 "Virtual context MakeCurrent tweaks."

trunk/src/gpu/command_buffer/service/gl_context_virtual.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/gl_context_virtual.h"
 
 #include "gpu/command_buffer/service/gl_state_restorer_impl.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "ui/gl/gl_surface.h"
 
@@ skipping 36 matching lines @@
   return true;
 }
 
 void GLContextVirtual::Destroy() {
   shared_context_->OnReleaseVirtuallyCurrent(this);
   shared_context_ = NULL;
   display_ = NULL;
 }
 
 bool GLContextVirtual::MakeCurrent(gfx::GLSurface* surface) {
+  // TODO(epenner): We should avoid bypassing MakeVirtuallyCurrent() below
+  // (return false or DCHECK when !decoder). To do this we must reorder
+  // tear-down in GpuCommandBufferStub::Destroy().
   if (decoder_.get())
-    return shared_context_->MakeVirtuallyCurrent(this, surface);
-
-  LOG(ERROR) << "Trying to make virtual context current without decoder.";
-  return false;
+    shared_context_->MakeVirtuallyCurrent(this, surface);
+  else if (!IsCurrent(surface))
+    shared_context_->MakeCurrent(surface);
+  return true;
 }
 
 void GLContextVirtual::ReleaseCurrent(gfx::GLSurface* surface) {
   if (IsCurrent(surface)) {
     shared_context_->OnReleaseVirtuallyCurrent(this);
     shared_context_->ReleaseCurrent(surface);
   }
 }
 
 bool GLContextVirtual::IsCurrent(gfx::GLSurface* surface) {
@@ skipping 36 matching lines @@
 
 void GLContextVirtual::SetUnbindFboOnMakeCurrent() {
   shared_context_->SetUnbindFboOnMakeCurrent();
 }
 
 GLContextVirtual::~GLContextVirtual() {
   Destroy();
 }
 
 }  // namespace gpu