Revert of Replace GrStrokeInfo with GrStyle.

src/gpu/GrResourceProvider.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrResourceProvider.h"
 
 #include "GrBuffer.h"
@@ skipping 52 matching lines @@
 }
 
 const GrBuffer* GrResourceProvider::createQuadIndexBuffer() {
     static const int kMaxQuads = 1 << 12; // max possible: (1 << 14) - 1;
     GR_STATIC_ASSERT(4 * kMaxQuads <= 65535);
     static const uint16_t kPattern[] = { 0, 1, 2, 0, 2, 3 };
 
     return this->createInstancedIndexBuffer(kPattern, 6, kMaxQuads, 4, fQuadIndexBufferKey);
 }
 
-GrPath* GrResourceProvider::createPath(const SkPath& path, const GrStyle& style) {
+GrPath* GrResourceProvider::createPath(const SkPath& path, const GrStrokeInfo& stroke) {
     SkASSERT(this->gpu()->pathRendering());
-    return this->gpu()->pathRendering()->createPath(path, style);
+    return this->gpu()->pathRendering()->createPath(path, stroke);
 }
 
 GrPathRange* GrResourceProvider::createPathRange(GrPathRange::PathGenerator* gen,
-                                                 const GrStyle& style) {
+                                                 const GrStrokeInfo& stroke) {
     SkASSERT(this->gpu()->pathRendering());
-    return this->gpu()->pathRendering()->createPathRange(gen, style);
+    return this->gpu()->pathRendering()->createPathRange(gen, stroke);
 }
 
 GrPathRange* GrResourceProvider::createGlyphs(const SkTypeface* tf,
                                               const SkScalerContextEffects& effects,
                                               const SkDescriptor* desc,
-                                              const GrStyle& style) {
+                                              const GrStrokeInfo& stroke) {
 
     SkASSERT(this->gpu()->pathRendering());
-    return this->gpu()->pathRendering()->createGlyphs(tf, effects, desc, style);
+    return this->gpu()->pathRendering()->createGlyphs(tf, effects, desc, stroke);
 }
 
 GrBuffer* GrResourceProvider::createBuffer(size_t size, GrBufferType intendedType,
                                            GrAccessPattern accessPattern, uint32_t flags,
                                            const void* data) {
     if (this->isAbandoned()) {
         return nullptr;
     }
     if (kDynamic_GrAccessPattern != accessPattern) {
         return this->gpu()->createBuffer(size, intendedType, accessPattern, data);
@@ skipping 95 matching lines @@
     return rt->renderTargetPriv().getStencilAttachment();
 }
 
 GrRenderTarget* GrResourceProvider::wrapBackendTextureAsRenderTarget(
         const GrBackendTextureDesc& desc) {
     if (this->isAbandoned()) {
         return nullptr;
     }
     return this->gpu()->wrapBackendTextureAsRenderTarget(desc);
 }