Merge fix for 522846 to m46

src/gpu/GrAtlasTextBlob.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAtlasTextBlob_DEFINED
 #define GrAtlasTextBlob_DEFINED
 
@@ skipping 117 matching lines @@
         SkRect fVertexBounds;
         SkSTArray<kMinSubRuns, SubRunInfo> fSubRunInfo;
         SkAutoDescriptor fDescriptor;
         SkAutoTDelete<SkAutoDescriptor> fOverrideDescriptor; // df properties
         GrColor fColor;
         bool fInitialized;
         bool fDrawAsPaths;
     };
 
     struct BigGlyph {
-        BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy)
+        BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool applyVM)
             : fPath(path)
             , fVx(vx)
-            , fVy(vy) {}
+            , fVy(vy)
+            , fScale(scale)
+            , fApplyVM(applyVM) {}
         SkPath fPath;
         SkScalar fVx;
         SkScalar fVy;
+        SkScalar fScale;
+        bool fApplyVM;
     };
 
     struct Key {
         Key() {
             sk_bzero(this, sizeof(Key));
         }
         uint32_t fUniqueID;
         // Color may affect the gamma of the mask we generate, but in a fairly limited way.
         // Each color is assigned to on of a fixed number of buckets based on its
         // luminance. For each luminance bucket there is a "canonical color" that
@@ skipping 79 matching lines @@
     void setHasDistanceField() { fTextType |= kHasDistanceField_TextType; }
     void setHasBitmap() { fTextType |= kHasBitmap_TextType; }
 
 #ifdef CACHE_SANITY_CHECK
     static void AssertEqual(const GrAtlasTextBlob&, const GrAtlasTextBlob&);
     size_t fSize;
 #endif
 };
 
 #endif