Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: src/gpu/GrDrawingManager.cpp

Issue 1679743005: Shot in the dark to fix 581472 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "GrDrawContext.h" 8 #include "GrDrawContext.h"
9 #include "GrDrawingManager.h" 9 #include "GrDrawingManager.h"
10 #include "GrDrawTarget.h" 10 #include "GrDrawTarget.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 61
62 void GrDrawingManager::reset() { 62 void GrDrawingManager::reset() {
63 for (int i = 0; i < fDrawTargets.count(); ++i) { 63 for (int i = 0; i < fDrawTargets.count(); ++i) {
64 fDrawTargets[i]->reset(); 64 fDrawTargets[i]->reset();
65 } 65 }
66 fFlushState.reset(); 66 fFlushState.reset();
67 } 67 }
68 68
69 void GrDrawingManager::flush() { 69 void GrDrawingManager::flush() {
70 if (fFlushing) { 70 if (fFlushing || this->abandoned()) {
71 return; 71 return;
72 } 72 }
73 fFlushing = true; 73 fFlushing = true;
74 74
75 SkDEBUGCODE(bool result =) 75 SkDEBUGCODE(bool result =)
76 SkTTopoSort<GrDrawTarget, GrDrawTarget::TopoSortTraits>( &fDrawTargets); 76 SkTTopoSort<GrDrawTarget, GrDrawTarget::TopoSortTraits>( &fDrawTargets);
77 SkASSERT(result); 77 SkASSERT(result);
78 78
79 #if 0 79 #if 0
80 for (int i = 0; i < fDrawTargets.count(); ++i) { 80 for (int i = 0; i < fDrawTargets.count(); ++i) {
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 } 197 }
198 198
199 GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt, 199 GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt,
200 const SkSurfaceProps* surfaceProps) { 200 const SkSurfaceProps* surfaceProps) {
201 if (this->abandoned()) { 201 if (this->abandoned()) {
202 return nullptr; 202 return nullptr;
203 } 203 }
204 204
205 return new GrDrawContext(this, rt, surfaceProps, fContext->getAuditTrail(), fSingleOwner); 205 return new GrDrawContext(this, rt, surfaceProps, fContext->getAuditTrail(), fSingleOwner);
206 } 206 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698