Convert FamilyData to Skia style field names.

src/ports/SkFontConfigParser_android.cpp

 /*
  * 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.
  */
 
 #include "SkFontConfigParser_android.h"
 #include "SkTDArray.h"
 #include "SkTSearch.h"
@@ skipping 33 matching lines @@
 // for now.
 #define NO_TAG 0
 #define NAMESET_TAG 1
 #define FILESET_TAG 2
 
 /**
  * The FamilyData structure is passed around by the parser so that each handler
  * can read these variables that are relevant to the current parsing.
  */
 struct FamilyData {
-    FamilyData(XML_Parser parserRef, SkTDArray<FontFamily*> &familiesRef) :
-        parser(parserRef),
-        families(familiesRef),
-        currentFamily(NULL),
-        currentFontInfo(NULL),
-        currentTag(NO_TAG) {};
+    FamilyData(XML_Parser parser, SkTDArray<FontFamily*> &families)

[mtklein, 2015/01/30 23:32:09]

Can it move &s and *s to the type too? 

+        : fParser(parser)
+        , fFamilies(families)
+        , fCurrentFamily(NULL)
+        , fCurrentFontInfo(NULL)
+        , fCurrentTag(NO_TAG)
+    { };
 
-    XML_Parser parser;                       // The expat parser doing the work, owned by caller
-    SkTDArray<FontFamily*>& families;        // The array to append families, owned by caller
-    SkAutoTDelete<FontFamily> currentFamily; // The family being created, owned by this
-    FontFileInfo* currentFontInfo;           // The fontInfo being created, owned by currentFamily
-    int currentTag;                          // Flag to indicate when we're in nameset/fileset tags
+    XML_Parser fParser;                       // The expat parser doing the work, owned by caller
+    SkTDArray<FontFamily*>& fFamilies;        // The array to append families, owned by caller
+    SkAutoTDelete<FontFamily> fCurrentFamily; // The family being created, owned by this
+    FontFileInfo* fCurrentFontInfo;           // The fontInfo being created, owned by currentFamily
+    int fCurrentTag;                          // Flag to indicate when we're in nameset/fileset tags
 };
 
 /** http://www.w3.org/TR/html-markup/datatypes.html#common.data.integer.non-negative-def */
 template <typename T> static bool parseNonNegativeInteger(const char* s, T* value) {
     SK_COMPILE_ASSERT(std::numeric_limits<T>::is_integer, T_must_be_integer);
     const T nMax = std::numeric_limits<T>::max() / 10;
     const T dMax = std::numeric_limits<T>::max() - (nMax * 10);
     T n = 0;
     for (; *s; ++s) {
         // Check if digit
@@ skipping 36 matching lines @@
                 family->fVariant = kElegant_FontVariant;
             } else if (valueLen == 7 && !strncmp("compact", value, valueLen)) {
                 family->fVariant = kCompact_FontVariant;
             }
         }
     }
 }
 
 void fontFileNameHandler(void* data, const char* s, int len) {
     FamilyData* familyData = (FamilyData*) data;
-    familyData->currentFontInfo->fFileName.set(s, len);
+    familyData->fCurrentFontInfo->fFileName.set(s, len);
 }
 
 void fontElementHandler(XML_Parser parser, FontFileInfo* file, const char** attributes) {
     // A <font> should have weight (integer) and style (normal, italic) attributes.
     // NOTE: we ignore the style.
     // The element should contain a filename.
     for (size_t i = 0; attributes[i] != NULL &&
                        attributes[i+1] != NULL; i += 2) {
         const char* name = attributes[i];
         const char* value = attributes[i+1];
         size_t nameLen = strlen(name);
         if (nameLen == 6 && !strncmp("weight", name, nameLen)) {
             if (!parseNonNegativeInteger(value, &file->fWeight)) {
                 SkDebugf("---- Font weight %s (INVALID)", value);
                 file->fWeight = 0;
             }
         }
     }
     XML_SetCharacterDataHandler(parser, fontFileNameHandler);
 }
 
 FontFamily* findFamily(FamilyData* familyData, const char* familyName) {
     size_t nameLen = strlen(familyName);
-    for (int i = 0; i < familyData->families.count(); i++) {
-        FontFamily* candidate = familyData->families[i];
+    for (int i = 0; i < familyData->fFamilies.count(); i++) {
+        FontFamily* candidate = familyData->fFamilies[i];
         for (int j = 0; j < candidate->fNames.count(); j++) {
             if (!strncmp(candidate->fNames[j].c_str(), familyName, nameLen) &&
                 nameLen == strlen(candidate->fNames[j].c_str())) {
                 return candidate;
             }
         }
     }
 
     return NULL;
 }
@@ skipping 32 matching lines @@
 
     if (weight) {
         FontFamily* family = new FontFamily();
         family->fNames.push_back().set(aliasName);
 
         for (int i = 0; i < targetFamily->fFonts.count(); i++) {
             if (targetFamily->fFonts[i].fWeight == weight) {
                 family->fFonts.push_back(targetFamily->fFonts[i]);
             }
         }
-        *familyData->families.append() = family;
+        *familyData->fFamilies.append() = family;
     } else {
         targetFamily->fNames.push_back().set(aliasName);
     }
 }
 
 void startElementHandler(void* data, const char* tag, const char** attributes) {
     FamilyData* familyData = (FamilyData*) data;
     size_t len = strlen(tag);
     if (len == 6 && !strncmp(tag, "family", len)) {
-        familyData->currentFamily.reset(new FontFamily());
-        familyElementHandler(familyData->currentFamily, attributes);
+        familyData->fCurrentFamily.reset(new FontFamily());
+        familyElementHandler(familyData->fCurrentFamily, attributes);
     } else if (len == 4 && !strncmp(tag, "font", len)) {
-        FontFileInfo* file = &familyData->currentFamily->fFonts.push_back();
-        familyData->currentFontInfo = file;
-        fontElementHandler(familyData->parser, file, attributes);
+        FontFileInfo* file = &familyData->fCurrentFamily->fFonts.push_back();
+        familyData->fCurrentFontInfo = file;
+        fontElementHandler(familyData->fParser, file, attributes);
     } else if (len == 5 && !strncmp(tag, "alias", len)) {
         aliasElementHandler(familyData, attributes);
     }
 }
 
 void endElementHandler(void* data, const char* tag) {
     FamilyData* familyData = (FamilyData*) data;
     size_t len = strlen(tag);
     if (len == 6 && strncmp(tag, "family", len) == 0) {
-        *familyData->families.append() = familyData->currentFamily.detach();
+        *familyData->fFamilies.append() = familyData->fCurrentFamily.detach();
     } else if (len == 4 && !strncmp(tag, "font", len)) {
-        XML_SetCharacterDataHandler(familyData->parser, NULL);
+        XML_SetCharacterDataHandler(familyData->fParser, NULL);
     }
 }
 
 } // lmpParser
 
 namespace jbParser {
 
 /**
  * Handler for arbitrary text. This is used to parse the text inside each name
  * or file tag. The resulting strings are put into the fNames or FontFileInfo arrays.
  */
 static void textHandler(void* data, const char* s, int len) {
     FamilyData* familyData = (FamilyData*) data;
     // Make sure we're in the right state to store this name information
-    if (familyData->currentFamily.get() &&
-            (familyData->currentTag == NAMESET_TAG || familyData->currentTag == FILESET_TAG)) {
-        switch (familyData->currentTag) {
+    if (familyData->fCurrentFamily.get() &&
+            (familyData->fCurrentTag == NAMESET_TAG || familyData->fCurrentTag == FILESET_TAG)) {
+        switch (familyData->fCurrentTag) {
         case NAMESET_TAG: {
             SkAutoAsciiToLC tolc(s, len);
-            familyData->currentFamily->fNames.push_back().set(tolc.lc(), len);
+            familyData->fCurrentFamily->fNames.push_back().set(tolc.lc(), len);
             break;
         }
         case FILESET_TAG:
-            if (familyData->currentFontInfo) {
-                familyData->currentFontInfo->fFileName.set(s, len);
+            if (familyData->fCurrentFontInfo) {
+                familyData->fCurrentFontInfo->fFileName.set(s, len);
             }
             break;
         default:
             // Noop - don't care about any text that's not in the Fonts or Names list
             break;
         }
     }
 }
 
 /**
  * Handler for font files. This processes the attributes for language and
  * variants then lets textHandler handle the actual file name
  */
 static void fontFileElementHandler(FamilyData* familyData, const char** attributes) {
-    FontFileInfo& newFileInfo = familyData->currentFamily->fFonts.push_back();
+    FontFileInfo& newFileInfo = familyData->fCurrentFamily->fFonts.push_back();
     if (attributes) {
         size_t currentAttributeIndex = 0;
         while (attributes[currentAttributeIndex] &&
                attributes[currentAttributeIndex + 1]) {
             const char* attributeName = attributes[currentAttributeIndex];
             const char* attributeValue = attributes[currentAttributeIndex+1];
             size_t nameLength = strlen(attributeName);
             size_t valueLength = strlen(attributeValue);
             if (nameLength == 7 && strncmp(attributeName, "variant", nameLength) == 0) {
-                const FontVariant prevVariant = familyData->currentFamily->fVariant;
+                const FontVariant prevVariant = familyData->fCurrentFamily->fVariant;
                 if (valueLength == 7 && strncmp(attributeValue, "elegant", valueLength) == 0) {
-                    familyData->currentFamily->fVariant = kElegant_FontVariant;
+                    familyData->fCurrentFamily->fVariant = kElegant_FontVariant;
                 } else if (valueLength == 7 &&
                            strncmp(attributeValue, "compact", valueLength) == 0) {
-                    familyData->currentFamily->fVariant = kCompact_FontVariant;
+                    familyData->fCurrentFamily->fVariant = kCompact_FontVariant;
                 }
-                if (familyData->currentFamily->fFonts.count() > 1 &&
-                        familyData->currentFamily->fVariant != prevVariant) {
+                if (familyData->fCurrentFamily->fFonts.count() > 1 &&
+                        familyData->fCurrentFamily->fVariant != prevVariant) {
                     SkDebugf("Every font file within a family must have identical variants");
                     sk_throw();
                 }
 
             } else if (nameLength == 4 && strncmp(attributeName, "lang", nameLength) == 0) {
-                SkLanguage prevLang = familyData->currentFamily->fLanguage;
-                familyData->currentFamily->fLanguage = SkLanguage(attributeValue);
-                if (familyData->currentFamily->fFonts.count() > 1 &&
-                        familyData->currentFamily->fLanguage != prevLang) {
+                SkLanguage prevLang = familyData->fCurrentFamily->fLanguage;
+                familyData->fCurrentFamily->fLanguage = SkLanguage(attributeValue);
+                if (familyData->fCurrentFamily->fFonts.count() > 1 &&
+                        familyData->fCurrentFamily->fLanguage != prevLang) {
                     SkDebugf("Every font file within a family must have identical languages");
                     sk_throw();
                 }
             } else if (nameLength == 5 && strncmp(attributeName, "index", nameLength) == 0) {
                 int value;
                 if (parseNonNegativeInteger(attributeValue, &value)) {
                     newFileInfo.fIndex = value;
                 } else {
                     SkDebugf("---- SystemFonts index=%s (INVALID)", attributeValue);
                 }
             }
             //each element is a pair of attributeName/attributeValue string pairs
             currentAttributeIndex += 2;
         }
     }
-    familyData->currentFontInfo = &newFileInfo;
-    XML_SetCharacterDataHandler(familyData->parser, textHandler);
+    familyData->fCurrentFontInfo = &newFileInfo;
+    XML_SetCharacterDataHandler(familyData->fParser, textHandler);
 }
 
 /**
  * Handler for the start of a tag. The only tags we expect are familyset, family,
  * nameset, fileset, name, and file.
  */
 static void startElementHandler(void* data, const char* tag, const char** atts) {
     FamilyData* familyData = (FamilyData*) data;
     size_t len = strlen(tag);
     if (len == 9 && strncmp(tag, "familyset", len) == 0) {
         // The familyset tag has an optional "version" attribute with an integer value >= 0
         for (size_t i = 0; atts[i] != NULL &&
                            atts[i+1] != NULL; i += 2) {
             size_t nameLen = strlen(atts[i]);
             if (nameLen == 7 && strncmp(atts[i], "version", nameLen)) continue;
             const char* valueString = atts[i+1];
             int version;
             if (parseNonNegativeInteger(valueString, &version) && (version >= 21)) {
-                XML_SetElementHandler(familyData->parser,
+                XML_SetElementHandler(familyData->fParser,
                                       lmpParser::startElementHandler,
                                       lmpParser::endElementHandler);
             }
         }
     } else if (len == 6 && strncmp(tag, "family", len) == 0) {
-        familyData->currentFamily.reset(new FontFamily());
+        familyData->fCurrentFamily.reset(new FontFamily());
         // The Family tag has an optional "order" attribute with an integer value >= 0
         // If this attribute does not exist, the default value is -1
         for (size_t i = 0; atts[i] != NULL &&
                            atts[i+1] != NULL; i += 2) {
             const char* valueString = atts[i+1];
             int value;
             if (parseNonNegativeInteger(valueString, &value)) {
-                familyData->currentFamily->fOrder = value;
+                familyData->fCurrentFamily->fOrder = value;
             }
         }
     } else if (len == 7 && strncmp(tag, "nameset", len) == 0) {
-        familyData->currentTag = NAMESET_TAG;
+        familyData->fCurrentTag = NAMESET_TAG;
     } else if (len == 7 && strncmp(tag, "fileset", len) == 0) {
-        familyData->currentTag = FILESET_TAG;
-    } else if (len == 4 && strncmp(tag, "name", len) == 0 && familyData->currentTag == NAMESET_TAG) {
+        familyData->fCurrentTag = FILESET_TAG;
+    } else if (len == 4 && strncmp(tag, "name", len) == 0 && familyData->fCurrentTag == NAMESET_TAG) {
         // If it's a Name, parse the text inside
-        XML_SetCharacterDataHandler(familyData->parser, textHandler);
-    } else if (len == 4 && strncmp(tag, "file", len) == 0 && familyData->currentTag == FILESET_TAG) {
+        XML_SetCharacterDataHandler(familyData->fParser, textHandler);
+    } else if (len == 4 && strncmp(tag, "file", len) == 0 && familyData->fCurrentTag == FILESET_TAG) {
         // If it's a file, parse the attributes, then parse the text inside
         fontFileElementHandler(familyData, atts);
     }
 }
 
 /**
  * Handler for the end of tags. We only care about family, nameset, fileset,
  * name, and file.
  */
 static void endElementHandler(void* data, const char* tag) {
     FamilyData* familyData = (FamilyData*) data;
     size_t len = strlen(tag);
     if (len == 6 && strncmp(tag, "family", len)== 0) {
         // Done parsing a Family - store the created currentFamily in the families array
-        *familyData->families.append() = familyData->currentFamily.detach();
+        *familyData->fFamilies.append() = familyData->fCurrentFamily.detach();
     } else if (len == 7 && strncmp(tag, "nameset", len) == 0) {
-        familyData->currentTag = NO_TAG;
+        familyData->fCurrentTag = NO_TAG;
     } else if (len == 7 && strncmp(tag, "fileset", len) == 0) {
-        familyData->currentTag = NO_TAG;
+        familyData->fCurrentTag = NO_TAG;
     } else if ((len == 4 &&
                 strncmp(tag, "name", len) == 0 &&
-                familyData->currentTag == NAMESET_TAG) ||
+                familyData->fCurrentTag == NAMESET_TAG) ||
                (len == 4 &&
                 strncmp(tag, "file", len) == 0 &&
-                familyData->currentTag == FILESET_TAG)) {
+                familyData->fCurrentTag == FILESET_TAG)) {
         // Disable the arbitrary text handler installed to load Name data
-        XML_SetCharacterDataHandler(familyData->parser, NULL);
+        XML_SetCharacterDataHandler(familyData->fParser, NULL);
     }
 }
 
 } // namespace jbParser
 
 /**
  * This function parses the given filename and stores the results in the given
  * families array.
  */
 static void parseConfigFile(const char* filename, SkTDArray<FontFamily*> &families) {
@@ skipping 160 matching lines @@
     const char* tag = fTag.c_str();
 
     // strip off the rightmost "-.*"
     const char* parentTagEnd = strrchr(tag, '-');
     if (parentTagEnd == NULL) {
         return SkLanguage();
     }
     size_t parentTagLen = parentTagEnd - tag;
     return SkLanguage(tag, parentTagLen);
 }