Revert of Pass effects directly to fontcache

src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlasTextBlob.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 147 matching lines @@
         // a run
         const SkDescriptor* newDesc = (run->fOverrideDescriptor && !info->drawAsDistanceFields()) ?
                                       run->fOverrideDescriptor->getDesc() :
                                       run->fDescriptor.getDesc();
         if (!*cache || !SkTypeface::Equal(*typeface, run->fTypeface) ||
             !((*desc)->equals(*newDesc))) {
             if (*cache) {
                 SkGlyphCache::AttachCache(*cache);
             }
             *desc = newDesc;
-            *cache = SkGlyphCache::DetachCache(run->fTypeface, run->fEffects, *desc);
+            *cache = SkGlyphCache::DetachCache(run->fTypeface, *desc);
             *scaler = GrTextUtils::GetGrFontScaler(*cache);
             *typeface = run->fTypeface;
         }
 
         if (regenGlyphs) {
             strike = fontCache->getStrike(*scaler);
         } else {
             strike = info->strike();
         }
     }
@@ skipping 133 matching lines @@
             // set use tokens for all of the glyphs in our subrun.  This is only valid if we
             // have a valid atlas generation
             fontCache->setUseTokenBulk(*info.bulkUseToken(), target->nextDrawToken(),
                                         info.maskFormat());
             break;
     }
 
     *byteCount = info.byteCount();
     *vertices = fVertices + info.vertexStartIndex();
 }