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

ui/gl/gl_context.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 <string>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
@@ skipping 24 matching lines @@
     SetCurrent(NULL, NULL);
   }
 }
 
 bool GLContext::GetTotalGpuMemory(size_t* bytes) {
   DCHECK(bytes);
   *bytes = 0;
   return false;
 }
 
+void GLContext::SetSafeToForceGpuSwitch() {
+}
+
 std::string GLContext::GetExtensions() {
   DCHECK(IsCurrent(NULL));
   const char* ext = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
   return std::string(ext ? ext : "");
 }
 
 bool GLContext::HasExtension(const char* name) {
   std::string extensions = GetExtensions();
   extensions += " ";
 
@@ skipping 68 matching lines @@
 void GLContext::OnDestroyVirtualContext(GLContext* virtual_context) {
   if (virtual_gl_api_)
     virtual_gl_api_->OnDestroyVirtualContext(virtual_context);
 }
 
 void GLContext::SetRealGLApi() {
   SetGLToRealGLApi();
 }
 
 }  // namespace gfx