move most of SkFontHost to private (preceeding making it all private)

trunk/include/core/SkFontHost.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 SkFontHost_DEFINED
@@ skipping 31 matching lines @@
     2) Given the data for a font (either in a stream or a file name), return
         a typeface that allows access to that data.
     3) Each typeface instance carries a 32bit ID for its corresponding font.
         SkFontHost turns that ID into a stream to access the font's data.
     4) Given a font ID, return a subclass of SkScalerContext, which connects a
         font scaler (e.g. freetype or other) to the font's data.
     5) Utilites to manage the font cache (budgeting) and gamma correction
 */
 class SK_API SkFontHost {
 public:
+    /** LCDs either have their color elements arranged horizontally or
+     vertically. When rendering subpixel glyphs we need to know which way
+     round they are.
+     
+     Note, if you change this after startup, you'll need to flush the glyph
+     cache because it'll have the wrong type of masks cached.
+     
+     @deprecated use SkPixelGeometry instead.
+     */
+    enum LCDOrientation {
+        kHorizontal_LCDOrientation = 0,    //!< this is the default
+        kVertical_LCDOrientation   = 1
+    };
+    
+    /** @deprecated set on Device creation. */
+    static void SetSubpixelOrientation(LCDOrientation orientation);
+    /** @deprecated get from Device. */
+    static LCDOrientation GetSubpixelOrientation();
+    
+    /** LCD color elements can vary in order. For subpixel text we need to know
+     the order which the LCDs uses so that the color fringes are in the
+     correct place.
+     
+     Note, if you change this after startup, you'll need to flush the glyph
+     cache because it'll have the wrong type of masks cached.
+     
+     kNONE_LCDOrder means that the subpixel elements are not spatially
+     separated in any usable fashion.
+     
+     @deprecated use SkPixelGeometry instead.
+     */
+    enum LCDOrder {
+        kRGB_LCDOrder = 0,    //!< this is the default
+        kBGR_LCDOrder = 1,
+        kNONE_LCDOrder = 2
+    };
+    
+    /** @deprecated set on Device creation. */
+    static void SetSubpixelOrder(LCDOrder order);
+    /** @deprecated get from Device. */
+    static LCDOrder GetSubpixelOrder();
+    
+#ifdef SK_BUILD_FOR_ANDROID    
+    /**
+     * Return the number of font units per em.
+     *
+     * @param fontID the font to query.
+     * @return the number of font units per em or 0 on error.
+     */
+    static uint32_t GetUnitsPerEm(SkFontID fontID);
+#endif
+    
+    /** If Skia is running in a constrained environment and the typeface
+     implementation is handle based, the typeface data may become
+     unavailable asynchronously. If a font host or scaler context method is
+     unable to access font data, it may call this function as a request to
+     make the handle contained in the typeface useable.
+     */
+    static void EnsureTypefaceAccessible(const SkTypeface& typeface);
+    
+    /**
+     *  Return a subclass of SkScalarContext
+     *  DEPRECATED -- will be moved to SkTypeface
+     */
+    static SkScalerContext* CreateScalerContext(const SkDescriptor* desc);
+    
+    /**
+     *  DEPRECATED -- will be DESTROYED
+     *
+     *  Given a "current" fontID, return the next logical fontID to use
+     *  when searching fonts for a given unicode value. Typically the caller
+     *  will query a given font, and if a unicode value is not supported, they
+     *  will call this, and if 0 is not returned, will search that font, and so
+     *  on. This process must be finite, and when the fonthost sees a
+     *  font with no logical successor, it must return 0.
+     *
+     *  The original fontID is also provided. This is the initial font that was
+     *  stored in the typeface of the caller. It is provided as an aid to choose
+     *  the best next logical font. e.g. If the original font was bold or serif,
+     *  but the 2nd in the logical chain was plain, then a subsequent call to
+     *  get the 3rd can still inspect the original, and try to match its
+     *  stylistic attributes.
+     */
+    static SkFontID NextLogicalFont(SkFontID currFontID, SkFontID origFontID);
+
+private:
     /** Return a new, closest matching typeface given either an existing family
         (specified by a typeface in that family) or by a familyName and a
         requested style.
         1) If familyFace is null, use familyName.
         2) If familyName is null, use data (UTF-16 to cover).
         3) If all are null, return the default font that best matches style
      */
     static SkTypeface* CreateTypeface(const SkTypeface* familyFace,
                                       const char familyName[],
                                       SkTypeface::Style style);
@@ skipping 66 matching lines @@
 
     /** Given a stream created by Serialize(), return a new typeface (like
         CreateTypeface) which is either an exact match to the one serialized
         or the best available typeface based on the data in the deserialized
         SkFontDescriptor.
      */
     static SkTypeface* Deserialize(SkStream*);
 
     ///////////////////////////////////////////////////////////////////////////
 
-    /** Return a subclass of SkScalarContext
-    */
-    static SkScalerContext* CreateScalerContext(const SkDescriptor* desc);
-
-    /**
-     *  Given a "current" fontID, return the next logical fontID to use
-     *  when searching fonts for a given unicode value. Typically the caller
-     *  will query a given font, and if a unicode value is not supported, they
-     *  will call this, and if 0 is not returned, will search that font, and so
-     *  on. This process must be finite, and when the fonthost sees a
-     *  font with no logical successor, it must return 0.
-     *
-     *  The original fontID is also provided. This is the initial font that was
-     *  stored in the typeface of the caller. It is provided as an aid to choose
-     *  the best next logical font. e.g. If the original font was bold or serif,
-     *  but the 2nd in the logical chain was plain, then a subsequent call to
-     *  get the 3rd can still inspect the original, and try to match its
-     *  stylistic attributes.
-     */
-    static SkFontID NextLogicalFont(SkFontID currFontID, SkFontID origFontID);
-
-    ///////////////////////////////////////////////////////////////////////////
-
     /** Given a filled-out rec, the fonthost may decide to modify it to reflect
         what the host is actually capable of fulfilling. For example, if the
         rec is requesting a level of hinting that, for this host, maps some
         other level (e.g. kFull -> kNormal), it should update the rec to reflect
         what will actually be done. This is an optimization so that the font
         cache does not contain different recs (i.e. keys) that in reality map to
         the same output.
 
         A lazy (but valid) fonthost can do nothing in its FilterRec routine.
 
@@ skipping 52 matching lines @@
                 exceeds the table's size, then only the bytes up to the table's
                 size are actually copied, and this is the value returned. If
                 offset > the table's size, or tag is not a valid table,
                 then 0 is returned.
      */
     static size_t GetTableData(SkFontID fontID, SkFontTableTag tag,
                                size_t offset, size_t length, void* data);
 
     ///////////////////////////////////////////////////////////////////////////
 
-    /** LCDs either have their color elements arranged horizontally or
-        vertically. When rendering subpixel glyphs we need to know which way
-        round they are.
-
-        Note, if you change this after startup, you'll need to flush the glyph
-        cache because it'll have the wrong type of masks cached.
-
-        @deprecated use SkPixelGeometry instead.
-    */
-    enum LCDOrientation {
-        kHorizontal_LCDOrientation = 0,    //!< this is the default
-        kVertical_LCDOrientation   = 1
-    };
-
-    /** @deprecated set on Device creation. */
-    static void SetSubpixelOrientation(LCDOrientation orientation);
-    /** @deprecated get from Device. */
-    static LCDOrientation GetSubpixelOrientation();
-
-    /** LCD color elements can vary in order. For subpixel text we need to know
-        the order which the LCDs uses so that the color fringes are in the
-        correct place.
-
-        Note, if you change this after startup, you'll need to flush the glyph
-        cache because it'll have the wrong type of masks cached.
-
-        kNONE_LCDOrder means that the subpixel elements are not spatially
-        separated in any usable fashion.
-
-        @deprecated use SkPixelGeometry instead.
-     */
-    enum LCDOrder {
-        kRGB_LCDOrder = 0,    //!< this is the default
-        kBGR_LCDOrder = 1,
-        kNONE_LCDOrder = 2
-    };
-
-    /** @deprecated set on Device creation. */
-    static void SetSubpixelOrder(LCDOrder order);
-    /** @deprecated get from Device. */
-    static LCDOrder GetSubpixelOrder();
-
-#ifdef SK_BUILD_FOR_ANDROID
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Return the number of font units per em.
-     *
-     * @param fontID the font to query.
-     * @return the number of font units per em or 0 on error.
-     */
-    static uint32_t GetUnitsPerEm(SkFontID fontID);
-#endif
-
-    /** If Skia is running in a constrained environment and the typeface
-        implementation is handle based, the typeface data may become
-        unavailable asynchronously. If a font host or scaler context method is
-        unable to access font data, it may call this function as a request to
-        make the handle contained in the typeface useable.
-    */
-    static void EnsureTypefaceAccessible(const SkTypeface& typeface);
+    friend class SkTypeface;
 };
 
 #endif