Changes to SkFontHost_linux

src/ports/SkFontHost_linux.cpp

 /*
  * 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.
  */
 
 #include "SkFontHost.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontDescriptor.h"
@@ skipping 308 matching lines @@
             SkDebugf("---- failed to open <%s> as a font\n", path);
             return false;
         }
     }
 
     void load_directory_fonts(const SkString& directory) {
         SkOSFile::Iter iter(directory.c_str(), ".ttf");
         SkString name;
 
         while (iter.next(&name, false)) {
-            SkString filename(directory);
-            filename.append(name);
+            SkString filename(
+                SkOSPath::SkPathJoin(directory.c_str(), name.c_str()));
 
             bool isFixedPitch;
             SkString realname;
             SkTypeface::Style style = SkTypeface::kNormal; // avoid uninitialized warning
 
             if (!get_name_and_style(filename.c_str(), &realname, &style, &isFixedPitch)) {
                 SkDebugf("------ can't load <%s> as a font\n", filename.c_str());
                 continue;
             }
 
@@ skipping 13 matching lines @@
         }
 
         SkOSFile::Iter dirIter(directory.c_str());
         while (dirIter.next(&name, true)) {
             if (name.startsWith(".")) {
                 continue;
             }
             SkString dirname(directory);
             dirname.append(name);
             dirname.append(SK_FONT_FILE_DIR_SEPERATOR);
             load_directory_fonts(dirname);

[bungeman-skia, 2014/03/13 15:11:05]

Can we use SkOSPath::SkPathJoin here as well, and then remove
SK_FONT_FILE_DIR_SEPERATOR? That would make this handling consistent, and then
we'd just have the one SkPATH_SEPARATOR. (This file was written before that
existed).

[hal.canary, 2014/03/13 15:21:43]

Done.

         }
     }
 
     void load_system_fonts(const char* dir) {
         SkString baseDirectory(dir);
         load_directory_fonts(baseDirectory);
 
         if (fFamilies.empty()) {
             SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
             fFamilies.push_back().reset(family);
             family->appendTypeface(SkNEW(SkTypeface_Empty));
         }
 
         // Try to pick a default font.
         static const char* gDefaultNames[] = {
-            "Arial", "Verdana", "Times New Roman", NULL
+            "Arial", "Verdana", "Times New Roman", "Droid Sans", NULL
         };
         for (size_t i = 0; i < SK_ARRAY_COUNT(gDefaultNames); ++i) {
             SkFontStyleSet_Custom* set = this->onMatchFamily(gDefaultNames[i]);
             if (NULL == set) {
                 continue;
             }
 
             SkTypeface* tf = set->matchStyle(SkFontStyle(SkFontStyle::kNormal_Weight,
                                                          SkFontStyle::kNormal_Width,
                                                          SkFontStyle::kUpright_Slant));
@@ skipping 12 matching lines @@
     }
 
     SkTArray<SkAutoTUnref<SkFontStyleSet_Custom>, true> fFamilies;
     SkFontStyleSet_Custom* gDefaultFamily;
     SkTypeface* gDefaultNormal;
 };
 
 SkFontMgr* SkFontMgr::Factory() {
     return new SkFontMgr_Custom(SK_FONT_FILE_PREFIX);
 }