| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/cancelable_callback.h" | 10 #include "base/cancelable_callback.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 current_real_context_.Pointer()->Set(nullptr); | 266 current_real_context_.Pointer()->Set(nullptr); |
| 267 } | 267 } |
| 268 | 268 |
| 269 void GLContextReal::SetCurrent(GLSurface* surface) { | 269 void GLContextReal::SetCurrent(GLSurface* surface) { |
| 270 GLContext::SetCurrent(surface); | 270 GLContext::SetCurrent(surface); |
| 271 current_real_context_.Pointer()->Set(surface ? this : nullptr); | 271 current_real_context_.Pointer()->Set(surface ? this : nullptr); |
| 272 } | 272 } |
| 273 | 273 |
| 274 scoped_refptr<GLContext> InitializeGLContext(scoped_refptr<GLContext> context, | 274 scoped_refptr<GLContext> InitializeGLContext(scoped_refptr<GLContext> context, |
| 275 GLSurface* compatible_surface, | 275 GLSurface* compatible_surface, |
| 276 GpuPreference gpu_preference) { | 276 const GLContextAttribs& attribs) { |
| 277 if (!context->Initialize(compatible_surface, gpu_preference)) | 277 if (!context->Initialize(compatible_surface, attribs)) |
| 278 return nullptr; | 278 return nullptr; |
| 279 return context; | 279 return context; |
| 280 } | 280 } |
| 281 | 281 |
| 282 } // namespace gl | 282 } // namespace gl |
| OLD | NEW |