| OLD | NEW | 
|---|
| 1 | 1 | 
| 2 /* | 2 /* | 
| 3  * Copyright 2015 Google Inc. | 3  * Copyright 2015 Google Inc. | 
| 4  * | 4  * | 
| 5  * Use of this source code is governed by a BSD-style license that can be | 5  * Use of this source code is governed by a BSD-style license that can be | 
| 6  * found in the LICENSE file. | 6  * found in the LICENSE file. | 
| 7  */ | 7  */ | 
| 8 | 8 | 
| 9 #include "GrAtlasTextContext.h" | 9 #include "GrAtlasTextContext.h" | 
| 10 #include "GrBatchTest.h" | 10 #include "GrBatchTest.h" | 
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 136     fTextContext->drawTextBlob(this, fRenderTarget, | 136     fTextContext->drawTextBlob(this, fRenderTarget, | 
| 137                                clip, skPaint, viewMatrix, blob, x, y, filter, cl
     ipBounds); | 137                                clip, skPaint, viewMatrix, blob, x, y, filter, cl
     ipBounds); | 
| 138 } | 138 } | 
| 139 | 139 | 
| 140 void GrDrawContext::drawPathsFromRange(const GrPipelineBuilder* pipelineBuilder, | 140 void GrDrawContext::drawPathsFromRange(const GrPipelineBuilder* pipelineBuilder, | 
| 141                                        const SkMatrix& viewMatrix, | 141                                        const SkMatrix& viewMatrix, | 
| 142                                        const SkMatrix& localMatrix, | 142                                        const SkMatrix& localMatrix, | 
| 143                                        GrColor color, | 143                                        GrColor color, | 
| 144                                        GrPathRange* range, | 144                                        GrPathRange* range, | 
| 145                                        GrPathRangeDraw* draw, | 145                                        GrPathRangeDraw* draw, | 
| 146                                        int /*GrPathRendering::FillType*/ fill) { | 146                                        int /*GrPathRendering::FillType*/ fill, | 
|  | 147                                        const SkRect& bounds) { | 
| 147     RETURN_IF_ABANDONED | 148     RETURN_IF_ABANDONED | 
| 148     SkDEBUGCODE(this->validate();) | 149     SkDEBUGCODE(this->validate();) | 
| 149 | 150 | 
| 150     this->getDrawTarget()->drawPathsFromRange(*pipelineBuilder, viewMatrix, loca
     lMatrix, color, | 151     this->getDrawTarget()->drawPathsFromRange(*pipelineBuilder, viewMatrix, loca
     lMatrix, color, | 
| 151                                               range, draw, (GrPathRendering::Fil
     lType) fill); | 152                                               range, draw, (GrPathRendering::Fil
     lType) fill, | 
|  | 153                                               bounds); | 
| 152 } | 154 } | 
| 153 | 155 | 
| 154 void GrDrawContext::discard() { | 156 void GrDrawContext::discard() { | 
| 155     RETURN_IF_ABANDONED | 157     RETURN_IF_ABANDONED | 
| 156     SkDEBUGCODE(this->validate();) | 158     SkDEBUGCODE(this->validate();) | 
| 157 | 159 | 
| 158     AutoCheckFlush acf(fDrawingManager); | 160     AutoCheckFlush acf(fDrawingManager); | 
| 159     this->getDrawTarget()->discard(fRenderTarget); | 161     this->getDrawTarget()->discard(fRenderTarget); | 
| 160 } | 162 } | 
| 161 | 163 | 
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 811     args.fAntiAlias = useCoverageAA; | 813     args.fAntiAlias = useCoverageAA; | 
| 812     pr->drawPath(args); | 814     pr->drawPath(args); | 
| 813 } | 815 } | 
| 814 | 816 | 
| 815 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b
     atch) { | 817 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b
     atch) { | 
| 816     RETURN_IF_ABANDONED | 818     RETURN_IF_ABANDONED | 
| 817     SkDEBUGCODE(this->validate();) | 819     SkDEBUGCODE(this->validate();) | 
| 818 | 820 | 
| 819     this->getDrawTarget()->drawBatch(*pipelineBuilder, batch); | 821     this->getDrawTarget()->drawBatch(*pipelineBuilder, batch); | 
| 820 } | 822 } | 
| OLD | NEW | 
|---|