| OLD | NEW |
| 1 | |
| 2 /* | 1 /* |
| 3 * Copyright 2014 Google Inc. | 2 * Copyright 2014 Google Inc. |
| 4 * | 3 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 7 */ | 6 */ |
| 8 | 7 |
| 9 #include "GrContextFactory.h" | 8 #include "GrContextFactory.h" |
| 10 | 9 |
| 11 #if SK_ANGLE | 10 #if SK_ANGLE |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 } | 149 } |
| 151 } | 150 } |
| 152 | 151 |
| 153 Context& context = fContexts.push_back(); | 152 Context& context = fContexts.push_back(); |
| 154 context.fGLContext = glCtx.release(); | 153 context.fGLContext = glCtx.release(); |
| 155 context.fGrContext = SkRef(grCtx.get()); | 154 context.fGrContext = SkRef(grCtx.get()); |
| 156 context.fType = type; | 155 context.fType = type; |
| 157 context.fOptions = options; | 156 context.fOptions = options; |
| 158 return ContextInfo(context.fGrContext, context.fGLContext); | 157 return ContextInfo(context.fGrContext, context.fGLContext); |
| 159 } | 158 } |
| OLD | NEW |