| Index: src/gpu/GrPipelineBuilder.cpp
|
| diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
|
| index faa20b1066177a6417dfc02887953745047aeb09..89bf15fe849dc5425b798e6a3ccd184692008639 100644
|
| --- a/src/gpu/GrPipelineBuilder.cpp
|
| +++ b/src/gpu/GrPipelineBuilder.cpp
|
| @@ -47,7 +47,7 @@ GrPipelineBuilder& GrPipelineBuilder::operator=(const GrPipelineBuilder& that) {
|
| return *this;
|
| }
|
|
|
| -void GrPipelineBuilder::setFromPaint(const GrPaint& paint, GrRenderTarget* rt, const GrClip* clip) {
|
| +void GrPipelineBuilder::setFromPaint(const GrPaint& paint, GrRenderTarget* rt, const GrClip& clip) {
|
| SkASSERT(0 == fBlockEffectRemovalCnt || 0 == this->numFragmentStages());
|
|
|
| fColorStages.reset();
|
| @@ -70,9 +70,7 @@ void GrPipelineBuilder::setFromPaint(const GrPaint& paint, GrRenderTarget* rt, c
|
| fStencilSettings.setDisabled();
|
| fFlagBits = 0;
|
|
|
| - if (clip) {
|
| - fClip = *clip;
|
| - }
|
| + fClip = clip;
|
|
|
| this->setState(GrPipelineBuilder::kDither_StateBit, paint.isDither());
|
| this->setState(GrPipelineBuilder::kHWAntialias_StateBit, paint.isAntiAlias());
|
|
|