| Index: src/gpu/batches/GrDrawPathBatch.cpp
|
| diff --git a/src/gpu/batches/GrDrawPathBatch.cpp b/src/gpu/batches/GrDrawPathBatch.cpp
|
| index faf2d961fd220231958cc251d3b12ef440c24324..b585ff82ae4e4cf7d1908e8c66bf42010f655165 100644
|
| --- a/src/gpu/batches/GrDrawPathBatch.cpp
|
| +++ b/src/gpu/batches/GrDrawPathBatch.cpp
|
| @@ -17,7 +17,7 @@ void GrDrawPathBatch::onDraw(GrBatchFlushState* state) {
|
| GrProgramDesc desc;
|
|
|
| SkAutoTUnref<GrPathProcessor> pathProc(GrPathProcessor::Create(this->color(),
|
| - this->opts(),
|
| + this->overrides(),
|
| this->viewMatrix()));
|
| state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline());
|
| GrPathRendering::DrawPathArgs args(pathProc, this->pipeline(),
|
| @@ -95,10 +95,10 @@ bool GrDrawPathRangeBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
|
| // combined. (Glyphs in the same font tend to wind the same direction so it works out OK.)
|
| if (!this->isWinding() ||
|
| this->stencilSettings() != that->stencilSettings() ||
|
| - this->opts().willColorBlendWithDst()) {
|
| + this->overrides().willColorBlendWithDst()) {
|
| return false;
|
| }
|
| - SkASSERT(!that->opts().willColorBlendWithDst());
|
| + SkASSERT(!that->overrides().willColorBlendWithDst());
|
| fTotalPathCount += that->fTotalPathCount;
|
| while (GrPathRangeDraw** head = that->fDraws.head()) {
|
| fDraws.addToTail(*head);
|
| @@ -111,7 +111,7 @@ bool GrDrawPathRangeBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
|
| void GrDrawPathRangeBatch::onDraw(GrBatchFlushState* state) {
|
| GrProgramDesc desc;
|
| SkAutoTUnref<GrPathProcessor> pathProc(GrPathProcessor::Create(this->color(),
|
| - this->opts(),
|
| + this->overrides(),
|
| this->viewMatrix(),
|
| fLocalMatrix));
|
| state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline());
|
|
|