Remove references to __system_property_get from Skia

src/ports/SkFontConfigInterface_android.cpp

 
 /*
  * Copyright 2013 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 "SkFontConfigInterface.h"
 #include "SkTypeface_android.h"
@@ skipping 92 matching lines @@
      */
     SkTypeface* nextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
                                     const SkPaintOptionsAndroid& options);
     SkTypeface* getTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origTypeface,
                                       const SkPaintOptionsAndroid& options,
                                       int* lowerBounds, int* upperBounds);
 
 private:
     void addFallbackFamily(FamilyRecID fontRecID);
     SkTypeface* getTypefaceForFontRec(FontRecID fontRecID);
-    FallbackFontList* getCurrentLocaleFallbackFontList();
     FallbackFontList* findFallbackFontList(const SkLanguage& lang, bool isOriginal = true);
 
     SkTArray<FontRec, true> fFonts;
     SkTArray<FamilyRec, true> fFontFamilies;
     SkTDict<FamilyRecID> fFamilyNameDict;
     FamilyRecID fDefaultFamilyRecID;
 
     // (SkLanguage)<->(fallback chain index) translation
     SkTDict<FallbackFontList*> fFallbackFontDict;
     SkTDict<FallbackFontList*> fFallbackFontAliasDict;
@@ skipping 88 matching lines @@
         // defer initializing the familyRec until we can be sure that at least
         // one of it's children contains a valid font file
         FamilyRec* familyRec = NULL;
         FamilyRecID familyRecID = INVALID_FAMILY_REC_ID;
 
         for (int j = 0; j < family->fFontFiles.count(); ++j) {
             SkString filename;
             get_path_for_sys_fonts(&filename, family->fFontFiles[j].fFileName);
 
             if (has_font(fFonts, filename)) {
-                SkDebugf("---- system font and fallback font files specify a duplicate "
-                        "font %s, skipping the second occurrence", filename.c_str());
-                continue;
+                DEBUG_FONT(("---- system font and fallback font files specify a duplicate "
+                        "font %s, skipping the second occurrence", filename.c_str()));
             }
 
             FontRec& fontRec = fFonts.push_back();
             fontRec.fFileName = filename;
             fontRec.fStyle = SkTypeface::kNormal;
             fontRec.fIsValid = false;
             fontRec.fFamilyRecID = familyRecID;
 
             const FontRecID fontRecID = fFonts.count() - 1;
 
@@ skipping 268 matching lines @@
         // store the result for subsequent lookups
         fontRec.fTypeface.reset(face);
     }
     SkASSERT(face);
     return face;
 }
 
 bool SkFontConfigInterfaceAndroid::getFallbackFamilyNameForChar(SkUnichar uni,
                                                                 const char* lang,
                                                                 SkString* name) {
-    FallbackFontList* fallbackFontList = NULL;
-    const SkString langTag(lang);
-    if (langTag.isEmpty()) {
-        fallbackFontList = this->getCurrentLocaleFallbackFontList();
-    } else {
-        fallbackFontList = this->findFallbackFontList(langTag);
+    const SkString locale(lang);
+    if (NULL == fLocaleFallbackFontList || locale != fCachedLocale) {
+        fCachedLocale = locale;
+        fLocaleFallbackFontList = this->findFallbackFontList(locale);

[bungeman-skia, 2014/08/04 14:52:45]

Now that this is cleaner, it sets of my spider sense for threading. Since this
mutates, this could cause havoc if multiple threads were doing this at once. On
the other hand, none of our current users do that, and they don't change this
very much anyway. Also, we're deprecating this file anyway and just keeping it
alive for old webviews. And this doesn't really introduce the problem, just
makes the existing one easier to see. I suppose setting a local gets around the
potential issue of this changing and then doing bad things in the loop below.

[tomhudson, 2014/08/04 15:26:37]

So the error case is that two different threads are passed different locales,
and we change fLocaleFallbackFontList from a long list to a shorter one?

     }
 
-    for (int i = 0; i < fallbackFontList->count(); i++) {
-        FamilyRecID familyRecID = fallbackFontList->getAt(i);
+    for (int i = 0; i < fLocaleFallbackFontList->count(); i++) {
+        FamilyRecID familyRecID = fLocaleFallbackFontList->getAt(i);
 
         // if it is not one of the accepted variants then move to the next family
         int32_t acceptedVariants = SkPaintOptionsAndroid::kDefault_Variant |
                                    SkPaintOptionsAndroid::kElegant_Variant;
         if (!(fFontFamilies[familyRecID].fPaintOptions.getFontVariant() & acceptedVariants)) {
             continue;
         }
 
         FontRecID fontRecID = find_best_style(fFontFamilies[familyRecID], SkTypeface::kNormal);
         SkTypeface* face = this->getTypefaceForFontRec(fontRecID);
 
         SkPaint paint;
         paint.setTypeface(face);
         paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);
 
         uint16_t glyphID;
         paint.textToGlyphs(&uni, sizeof(uni), &glyphID);
         if (glyphID != 0) {
             name->set(fFontFamilies[familyRecID].fFallbackName);
             return true;
         }
     }
     return false;
 }
 
-FallbackFontList* SkFontConfigInterfaceAndroid::getCurrentLocaleFallbackFontList() {
-    SkString locale = SkFontConfigParser::GetLocale();
-    if (NULL == fLocaleFallbackFontList || locale != fCachedLocale) {
-        fCachedLocale = locale;
-        fLocaleFallbackFontList = this->findFallbackFontList(locale);
-    }
-    return fLocaleFallbackFontList;
-}
-
 FallbackFontList* SkFontConfigInterfaceAndroid::findFallbackFontList(const SkLanguage& lang,
                                                                      bool isOriginal) {
     const SkString& langTag = lang.getTag();
     if (langTag.isEmpty()) {
         return &fDefaultFallbackList;
     }
 
     FallbackFontList* fallbackFontList;
     if (fFallbackFontDict.find(langTag.c_str(), langTag.size(), &fallbackFontList) ||
         fFallbackFontAliasDict.find(langTag.c_str(), langTag.size(), &fallbackFontList)) {
@@ skipping 167 matching lines @@
 
 }
 
 SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origTypeface,
                                     const SkPaintOptionsAndroid& options,
                                     int* lowerBounds, int* upperBounds) {
     SkFontConfigInterfaceAndroid* fontConfig = getSingletonInterface();
     return fontConfig->getTypefaceForGlyphID(glyphID, origTypeface, options,
                                              lowerBounds, upperBounds);
 }