Mac: Only allow NSOpenGLContext displaying on the main display

ui/accelerated_widget_mac/io_surface_texture.mm

 // 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 "ui/accelerated_widget_mac/io_surface_texture.h"
 
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/OpenGL.h>
@@ skipping 11 matching lines @@
 #include "ui/accelerated_widget_mac/io_surface_context.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gl/gl_context.h"
 
 namespace ui {
 
 // static
 scoped_refptr<IOSurfaceTexture> IOSurfaceTexture::Create(
-    bool needs_gl_finish_workaround) {
-  static bool use_ns_gl_surfaces =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableNSGLSurfaces);
+    bool needs_gl_finish_workaround,
+    bool use_ns_apis) {
   scoped_refptr<IOSurfaceContext> offscreen_context;
-  if (!use_ns_gl_surfaces) {
+  if (!use_ns_apis) {
     offscreen_context = IOSurfaceContext::Get(
         IOSurfaceContext::kOffscreenContext);
     if (!offscreen_context.get()) {
       LOG(ERROR) << "Failed to create context for offscreen operations";
       return NULL;
     }
   }
-  return new IOSurfaceTexture(offscreen_context, needs_gl_finish_workaround);
+  return new IOSurfaceTexture(
+      offscreen_context, use_ns_apis, needs_gl_finish_workaround);
 }
 
 IOSurfaceTexture::IOSurfaceTexture(
     const scoped_refptr<IOSurfaceContext>& offscreen_context,
+    bool use_ns_apis,
     bool needs_gl_finish_workaround)
     : offscreen_context_(offscreen_context),
       texture_(0),
       gl_error_(GL_NO_ERROR),
       eviction_queue_iterator_(eviction_queue_.Get().end()),
       eviction_has_been_drawn_since_updated_(false),
-      needs_gl_finish_workaround_(needs_gl_finish_workaround) {
+      needs_gl_finish_workaround_(needs_gl_finish_workaround),
+      using_ns_apis_(use_ns_apis) {
 }
 
 IOSurfaceTexture::~IOSurfaceTexture() {
   ReleaseIOSurfaceAndTexture();
   offscreen_context_ = NULL;
   DCHECK(eviction_queue_iterator_ == eviction_queue_.Get().end());
 }
 
 bool IOSurfaceTexture::DrawIOSurface() {
   return DrawIOSurfaceWithDamageRect(gfx::Rect(pixel_size_));
@@ skipping 248 matching lines @@
 }
 
 // static
 base::LazyInstance<IOSurfaceTexture::EvictionQueue>
     IOSurfaceTexture::eviction_queue_;
 
 // static
 bool IOSurfaceTexture::eviction_scheduled_ = false;
 
 }  // namespace ui