Fix for 510931, merge to m44

src/core/SkScalerContext.h

Index: src/core/SkScalerContext.h
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index 02b3a768258ceb6caa741bd5195315d9aaadee0c..fe5235a055f395a52f6a6f16cd39d39856937a16 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -299,6 +299,8 @@ protected:
 
     void forceGenerateImageFromPath() { fGenerateImageFromPath = true; }
 
+    void forceOffGenerateImageFromPath() { fGenerateImageFromPath = false; }
+
 private:
     // never null
     SkAutoTUnref<SkTypeface> fTypeface;
@@ -328,6 +330,8 @@ private:
     // When there is a filter, previous steps must create a linear mask
     // and the pre-blend applied as a final step.
     const SkMaskGamma::PreBlend fPreBlendForFilter;
+
+    friend class SkRandomScalerContext; // For debugging
 };
 
 #define kRec_SkDescriptorTag            SkSetFourByteTag('s', 'r', 'e', 'c')