Merge 193302 "Force GPU switch with CGLSetVirtualScreen only for..."

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 "ui/gl/gl_surface.h"
 
 namespace gpu {
@@ skipping 73 matching lines @@
 }
 
 std::string GLContextVirtual::GetExtensions() {
   return shared_context_->GetExtensions();
 }
 
 bool GLContextVirtual::GetTotalGpuMemory(size_t* bytes) {
   return shared_context_->GetTotalGpuMemory(bytes);
 }
 
+void GLContextVirtual::SetSafeToForceGpuSwitch() {
+  // TODO(ccameron): This will not work if two contexts that disagree
+  // about whether or not forced gpu switching may be done both share
+  // the same underlying shared_context_.
+  return shared_context_->SetSafeToForceGpuSwitch();
+}
+
 bool GLContextVirtual::WasAllocatedUsingRobustnessExtension() {
   return shared_context_->WasAllocatedUsingRobustnessExtension();
 }
 
 GLContextVirtual::~GLContextVirtual() {
   Destroy();
 }
 
 }  // namespace gpu