| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/gl_context.h" | 5 #include "ui/gl/gl_context.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 9 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
| 10 #include "ui/gl/gl_bindings.h" | 11 #include "ui/gl/gl_bindings.h" |
| 11 #include "ui/gl/gl_context_egl.h" | 12 #include "ui/gl/gl_context_egl.h" |
| 12 #include "ui/gl/gl_context_osmesa.h" | 13 #include "ui/gl/gl_context_osmesa.h" |
| 13 #include "ui/gl/gl_context_stub.h" | 14 #include "ui/gl/gl_context_stub.h" |
| 14 #include "ui/gl/gl_implementation.h" | 15 #include "ui/gl/gl_implementation.h" |
| 15 #include "ui/gl/gl_surface.h" | 16 #include "ui/gl/gl_surface.h" |
| 16 | 17 |
| 17 namespace gfx { | 18 namespace gfx { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 break; | 90 break; |
| 90 } | 91 } |
| 91 | 92 |
| 92 if (!context->Initialize(compatible_surface, gpu_preference)) | 93 if (!context->Initialize(compatible_surface, gpu_preference)) |
| 93 return nullptr; | 94 return nullptr; |
| 94 | 95 |
| 95 return context; | 96 return context; |
| 96 } | 97 } |
| 97 | 98 |
| 98 } | 99 } |
| OLD | NEW |