| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 } | 104 } |
| 105 | 105 |
| 106 fTextContext->drawTextBlob(this, rt, | 106 fTextContext->drawTextBlob(this, rt, |
| 107 clip, skPaint, viewMatrix, blob, x, y, filter, cl
ipBounds); | 107 clip, skPaint, viewMatrix, blob, x, y, filter, cl
ipBounds); |
| 108 } | 108 } |
| 109 | 109 |
| 110 void GrDrawContext::drawPathsFromRange(const GrPipelineBuilder* pipelineBuilder, | 110 void GrDrawContext::drawPathsFromRange(const GrPipelineBuilder* pipelineBuilder, |
| 111 const SkMatrix& viewMatrix, | 111 const SkMatrix& viewMatrix, |
| 112 const SkMatrix& localMatrix, | 112 const SkMatrix& localMatrix, |
| 113 GrColor color, | 113 GrColor color, |
| 114 GrPathRange* range, |
| 114 GrPathRangeDraw* draw, | 115 GrPathRangeDraw* draw, |
| 115 int /*GrPathRendering::FillType*/ fill) { | 116 int /*GrPathRendering::FillType*/ fill) { |
| 116 RETURN_IF_ABANDONED | 117 RETURN_IF_ABANDONED |
| 117 | 118 |
| 118 fDrawTarget->drawPathsFromRange(*pipelineBuilder, viewMatrix, localMatrix, c
olor, draw, | 119 fDrawTarget->drawPathsFromRange(*pipelineBuilder, viewMatrix, localMatrix, c
olor, range, draw, |
| 119 (GrPathRendering::FillType) fill); | 120 (GrPathRendering::FillType) fill); |
| 120 } | 121 } |
| 121 | 122 |
| 122 void GrDrawContext::discard(GrRenderTarget* renderTarget) { | 123 void GrDrawContext::discard(GrRenderTarget* renderTarget) { |
| 123 RETURN_IF_ABANDONED | 124 RETURN_IF_ABANDONED |
| 124 SkASSERT(renderTarget); | 125 SkASSERT(renderTarget); |
| 125 AutoCheckFlush acf(fContext); | 126 AutoCheckFlush acf(fContext); |
| 126 if (!this->prepareToDraw(renderTarget)) { | 127 if (!this->prepareToDraw(renderTarget)) { |
| 127 return; | 128 return; |
| 128 } | 129 } |
| (...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 ASSERT_OWNED_RESOURCE(rt); | 755 ASSERT_OWNED_RESOURCE(rt); |
| 755 SkASSERT(rt); | 756 SkASSERT(rt); |
| 756 return true; | 757 return true; |
| 757 } | 758 } |
| 758 | 759 |
| 759 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b
atch) { | 760 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b
atch) { |
| 760 RETURN_IF_ABANDONED | 761 RETURN_IF_ABANDONED |
| 761 | 762 |
| 762 fDrawTarget->drawBatch(*pipelineBuilder, batch); | 763 fDrawTarget->drawBatch(*pipelineBuilder, batch); |
| 763 } | 764 } |
| OLD | NEW |