Revert 205481 "Virtual context MakeCurrent tweaks."

trunk/src/gpu/command_buffer/service/gl_context_virtual.cc

Index: trunk/src/gpu/command_buffer/service/gl_context_virtual.cc
===================================================================
--- trunk/src/gpu/command_buffer/service/gl_context_virtual.cc	(revision 205969)
+++ trunk/src/gpu/command_buffer/service/gl_context_virtual.cc	(working copy)
@@ -54,11 +54,14 @@
 }
 
 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) {