| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * 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 |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "GrDrawingManager.h" | 8 #include "GrDrawingManager.h" |
| 9 | 9 |
| 10 #include "GrContext.h" | 10 #include "GrContext.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 // TODO: although this is true right now it isn't cool | 158 // TODO: although this is true right now it isn't cool |
| 159 return SkRef((GrRenderTargetOpList*) fOpLists[0]); | 159 return SkRef((GrRenderTargetOpList*) fOpLists[0]); |
| 160 } | 160 } |
| 161 #endif | 161 #endif |
| 162 | 162 |
| 163 GrRenderTargetOpList* opList = new GrRenderTargetOpList(rtp, | 163 GrRenderTargetOpList* opList = new GrRenderTargetOpList(rtp, |
| 164 fContext->getGpu(), | 164 fContext->getGpu(), |
| 165 fContext->resourcePr
ovider(), | 165 fContext->resourcePr
ovider(), |
| 166 fContext->getAuditTr
ail(), | 166 fContext->getAuditTr
ail(), |
| 167 fOptionsForOpLists); | 167 fOptionsForOpLists); |
| 168 | |
| 169 *fOpLists.append() = opList; | 168 *fOpLists.append() = opList; |
| 170 | 169 |
| 171 // DrawingManager gets the creation ref - this ref is for the caller | 170 // DrawingManager gets the creation ref - this ref is for the caller |
| 172 return SkRef(opList); | 171 return SkRef(opList); |
| 173 } | 172 } |
| 174 | 173 |
| 175 GrAtlasTextContext* GrDrawingManager::getAtlasTextContext() { | 174 GrAtlasTextContext* GrDrawingManager::getAtlasTextContext() { |
| 176 if (!fAtlasTextContext) { | 175 if (!fAtlasTextContext) { |
| 177 fAtlasTextContext.reset(GrAtlasTextContext::Create()); | 176 fAtlasTextContext.reset(GrAtlasTextContext::Create()); |
| 178 } | 177 } |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 fContext->getAuditTrail(
), fSingleOwner)); | 240 fContext->getAuditTrail(
), fSingleOwner)); |
| 242 } | 241 } |
| 243 } | 242 } |
| 244 | 243 |
| 245 return sk_sp<GrRenderTargetContext>(new GrRenderTargetContext(fContext, this
, std::move(rtp), | 244 return sk_sp<GrRenderTargetContext>(new GrRenderTargetContext(fContext, this
, std::move(rtp), |
| 246 std::move(colo
rSpace), | 245 std::move(colo
rSpace), |
| 247 surfaceProps, | 246 surfaceProps, |
| 248 fContext->getA
uditTrail(), | 247 fContext->getA
uditTrail(), |
| 249 fSingleOwner))
; | 248 fSingleOwner))
; |
| 250 } | 249 } |
| OLD | NEW |