| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gl/init/gl_factory.h" | 5 #include "ui/gl/init/gl_factory.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/feature_list.h" | 8 #include "base/feature_list.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
| 12 #include "ui/gl/gl_bindings.h" | 12 #include "ui/gl/gl_bindings.h" |
| 13 #include "ui/gl/gl_context_cgl.h" | 13 #include "ui/gl/gl_context_cgl.h" |
| 14 #include "ui/gl/gl_context_osmesa.h" | 14 #include "ui/gl/gl_context_osmesa.h" |
| 15 #include "ui/gl/gl_context_stub.h" | 15 #include "ui/gl/gl_context_stub.h" |
| 16 #include "ui/gl/gl_implementation.h" | 16 #include "ui/gl/gl_implementation.h" |
| 17 #include "ui/gl/gl_share_group.h" | 17 #include "ui/gl/gl_share_group.h" |
| 18 #include "ui/gl/gl_surface.h" | 18 #include "ui/gl/gl_surface.h" |
| 19 #include "ui/gl/gl_surface_osmesa.h" | 19 #include "ui/gl/gl_surface_osmesa.h" |
| 20 #include "ui/gl/gl_surface_stub.h" | 20 #include "ui/gl/gl_surface_stub.h" |
| 21 #include "ui/gl/gl_switches.h" | 21 #include "ui/gl/gl_switches.h" |
| 22 | 22 |
| 23 namespace features { | 23 namespace features { |
| 24 const base::Feature kDesktopCoreProfileGLOnMac{ | 24 const base::Feature kDesktopCoreProfileGLOnMac{ |
| 25 "DesktopCoreProfileGLOnMac", base::FEATURE_DISABLED_BY_DEFAULT}; | 25 "DesktopCoreProfileGLOnMac", base::FEATURE_ENABLED_BY_DEFAULT}; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace gl { | 28 namespace gl { |
| 29 namespace init { | 29 namespace init { |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| 32 | 32 |
| 33 // A "no-op" surface. It is not required that a CGLContextObj have an | 33 // A "no-op" surface. It is not required that a CGLContextObj have an |
| 34 // associated drawable (pbuffer or fullscreen context) in order to be | 34 // associated drawable (pbuffer or fullscreen context) in order to be |
| 35 // made current. Everywhere this surface type is used, we allocate an | 35 // made current. Everywhere this surface type is used, we allocate an |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 case kGLImplementationMockGL: | 137 case kGLImplementationMockGL: |
| 138 return new GLSurfaceStub; | 138 return new GLSurfaceStub; |
| 139 default: | 139 default: |
| 140 NOTREACHED(); | 140 NOTREACHED(); |
| 141 return nullptr; | 141 return nullptr; |
| 142 } | 142 } |
| 143 } | 143 } |
| 144 | 144 |
| 145 } // namespace init | 145 } // namespace init |
| 146 } // namespace gl | 146 } // namespace gl |
| OLD | NEW |