Revert "Revert of Pass effects directly to fontcache (patchset #8 id:140001 of https://codereview.c…

src/fonts/SkGScalerContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "SkDescriptor.h"
 #include "SkGScalerContext.h"
 #include "SkGlyph.h"
 #include "SkPath.h"
 #include "SkCanvas.h"
 
+#define STD_SIZE    1
+
 class SkGScalerContext : public SkScalerContext {
 public:
-    SkGScalerContext(SkGTypeface*, const SkDescriptor*);
-    virtual ~SkGScalerContext();
+    SkGScalerContext(SkGTypeface* face, const SkScalerContextEffects& effects,
+                     const SkDescriptor* desc)
+        : SkScalerContext(face, effects, desc)
+        , fFace(face)
+    {
+        
+        size_t  descSize = SkDescriptor::ComputeOverhead(1) + sizeof(SkScalerContext::Rec);
+        SkAutoDescriptor ad(descSize);
+        SkDescriptor*    newDesc = ad.getDesc();
+        
+        newDesc->init();
+        void* entry = newDesc->addEntry(kRec_SkDescriptorTag,
+                                        sizeof(SkScalerContext::Rec), &fRec);
+        {
+            SkScalerContext::Rec* rec = (SkScalerContext::Rec*)entry;
+            rec->fTextSize = STD_SIZE;
+            rec->fPreScaleX = SK_Scalar1;
+            rec->fPreSkewX = 0;
+            rec->fPost2x2[0][0] = rec->fPost2x2[1][1] = SK_Scalar1;
+            rec->fPost2x2[1][0] = rec->fPost2x2[0][1] = 0;
+        }
+        SkASSERT(descSize == newDesc->getLength());
+        newDesc->computeChecksum();
+        
+        fProxy = face->proxy()->createScalerContext(effects, newDesc);
+        
+        fRec.getSingleMatrix(&fMatrix);
+        fMatrix.preScale(SK_Scalar1 / STD_SIZE, SK_Scalar1 / STD_SIZE);
+    }
+    virtual ~SkGScalerContext() { delete fProxy; }
 
 protected:
     unsigned generateGlyphCount() override;
     uint16_t generateCharToGlyph(SkUnichar) override;
     void generateAdvance(SkGlyph*) override;
     void generateMetrics(SkGlyph*) override;
     void generateImage(const SkGlyph&) override;
     void generatePath(const SkGlyph&, SkPath*) override;
     void generateFontMetrics(SkPaint::FontMetrics*) override;
 
 private:
     SkGTypeface*     fFace;
     SkScalerContext* fProxy;
     SkMatrix         fMatrix;
 };
 
-#define STD_SIZE    1
-
-#include "SkDescriptor.h"
-
-SkGScalerContext::SkGScalerContext(SkGTypeface* face, const SkDescriptor* desc)
-        : SkScalerContext(face, desc)
-        , fFace(face)
-{
-
-    size_t  descSize = SkDescriptor::ComputeOverhead(1) + sizeof(SkScalerContext::Rec);
-    SkAutoDescriptor ad(descSize);
-    SkDescriptor*    newDesc = ad.getDesc();
-
-    newDesc->init();
-    void* entry = newDesc->addEntry(kRec_SkDescriptorTag,
-                                    sizeof(SkScalerContext::Rec), &fRec);
-    {
-        SkScalerContext::Rec* rec = (SkScalerContext::Rec*)entry;
-        rec->fTextSize = STD_SIZE;
-        rec->fPreScaleX = SK_Scalar1;
-        rec->fPreSkewX = 0;
-        rec->fPost2x2[0][0] = rec->fPost2x2[1][1] = SK_Scalar1;
-        rec->fPost2x2[1][0] = rec->fPost2x2[0][1] = 0;
-    }
-    SkASSERT(descSize == newDesc->getLength());
-    newDesc->computeChecksum();
-
-    fProxy = face->proxy()->createScalerContext(newDesc);
-
-    fRec.getSingleMatrix(&fMatrix);
-    fMatrix.preScale(SK_Scalar1 / STD_SIZE, SK_Scalar1 / STD_SIZE);
-}
-
-SkGScalerContext::~SkGScalerContext() { delete fProxy; }
-
 unsigned SkGScalerContext::generateGlyphCount() {
     return fProxy->getGlyphCount();
 }
 
 uint16_t SkGScalerContext::generateCharToGlyph(SkUnichar uni) {
     return fProxy->charToGlyphID(uni);
 }
 
 void SkGScalerContext::generateAdvance(SkGlyph* glyph) {
     fProxy->getAdvance(glyph);
@@ skipping 79 matching lines @@
 
 SkGTypeface::SkGTypeface(SkTypeface* proxy, const SkPaint& paint)
     : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false)
     , fProxy(SkRef(proxy))
     , fPaint(paint) {}
 
 SkGTypeface::~SkGTypeface() {
     fProxy->unref();
 }
 
-SkScalerContext* SkGTypeface::onCreateScalerContext(
-                                            const SkDescriptor* desc) const {
-    return new SkGScalerContext(const_cast<SkGTypeface*>(this), desc);
+SkScalerContext* SkGTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
+                                                    const SkDescriptor* desc) const {
+    return new SkGScalerContext(const_cast<SkGTypeface*>(this), effects, desc);
 }
 
 void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const {
     fProxy->filterRec(rec);
     rec->setHinting(SkPaint::kNo_Hinting);
     rec->fMaskFormat = SkMask::kARGB32_Format;
 }
 
 SkAdvancedTypefaceMetrics* SkGTypeface::onGetAdvancedTypefaceMetrics(
                                 PerGlyphInfo info,
@@ skipping 75 matching lines @@
 
     friend class SkGFontBuilder;
     SkGFont(int count, Glyph* array);
 };
 
 class SkGFontBuilder {
 public:
 
 };
 #endif