Remove references to __system_property_get from Skia

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"
 #include "SkTypeface.h"
 
 #include <expat.h>
+#include <dirent.h>
 #include <stdio.h>
-#include <sys/system_properties.h>
 
 #include <limits>
 
 #define SYSTEM_FONTS_FILE "/system/etc/system_fonts.xml"
 #define FALLBACK_FONTS_FILE "/system/etc/fallback_fonts.xml"
 #define VENDOR_FONTS_FILE "/vendor/etc/fallback_fonts.xml"
 
+#define LOCALE_FALLBACK_FONTS_DIR "/system/etc"
+#define LOCALE_FALLBACK_FONTS_PREFIX "fallback_fonts-"
+#define LOCALE_FALLBACK_FONTS_SUFFIX ".xml"
+
 // These defines are used to determine the kind of tag that we're currently
 // populating with data. We only care about the sibling tags nameset and fileset
 // 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.
@@ skipping 154 matching lines @@
         XML_SetCharacterDataHandler(*familyData->parser, NULL);
     }
 }
 
 /**
  * This function parses the given filename and stores the results in the given
  * families array.
  */
 static void parseConfigFile(const char *filename, SkTDArray<FontFamily*> &families) {
 
-    FILE* file = NULL;
-
-#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
-    // if we are using a version of Android prior to Android 4.2 (JellyBean MR1
-    // at API Level 17) then we need to look for files with a different suffix.
-    char sdkVersion[PROP_VALUE_MAX];
-    __system_property_get("ro.build.version.sdk", sdkVersion);
-    const int sdkVersionInt = atoi(sdkVersion);
-
-    if (0 != *sdkVersion && sdkVersionInt < 17) {
-        SkString basename;
-        SkString updatedFilename;
-        SkString locale = SkFontConfigParser::GetLocale();
-
-        basename.set(filename);
-        // Remove the .xml suffix. We'll add it back in a moment.
-        if (basename.endsWith(".xml")) {
-            basename.resize(basename.size()-4);
-        }
-        // Try first with language and region
-        updatedFilename.printf("%s-%s.xml", basename.c_str(), locale.c_str());
-        file = fopen(updatedFilename.c_str(), "r");
-        if (!file) {
-            // If not found, try next with just language
-            updatedFilename.printf("%s-%.2s.xml", basename.c_str(), locale.c_str());
-            file = fopen(updatedFilename.c_str(), "r");
-        }
-    }
-#endif
-
-    if (NULL == file) {
-        file = fopen(filename, "r");
-    }
+    FILE* file = fopen(filename, "r");
 
     // Some of the files we attempt to parse (in particular, /vendor/etc/fallback_fonts.xml)
     // are optional - failure here is okay because one of these optional files may not exist.
     if (NULL == file) {
         return;
     }
 
     XML_Parser parser = XML_ParserCreate(NULL);
     FamilyData *familyData = new FamilyData(&parser, families);
     XML_SetUserData(parser, familyData);
@@ skipping 15 matching lines @@
 
 static void getSystemFontFamilies(SkTDArray<FontFamily*> &fontFamilies) {
     parseConfigFile(SYSTEM_FONTS_FILE, fontFamilies);
 }
 
 static void getFallbackFontFamilies(SkTDArray<FontFamily*> &fallbackFonts) {
     SkTDArray<FontFamily*> vendorFonts;
     parseConfigFile(FALLBACK_FONTS_FILE, fallbackFonts);
     parseConfigFile(VENDOR_FONTS_FILE, vendorFonts);
 
+#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+    // In some versions of Android prior to Android 4.2 (JellyBean MR1 at API
+    // Level 17) the fallback fonts for certain locales were encoded in their
+    // own XML files with a suffix that identified the locale.  We search the
+    // system for those files and add all of their entries to the fallback chain
+    // including the locale in the entry.
+
+    DIR* fontDirectory = opendir(LOCALE_FALLBACK_FONTS_DIR);
+    if (fontDirectory != NULL){
+        struct dirent* dirEntry = readdir(fontDirectory);
+        while (dirEntry){

[bungeman-skia, 2014/08/01 20:41:25]

nit: space after ')'

[djsollen, 2014/08/04 14:18:26]

Done.

+
+            // The size of both the prefix, suffix, and a minimum valid language code
+            const int minSize = strlen(LOCALE_FALLBACK_FONTS_PREFIX) +

[djsollen, 2014/08/01 20:13:41]

it appears that both fallback_fonts-**.xml and vendor_fonts-**.xml were
acceptable variations so we'll need to account for vendor_fonts as well.

+                                strlen(LOCALE_FALLBACK_FONTS_SUFFIX) + 2;
+
+            SkString fileName(dirEntry->d_name);
+            if (fileName.startsWith(LOCALE_FALLBACK_FONTS_PREFIX) && fileName.size() >= minSize) {

[bungeman-skia, 2014/08/01 20:41:25]

Do we care to check here if is does end with the SUFFIX?

Should we check that dirEntry is a file (not a directory)?

[djsollen, 2014/08/04 14:18:26]

Added suffix checks

+
+                SkString locale(fileName);

[bungeman-skia, 2014/08/01 20:41:24]

Can this be something like

int localeLen = strlen(LOCALE_FALLBACK_FONTS_PREFIX) -
strlen(LOCALE_FALLBACK_FONTS_SUFFIX);
SkString locale(fileName.c_str() + strlen(LOCALE_FALLBACK_FONTS_PREFIX),
                fileName.size() - localeLen);

It seems a bit clearer and less work than trimming the end and then trimming the
front.

[djsollen, 2014/08/04 14:18:26]

Done.

+                locale.resize(fileName.size() - strlen(LOCALE_FALLBACK_FONTS_SUFFIX));

[bungeman-skia, 2014/08/01 20:41:25]

Well, I was going to say replace "strlen(CONST_STRING)" with
"SK_ARRAY_COUNT(CONST_STRING) - 1" or something, since it seems odd to be
calling a function like this to create a constant. Apparently all modern
compilers detect this and optimize it away, depending on optimization settings
(gcc starting in 4.2).

+                locale.remove(0, strlen(LOCALE_FALLBACK_FONTS_PREFIX));
+
+                SkString absoluteFilename;
+                absoluteFilename.printf("%s/%s", LOCALE_FALLBACK_FONTS_DIR, fileName.c_str());
+
+                SkTDArray<FontFamily*> langSpecificFonts;
+                parseConfigFile(absoluteFilename.c_str(), langSpecificFonts);
+
+                for (int i = 0; i < langSpecificFonts.count(); ++i) {
+                    FontFamily* family = langSpecificFonts[i];
+                    for (int j = 0; j < family->fFontFiles.count(); ++j) {
+                        family->fFontFiles[j].fPaintOptions.setLanguage(locale);
+                    }
+                    *fallbackFonts.append() = family;
+                }
+            }
+
+            // proceed to the next entry in the directory
+            dirEntry = readdir(fontDirectory);
+        }
+    }
+#endif
+
     // This loop inserts the vendor fallback fonts in the correct order in the
     // overall fallbacks list.
     int currentOrder = -1;
     for (int i = 0; i < vendorFonts.count(); ++i) {
         FontFamily* family = vendorFonts[i];
         int order = family->order;
         if (order < 0) {
             if (currentOrder < 0) {
                 // Default case - just add it to the end of the fallback list
                 *fallbackFonts.append() = family;
@@ skipping 35 matching lines @@
 
     SkTDArray<FontFamily*> fallbackFonts;
     parseConfigFile(testFallbackConfigFile, fallbackFonts);
 
     // Append all fallback fonts to system fonts
     for (int i = 0; i < fallbackFonts.count(); ++i) {
         fallbackFonts[i]->fIsFallbackFont = true;
         *fontFamilies.append() = fallbackFonts[i];
     }
 }
-
-/**
- * Read the persistent locale.
- */
-SkString SkFontConfigParser::GetLocale()
-{
-    char propLang[PROP_VALUE_MAX], propRegn[PROP_VALUE_MAX];
-    __system_property_get("persist.sys.language", propLang);
-    __system_property_get("persist.sys.country", propRegn);
-
-    if (*propLang == 0 && *propRegn == 0) {
-        /* Set to ro properties, default is en_US */
-        __system_property_get("ro.product.locale.language", propLang);
-        __system_property_get("ro.product.locale.region", propRegn);
-        if (*propLang == 0 && *propRegn == 0) {
-            strcpy(propLang, "en");
-            strcpy(propRegn, "US");
-        }
-    }
-
-    SkString locale(6);
-    char* localeCStr = locale.writable_str();
-
-    strncpy(localeCStr, propLang, 2);
-    localeCStr[2] = '-';
-    strncpy(&localeCStr[3], propRegn, 2);
-    localeCStr[5] = '\0';
-
-    return locale;
-}