Rename SkFontConfigParser_android SkFontMgr_android_parser.

src/ports/SkFontMgr_android_parser.h

 /*
  * Copyright 2011 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 SKFONTCONFIGPARSER_ANDROID_H_
-#define SKFONTCONFIGPARSER_ANDROID_H_
+#ifndef SkFontMgr_android_parser_DEFINED
+#define SkFontMgr_android_parser_DEFINED
 
-#include "SkFontMgr_android.h"
 #include "SkString.h"
 #include "SkTDArray.h"
 
 #include <climits>
 #include <limits>
 
 /** \class SkLanguage
 
     The SkLanguage class represents a human written language, and is used by
     text draw operations to determine which glyph to draw when drawing
@@ skipping 69 matching lines @@
         : fVariant(kDefault_FontVariant)
         , fOrder(-1)
         , fIsFallbackFont(isFallbackFont)
         , fBasePath(basePath)
     { }
 
     SkTArray<SkString, true> fNames;
     SkTArray<FontFileInfo, true> fFonts;
     SkLanguage fLanguage;
     FontVariant fVariant;
-    int fOrder; // internal to SkFontConfigParser
+    int fOrder; // internal to the parser, not useful to users.
     bool fIsFallbackFont;
     const SkString fBasePath;
 };
 
-namespace SkFontConfigParser {
+namespace SkFontMgr_Android_Parser {
 
 /** Parses system font configuration files and appends result to fontFamilies. */
 void GetSystemFontFamilies(SkTDArray<FontFamily*>& fontFamilies);
 
 /** Parses font configuration files and appends result to fontFamilies. */
 void GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
                            const SkString& basePath,
                            const char* fontsXml,
                            const char* fallbackFontsXml,
                            const char* langFallbackFontsDir = NULL);
 
-} // SkFontConfigParser namespace
+} // SkFontMgr_Android_Parser namespace
 
 
 /** Parses a null terminated string into an integer type, checking for overflow.
  *  http://www.w3.org/TR/html-markup/datatypes.html#common.data.integer.non-negative-def
  *
  *  If the string cannot be parsed into 'value', returns false and does not change 'value'.
  */
 template <typename T> static bool parse_non_negative_integer(const char* s, T* value) {
     SK_COMPILE_ASSERT(std::numeric_limits<T>::is_integer, T_must_be_integer);
 
@@ skipping 77 matching lines @@
         n = (n * 10) + d;
     }
     if (negate) {
         n = -n;
         frac = -frac;
     }
     *value = (n << N) + frac;
     return true;
 }
 
-#endif /* SKFONTCONFIGPARSER_ANDROID_H_ */
+#endif /* SkFontMgr_android_parser_DEFINED */