Revert of Replace GrStrokeInfo with GrStyle.

src/gpu/text/GrStencilAndCoverTextContext.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrStencilAndCoverTextContext_DEFINED
 #define GrStencilAndCoverTextContext_DEFINED
 
 #include "GrDrawContext.h"
-#include "GrStyle.h"
+#include "GrStrokeInfo.h"
 #include "SkDrawFilter.h"
 #include "SkTextBlob.h"
 #include "SkTHash.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
 #include "batches/GrDrawPathBatch.h"
 
 class GrAtlasTextContext;
 class GrTextStrike;
 class GrPath;
@@ skipping 64 matching lines @@
 
         size_t computeSizeInCache() const;
 
     private:
         typedef GrDrawPathRangeBatch::InstanceData InstanceData;
 
         SkGlyphCache* getGlyphCache() const;
         GrPathRange* createGlyphs(GrContext*) const;
         void appendGlyph(const SkGlyph&, const SkPoint&, FallbackBlobBuilder*);
 
-        GrStyle                          fStyle;
+        GrStrokeInfo                     fStroke;
         SkPaint                          fFont;
         SkScalar                         fTextRatio;
         float                            fTextInverseRatio;
         bool                             fUsingRawGlyphPaths;
         GrUniqueKey                      fGlyphPathsKey;
         int                              fTotalGlyphCount;
         SkAutoTUnref<InstanceData>       fInstanceData;
         int                              fFallbackGlyphCount;
         SkAutoTUnref<const SkTextBlob>   fFallbackTextBlob;
         mutable SkGlyphCache*            fDetachedGlyphCache;
@@ skipping 40 matching lines @@
     void purgeToFit(const TextBlob&);
 
     GrAtlasTextContext*                                       fFallbackTextContext;
     SkTHashMap<uint32_t, TextBlob*>                           fBlobIdCache;
     SkTHashTable<TextBlob*, const TextBlob::Key&, TextBlob>   fBlobKeyCache;
     SkTInternalLList<TextBlob>                                fLRUList;
     size_t                                                    fCacheSize;
 };
 
 #endif