| Index: src/gpu/GrTessellatingPathRenderer.cpp
|
| diff --git a/src/gpu/GrTessellatingPathRenderer.cpp b/src/gpu/GrTessellatingPathRenderer.cpp
|
| index 28a43f16041069d6237afea103ab5f6871492e1d..4d23217d0375f596133766a09823665866d15f04 100644
|
| --- a/src/gpu/GrTessellatingPathRenderer.cpp
|
| +++ b/src/gpu/GrTessellatingPathRenderer.cpp
|
| @@ -1413,13 +1413,13 @@ public:
|
| out->setUnknownSingleComponent();
|
| }
|
|
|
| - void initBatchTracker(const GrPipelineInfo& init) override {
|
| + void initBatchTracker(const GrPipelineOptimizations& opt) override {
|
| // Handle any color overrides
|
| - if (!init.readsColor()) {
|
| + if (!opt.readsColor()) {
|
| fColor = GrColor_ILLEGAL;
|
| }
|
| - init.getOverrideColorIfSet(&fColor);
|
| - fPipelineInfo = init;
|
| + opt.getOverrideColorIfSet(&fColor);
|
| + fPipelineInfo = opt;
|
| }
|
|
|
| int tessellate(GrUniqueKey* key,
|
| @@ -1607,12 +1607,12 @@ private:
|
| viewMatrix.mapRect(&fBounds);
|
| }
|
|
|
| - GrColor fColor;
|
| - SkPath fPath;
|
| - GrStrokeInfo fStroke;
|
| - SkMatrix fViewMatrix;
|
| - SkRect fClipBounds; // in source space
|
| - GrPipelineInfo fPipelineInfo;
|
| + GrColor fColor;
|
| + SkPath fPath;
|
| + GrStrokeInfo fStroke;
|
| + SkMatrix fViewMatrix;
|
| + SkRect fClipBounds; // in source space
|
| + GrPipelineOptimizations fPipelineInfo;
|
| };
|
|
|
| bool GrTessellatingPathRenderer::onDrawPath(const DrawPathArgs& args) {
|
|
|