| Index: src/gpu/GrAALinearizingConvexPathRenderer.cpp
 | 
| diff --git a/src/gpu/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
 | 
| index b4abc0143cadd3df2248f54244c74fa66b9b77e0..d1c6355daf2fba083366246af7a009a6e6f66db6 100644
 | 
| --- a/src/gpu/GrAALinearizingConvexPathRenderer.cpp
 | 
| +++ b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
 | 
| @@ -264,8 +264,9 @@ private:
 | 
|          geometry.fViewMatrix.mapRect(&fBounds);
 | 
|      }
 | 
|  
 | 
| -    bool onCombineIfPossible(GrBatch* t) override {
 | 
| -        if (!this->pipeline()->isEqual(*t->pipeline())) {
 | 
| +    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
 | 
| +        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(),
 | 
| +                                    caps)) {
 | 
|              return false;
 | 
|          }
 | 
|  
 | 
| 
 |