Fix for 510931, merge to m44

include/core/SkTypeface.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTypeface_DEFINED
@@ skipping 349 matching lines @@
                                   size_t length, void* data) const = 0;
 
     virtual bool onComputeBounds(SkRect*) const;
 
 private:
     friend class SkGTypeface;
     friend class SkPDFFont;
     friend class SkPDFCIDFont;
     friend class GrPathRendering;
     friend class GrGLPathRendering;
+    friend class SkRandomTypeface; // For debugging
 
     /** Retrieve detailed typeface metrics.  Used by the PDF backend.
      @param perGlyphInfo Indicate what glyph specific information (advances,
      names, etc.) should be populated.
      @param glyphIDs  For per-glyph info, specify subset of the font by
      giving glyph ids.  Each integer represents a glyph
      id.  Passing NULL means all glyphs in the font.
      @param glyphIDsCount Number of elements in subsetGlyphIds. Ignored if
      glyphIDs is NULL.
      @return The returned object has already been referenced.
@@ skipping 15 matching lines @@
     SkFontStyle         fStyle;
     bool                fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif