Start on replacing path+style with shape in patherenderer

src/gpu/GrPathRendererChain.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrPathRendererChain.h"
 
@@ skipping 61 matching lines @@
     if (kStencilOnly_DrawType == drawType) {
         minStencilSupport = GrPathRenderer::kStencilOnly_StencilSupport;
     } else if (kStencilAndColor_DrawType == drawType ||
                kStencilAndColorAntiAlias_DrawType == drawType) {
         minStencilSupport = GrPathRenderer::kNoRestriction_StencilSupport;
     } else {
         minStencilSupport = GrPathRenderer::kNoSupport_StencilSupport;
     }
     if (minStencilSupport != GrPathRenderer::kNoSupport_StencilSupport) {
         // We don't support (and shouldn't need) stenciling of non-fill paths.
-        if (!args.fStyle->isSimpleFill()) {
+        if (!args.fShape->style().isSimpleFill()) {
             return nullptr;
         }
     }
 
     for (int i = 0; i < fChain.count(); ++i) {
         if (fChain[i]->canDrawPath(args)) {
             if (GrPathRenderer::kNoSupport_StencilSupport != minStencilSupport) {
-                GrPathRenderer::StencilSupport support =
-                                        fChain[i]->getStencilSupport(*args.fPath);
+                GrPathRenderer::StencilSupport support = fChain[i]->getStencilSupport(*args.fShape);
                 if (support < minStencilSupport) {
                     continue;
                 } else if (stencilSupport) {
                     *stencilSupport = support;
                 }
             }
             return fChain[i];
         }
     }
     return nullptr;
 }