reland 8200 w/ fix for android (use fullpath instead of path)

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 "SkFontDescriptor.h"
 #include "SkDescriptor.h"
-#include "SkMMapStream.h"
 #include "SkOSFile.h"
 #include "SkPaint.h"
 #include "SkString.h"
 #include "SkStream.h"
 #include "SkThread.h"
 #include "SkTSearch.h"
 
 #ifndef SK_FONT_FILE_PREFIX
     #define SK_FONT_FILE_PREFIX "/usr/share/fonts/truetype/"
 #endif
@@ skipping 249 matching lines @@
 
 /* This subclass is just a place holder for when we have no fonts available.
     It exists so that our globals (e.g. gFamilyHead) that expect *something*
     will not be null.
  */
 class EmptyTypeface : public FamilyTypeface {
 public:
     EmptyTypeface() : INHERITED(SkTypeface::kNormal, true, NULL, false) {}
 
     // overrides
-    virtual SkStream* openStream() { return NULL; }
-    virtual const char* getUniqueString() const { return NULL; }
+    virtual SkStream* openStream() SK_OVERRIDE { return NULL; }
+    virtual const char* getUniqueString() SK_OVERRIDE const { return NULL; }
 
 private:
     typedef FamilyTypeface INHERITED;
 };
 
 class StreamTypeface : public FamilyTypeface {
 public:
     StreamTypeface(Style style, bool sysFont, FamilyRec* family,
                    SkStream* stream, bool isFixedWidth)
     : INHERITED(style, sysFont, family, isFixedWidth) {
         stream->ref();
         fStream = stream;
     }
     virtual ~StreamTypeface() {
         fStream->unref();
     }
 
-    // overrides
-    virtual SkStream* openStream()
-    {
+    virtual SkStream* openStream() SK_OVERRIDE {
       // openStream returns a refed stream.
       fStream->ref();
       return fStream;
     }
-    virtual const char* getUniqueString() const { return NULL; }
+    virtual const char* getUniqueString() const SK_OVERRIDE { return NULL; }
 
 private:
     SkStream* fStream;
 
     typedef FamilyTypeface INHERITED;
 };
 
 class FileTypeface : public FamilyTypeface {
 public:
     FileTypeface(Style style, bool sysFont, FamilyRec* family,
                  const char path[], bool isFixedWidth)
         : INHERITED(style, sysFont, family, isFixedWidth) {
         fPath.set(path);
     }
 
-    // overrides
-    virtual SkStream* openStream()
-    {
-        SkStream* stream = SkNEW_ARGS(SkMMAPStream, (fPath.c_str()));
-
-        // check for failure
-        if (stream->getLength() <= 0) {
-            SkDELETE(stream);
-            // maybe MMAP isn't supported. try FILE
-            stream = SkNEW_ARGS(SkFILEStream, (fPath.c_str()));
-            if (stream->getLength() <= 0) {
-                SkDELETE(stream);
-                stream = NULL;
-            }
-        }
-        return stream;
+    virtual SkStream* openStream() SK_OVERRIDE {
+        return SkStream::NewFromFile(fPath.c_str());
     }
 
-    virtual const char* getUniqueString() const {
+    virtual const char* getUniqueString() const SK_OVERRIDE {
         const char* str = strrchr(fPath.c_str(), '/');
         if (str) {
             str += 1;   // skip the '/'
         }
         return str;
     }
 
 private:
     SkString fPath;
 
     typedef FamilyTypeface INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 static bool get_name_and_style(const char path[], SkString* name,
                                SkTypeface::Style* style, bool* isFixedWidth) {
-    SkMMAPStream stream(path);
-    if (stream.getLength() > 0) {
-        return find_name_and_attributes(&stream, name, style, isFixedWidth);
+    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
+    if (stream.get()) {
+        return find_name_and_attributes(stream, name, style, isFixedWidth);
+    } else {
+        SkDebugf("---- failed to open <%s> as a font\n", path);
+        return false;
     }
-    else {
-        SkFILEStream stream(path);
-        if (stream.getLength() > 0) {
-            return find_name_and_attributes(&stream, name, style, isFixedWidth);
-        }
-    }
-
-    SkDebugf("---- failed to open <%s> as a font\n", path);
-    return false;
 }
 
 // these globals are assigned (once) by load_system_fonts()
 static SkTypeface* gFallBackTypeface;
 static FamilyRec* gDefaultFamily;
 static SkTypeface* gDefaultNormal;
 
 static void load_directory_fonts(const SkString& directory, unsigned int* count) {
     SkOSFile::Iter  iter(directory.c_str(), ".ttf");
     SkString        name;
@@ skipping 207 matching lines @@
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     SkTypeface* face = NULL;
     SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
 
     if (stream->isValid()) {
         face = CreateTypefaceFromStream(stream);
     }
     stream->unref();
     return face;
 }