| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2016 Google Inc. | 2  * Copyright 2016 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "GrMSAAPathRenderer.h" | 8 #include "GrMSAAPathRenderer.h" | 
| 9 | 9 | 
| 10 #include "GrAuditTrail.h" | 10 #include "GrAuditTrail.h" | 
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 651                 } | 651                 } | 
| 652             } else { | 652             } else { | 
| 653                 bounds = path.getBounds(); | 653                 bounds = path.getBounds(); | 
| 654             } | 654             } | 
| 655             const SkMatrix& viewM = (reverse && viewMatrix.hasPerspective()) ? S
     kMatrix::I() : | 655             const SkMatrix& viewM = (reverse && viewMatrix.hasPerspective()) ? S
     kMatrix::I() : | 
| 656                                                                                v
     iewMatrix; | 656                                                                                v
     iewMatrix; | 
| 657             SkAutoTUnref<GrDrawBatch> batch( | 657             SkAutoTUnref<GrDrawBatch> batch( | 
| 658                     GrRectBatchFactory::CreateNonAAFill(paint.getColor(), viewM,
      bounds, nullptr, | 658                     GrRectBatchFactory::CreateNonAAFill(paint.getColor(), viewM,
      bounds, nullptr, | 
| 659                                                         &localMatrix)); | 659                                                         &localMatrix)); | 
| 660 | 660 | 
|  | 661             SkASSERT(GrPipelineBuilder::kBoth_DrawFace == drawFace[p]); | 
| 661             GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(pa
     int)); | 662             GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(pa
     int)); | 
| 662             pipelineBuilder.setDrawFace(drawFace[p]); | 663             pipelineBuilder.setDrawFace(drawFace[p]); | 
| 663             if (passes[p]) { | 664             if (passes[p]) { | 
| 664                 pipelineBuilder.setUserStencil(passes[p]); | 665                 pipelineBuilder.setUserStencil(passes[p]); | 
| 665             } else { | 666             } else { | 
| 666                 pipelineBuilder.setUserStencil(userStencilSettings); | 667                 pipelineBuilder.setUserStencil(userStencilSettings); | 
| 667             } | 668             } | 
| 668 | 669 | 
| 669             drawContext->drawBatch(pipelineBuilder, clip, batch); | 670             drawContext->drawBatch(pipelineBuilder, clip, batch); | 
| 670         } else { | 671         } else { | 
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 725 | 726 | 
| 726     GrPaint paint; | 727     GrPaint paint; | 
| 727     paint.setXPFactory(GrDisableColorXPFactory::Make()); | 728     paint.setXPFactory(GrDisableColorXPFactory::Make()); | 
| 728     paint.setAntiAlias(args.fIsAA); | 729     paint.setAntiAlias(args.fIsAA); | 
| 729 | 730 | 
| 730     this->internalDrawPath(args.fDrawContext, paint, &GrUserStencilSettings::kUn
     used, *args.fClip, | 731     this->internalDrawPath(args.fDrawContext, paint, &GrUserStencilSettings::kUn
     used, *args.fClip, | 
| 731                            *args.fViewMatrix, *args.fShape, true); | 732                            *args.fViewMatrix, *args.fShape, true); | 
| 732 } | 733 } | 
| 733 | 734 | 
| 734 ////////////////////////////////////////////////////////////////////////////////
     /////////////////// | 735 ////////////////////////////////////////////////////////////////////////////////
     /////////////////// | 
| OLD | NEW | 
|---|