revert 8200 to figure out android break

git-svn-id: http://skia.googlecode.com/svn/trunk@8201 2bbb7eff-a529-9590-31e7-b0007b416f81

14 files changed, 223 insertions, 156 deletions

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 5f99fd911e..57f31ba566 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -74,6 +74,10 @@
           'include_dirs': [
             'config/win',
           ],
+          'sources!': [
+            '../include/core/SkMMapStream.h',
+            '../src/core/SkMMapStream.cpp',
+          ],
         }],
         [ 'skia_os in ("android", "nacl")', {
           'dependencies': [
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 23a652acb8..3c2be39c05 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -105,6 +105,7 @@
         '<(skia_src_path)/core/SkMath.cpp',
         '<(skia_src_path)/core/SkMatrix.cpp',
         '<(skia_src_path)/core/SkMetaData.cpp',
+        '<(skia_src_path)/core/SkMMapStream.cpp',
         '<(skia_src_path)/core/SkOrderedReadBuffer.cpp',
         '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp',
         '<(skia_src_path)/core/SkPackBits.cpp',
diff --git a/include/core/SkData.h b/include/core/SkData.h
index 6b09119fc5..9a0cb09b60 100644
--- a/include/core/SkData.h
+++ b/include/core/SkData.h
@@ -89,12 +89,6 @@ public:
     static SkData* NewFromMalloc(const void* data, size_t length);
 
     /**
-     *  Create a new dataref from a pointer allocated by mmap. The Data object
-     *  will handle calling munmap().
-     */
-    static SkData* NewFromMMap(const void* data, size_t length);
-    
-    /**
      *  Create a new dataref using a subset of the data in the specified
      *  src dataref.
      */
diff --git a/include/core/SkMMapStream.h b/include/core/SkMMapStream.h
new file mode 100644
index 0000000000..a3b35f2df8
--- /dev/null
+++ b/include/core/SkMMapStream.h
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright 2008 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.
+ */
+
+
+#ifndef SkMMapStream_DEFINED
+#define SkMMapStream_DEFINED
+
+#include "SkStream.h"
+
+class SkMMAPStream : public SkMemoryStream {
+public:
+    SkMMAPStream(const char filename[]);
+    virtual ~SkMMAPStream();
+
+    virtual void setMemory(const void* data, size_t length, bool);
+private:
+    void*   fAddr;
+    size_t  fSize;
+
+    void closeMMap();
+
+    typedef SkMemoryStream INHERITED;
+};
+
+#endif
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index 11cb2235a7..2246b63f59 100644
--- a/include/core/SkPreConfig.h
+++ b/include/core/SkPreConfig.h
@@ -108,17 +108,6 @@
 
 //////////////////////////////////////////////////////////////////////
 
-#ifndef SK_MMAP_SUPPORT
-    #ifdef SK_BUILD_FOR_WIN32
-        // by default, if we're windows, we assume we don't have mmap
-        #define SK_MMAP_SUPPORT 0
-    #else
-        #define SK_MMAP_SUPPORT 1
-    #endif
-#endif
-
-//////////////////////////////////////////////////////////////////////
-
 /**
  *  SK_CPU_SSE_LEVEL
  *
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index eb0cd4757f..7e3c1a370b 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -17,13 +17,6 @@ class SkData;
 
 class SK_API SkStream : public SkRefCnt {
 public:
-    /**
-     *  Attempts to open the specified file, and return a stream to it (using
-     *  mmap if available). On success, the caller must call unref() on the
-     *  returned object. On failure, returns NULL.
-     */
-    static SkStream* NewFromFile(const char path[]);
-    
     SK_DECLARE_INST_COUNT(SkStream)
 
     /** Called to rewind to the beginning of the stream. If this cannot be
diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp
index 8fbca7af5f..3e0c71a0e8 100644
--- a/src/core/SkData.cpp
+++ b/src/core/SkData.cpp
@@ -8,13 +8,6 @@
 #include "SkData.h"
 #include "SkFlattenableBuffers.h"
 
-#if SK_MMAP_SUPPORT
-    #include <unistd.h>
-    #include <sys/mman.h>
-    #include <fcntl.h>
-    #include <errno.h>
-#endif
-
 SK_DEFINE_INST_COUNT(SkData)
 
 SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) {
@@ -127,20 +120,6 @@ SkData* SkData::NewWithCString(const char cstr[]) {
     return NewWithCopy(cstr, size);
 }
 
-#if SK_MMAP_SUPPORT
-static void sk_munmap_releaseproc(const void* addr, size_t length, void*) {
-    munmap(const_cast<void*>(addr), length);
-}
-
-SkData* SkData::NewFromMMap(const void* addr, size_t length) {
-    return SkNEW_ARGS(SkData, (addr, length, sk_munmap_releaseproc, NULL));
-}
-#else
-SkData* SkData::NewFromMMap(const void* addr, size_t length) {
-    return NULL;
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkData::flatten(SkFlattenableWriteBuffer& buffer) const {
@@ -321,4 +300,3 @@ SkDataSet* SkDataSet::NewEmpty() {
     gEmptySet->ref();
     return gEmptySet;
 }
-
diff --git a/src/core/SkMMapStream.cpp b/src/core/SkMMapStream.cpp
new file mode 100644
index 0000000000..7388e81498
--- /dev/null
+++ b/src/core/SkMMapStream.cpp
@@ -0,0 +1,77 @@
+
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkMMapStream.h"
+
+#include <unistd.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <errno.h>
+
+SkMMAPStream::SkMMAPStream(const char filename[])
+{
+    fAddr = NULL;   // initialize to failure case
+    fSize = 0;
+
+    int fildes = open(filename, O_RDONLY);
+    if (fildes < 0)
+    {
+        SkDEBUGF(("---- failed to open(%s) for mmap stream error=%d\n", filename, errno));
+        return;
+    }
+
+    off_t offset = lseek(fildes, 0, SEEK_END);    // find the file size
+    if (offset == -1)
+    {
+        SkDEBUGF(("---- failed to lseek(%s) for mmap stream error=%d\n", filename, errno));
+        close(fildes);
+        return;
+    }
+    (void)lseek(fildes, 0, SEEK_SET);   // restore file offset to beginning
+
+    // to avoid a 64bit->32bit warning, I explicitly create a size_t size
+    size_t size = static_cast<size_t>(offset);
+
+    void* addr = mmap(NULL, size, PROT_READ, MAP_SHARED, fildes, 0);
+
+    // According to the POSIX documentation of mmap it adds an extra reference
+    // to the file associated with the fildes which is not removed by a
+    // subsequent close() on that fildes. This reference is removed when there
+    // are no more mappings to the file.
+    close(fildes);
+
+    if (MAP_FAILED == addr)
+    {
+        SkDEBUGF(("---- failed to mmap(%s) for mmap stream error=%d\n", filename, errno));
+        return;
+    }
+
+    this->INHERITED::setMemory(addr, size);
+
+    fAddr = addr;
+    fSize = size;
+}
+
+SkMMAPStream::~SkMMAPStream()
+{
+    this->closeMMap();
+}
+
+void SkMMAPStream::setMemory(const void* data, size_t length, bool copyData)
+{
+    this->closeMMap();
+    this->INHERITED::setMemory(data, length, copyData);
+}
+
+void SkMMAPStream::closeMMap()
+{
+    if (fAddr)
+    {
+        munmap(fAddr, fSize);
+        fAddr = NULL;
+    }
+}
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index acbcfbc53d..fb343ea76a 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -13,14 +13,6 @@
 #include "SkString.h"
 #include "SkOSFile.h"
 
-#if SK_MMAP_SUPPORT
-    #include <unistd.h>
-    #include <sys/mman.h>
-    #include <fcntl.h>
-    #include <errno.h>
-    #include <unistd.h>
-#endif
-
 SK_DEFINE_INST_COUNT(SkStream)
 SK_DEFINE_INST_COUNT(SkWStream)
 SK_DEFINE_INST_COUNT(SkFILEStream)
@@ -797,59 +789,3 @@ bool SkDebugWStream::write(const void* buffer, size_t size)
 #endif
     return true;
 }
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-static bool mmap_filename(const char path[], void** addrPtr, size_t* sizePtr) {
-#if SK_MMAP_SUPPORT
-    int fd = open(path, O_RDONLY);
-    if (fd < 0) {
-        return false;
-    }
-    
-    off_t offset = lseek(fd, 0, SEEK_END);    // find the file size
-    if (offset == -1) {
-        close(fd);
-        return false;
-    }
-    (void)lseek(fd, 0, SEEK_SET);   // restore file offset to beginning
-    
-    // to avoid a 64bit->32bit warning, I explicitly create a size_t size
-    size_t size = static_cast<size_t>(offset);
-    
-    void* addr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
-    close(fd);
-    
-    if (MAP_FAILED == addr) {
-        return false;
-    }
-    
-    *addrPtr = addr;
-    *sizePtr = size;
-    return true;
-#else
-    return false;
-#endif
-}
-
-SkStream* SkStream::NewFromFile(const char path[]) {
-    void* addr;
-    size_t size;
-    if (mmap_filename(path, &addr, &size)) {
-        SkAutoTUnref<SkData> data(SkData::NewFromMMap(addr, size));
-        if (data.get()) {
-            return SkNEW_ARGS(SkMemoryStream, (data.get()));
-        }
-    }
-    
-    // If we get here, then our attempt at using mmap failed, so try normal
-    // file access.
-    SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
-    if (!stream->isValid()) {
-        stream->unref();
-        stream = NULL;
-    }
-    return stream;
-}
-
diff --git a/src/ports/SkFontHost_android.cpp b/src/ports/SkFontHost_android.cpp
index 729a4d5518..e1d6cf471e 100644
--- a/src/ports/SkFontHost_android.cpp
+++ b/src/ports/SkFontHost_android.cpp
@@ -9,6 +9,7 @@
 #include "SkFontDescriptor.h"
 #include "SkGraphics.h"
 #include "SkDescriptor.h"
+#include "SkMMapStream.h"
 #include "SkPaint.h"
 #include "SkString.h"
 #include "SkStream.h"
@@ -369,19 +370,30 @@ public:
         fPath.set(path);
     }
 
-    virtual SkStream* openStream() SK_OVERRIDE {
-        return SkStream::NewFromFile(fPath.c_str());
+    // 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 const char* getUniqueString() const SK_OVERRIDE {
+    virtual const char* getUniqueString() const {
         const char* str = strrchr(fPath.c_str(), '/');
         if (str) {
             str += 1;   // skip the '/'
         }
         return str;
     }
-
-    virtual const char* getFilePath() const SK_OVERRIDE {
+    virtual const char* getFilePath() const {
         return fPath.c_str();
     }
 
@@ -400,15 +412,21 @@ static bool get_name_and_style(const char path[], SkString* name,
     SkString        fullpath;
     GetFullPathForSysFonts(&fullpath, path);
 
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-    if (stream.get()) {
-        return find_name_and_attributes(stream, name, style, isFixedWidth);
-    } else {
-        if (isExpected) {
-            SkDebugf("---- failed to open <%s> as a font", fullpath.c_str());
+    SkMMAPStream stream(fullpath.c_str());
+    if (stream.getLength() > 0) {
+        return find_name_and_attributes(&stream, name, style, isFixedWidth);
+    }
+    else {
+        SkFILEStream stream(fullpath.c_str());
+        if (stream.getLength() > 0) {
+            return find_name_and_attributes(&stream, name, style, isFixedWidth);
         }
-        return false;
     }
+
+    if (isExpected) {
+        SkDebugf("---- failed to open <%s> as a font", fullpath.c_str());
+    }
+    return false;
 }
 
 // used to record our notion of the pre-existing fonts
@@ -934,8 +952,11 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-    return stream.get() ? SkFontHost::CreateTypefaceFromStream(stream) : NULL;
+    SkStream* stream = SkNEW_ARGS(SkMMAPStream, (path));
+    SkTypeface* face = SkFontHost::CreateTypefaceFromStream(stream);
+    // since we created the stream, we let go of our ref() here
+    stream->unref();
+    return face;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/ports/SkFontHost_ascender.cpp b/src/ports/SkFontHost_ascender.cpp
index 51210d9642..d20cc825cd 100644
--- a/src/ports/SkFontHost_ascender.cpp
+++ b/src/ports/SkFontHost_ascender.cpp
@@ -21,6 +21,8 @@
 
 //////////////////////////////////////////////////////////////////////////
 
+#include "SkMMapStream.h"
+
 class SkScalerContext_Ascender : public SkScalerContext {
 public:
     SkScalerContext_Ascender(const SkDescriptor* desc);
diff --git a/src/ports/SkFontHost_freetype_mac.cpp b/src/ports/SkFontHost_freetype_mac.cpp
index 3d89bc613a..bc197d6872 100644
--- a/src/ports/SkFontHost_freetype_mac.cpp
+++ b/src/ports/SkFontHost_freetype_mac.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkFontHost.h"
+#include "SkMMapStream.h"
 #include "SkTypefaceCache.h"
 
 #define FONT_PATH   "/Library/Fonts/Skia.ttf"
@@ -25,11 +26,7 @@ public:
 };
 
 static FTMacTypeface* create_from_path(const char path[]) {
-    SkStream* stream = SkStream::NewFromFile(path);
-    if (!stream) {
-        return NULL;
-    }
-
+    SkStream* stream = new SkMMAPStream(path);
     size_t size = stream->getLength();
     SkASSERT(size);
     FTMacTypeface* tf = new FTMacTypeface(SkTypeface::kNormal,
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
index 25ae7effe2..07235c875f 100644
--- a/src/ports/SkFontHost_linux.cpp
+++ b/src/ports/SkFontHost_linux.cpp
@@ -10,6 +10,7 @@
 #include "SkFontHost.h"
 #include "SkFontDescriptor.h"
 #include "SkDescriptor.h"
+#include "SkMMapStream.h"
 #include "SkOSFile.h"
 #include "SkPaint.h"
 #include "SkString.h"
@@ -279,8 +280,8 @@ public:
     EmptyTypeface() : INHERITED(SkTypeface::kNormal, true, NULL, false) {}
 
     // overrides
-    virtual SkStream* openStream() SK_OVERRIDE { return NULL; }
-    virtual const char* getUniqueString() SK_OVERRIDE const { return NULL; }
+    virtual SkStream* openStream() { return NULL; }
+    virtual const char* getUniqueString() const { return NULL; }
 
 private:
     typedef FamilyTypeface INHERITED;
@@ -298,12 +299,14 @@ public:
         fStream->unref();
     }
 
-    virtual SkStream* openStream() SK_OVERRIDE {
+    // overrides
+    virtual SkStream* openStream()
+    {
       // openStream returns a refed stream.
       fStream->ref();
       return fStream;
     }
-    virtual const char* getUniqueString() const SK_OVERRIDE { return NULL; }
+    virtual const char* getUniqueString() const { return NULL; }
 
 private:
     SkStream* fStream;
@@ -319,11 +322,25 @@ public:
         fPath.set(path);
     }
 
-    virtual SkStream* openStream() SK_OVERRIDE {
-        return SkStream::NewFromFile(fPath.c_str());
+    // 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 const char* getUniqueString() const SK_OVERRIDE {
+    virtual const char* getUniqueString() const {
         const char* str = strrchr(fPath.c_str(), '/');
         if (str) {
             str += 1;   // skip the '/'
@@ -342,13 +359,19 @@ private:
 
 static bool get_name_and_style(const char path[], SkString* name,
                                SkTypeface::Style* style, bool* 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;
+    SkMMAPStream stream(path);
+    if (stream.getLength() > 0) {
+        return find_name_and_attributes(&stream, name, style, isFixedWidth);
+    }
+    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()
diff --git a/src/ports/SkFontHost_simple.cpp b/src/ports/SkFontHost_simple.cpp
index a3092b9199..101d5761d2 100644
--- a/src/ports/SkFontHost_simple.cpp
+++ b/src/ports/SkFontHost_simple.cpp
@@ -9,6 +9,7 @@
 
 #include "SkFontHost.h"
 #include "SkDescriptor.h"
+#include "SkMMapStream.h"
 #include "SkPaint.h"
 #include "SkString.h"
 #include "SkStream.h"
@@ -311,18 +312,30 @@ public:
         fPath.set(path);
     }
 
-    virtual SkStream* openStream() SK_OVERRIDE {
-        return SkStream::NewFromFile(fPath.c_str());
+    // 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 const char* getUniqueString() const SK_OVERRIDE {
+    virtual const char* getUniqueString() const {
         const char* str = strrchr(fPath.c_str(), '/');
         if (str) {
             str += 1;   // skip the '/'
         }
         return str;
     }
-    virtual const char* getFilePath() const SK_OVERRIDE {
+    virtual const char* getFilePath() const {
         return fPath.c_str();
     }
 
@@ -340,15 +353,21 @@ static bool get_name_and_style(const char path[], SkString* name,
     SkString        fullpath;
     GetFullPathForSysFonts(&fullpath, path);
 
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-    if (stream.get()) {
+    SkMMAPStream stream(fullpath.c_str());
+    if (stream.getLength() > 0) {
         return find_name_and_attributes(&stream, name, style, NULL);
-    } else {
-        if (isExpected) {
-            SkDebugf("---- failed to open <%s> as a font\n", fullpath.c_str());
+    }
+    else {
+        SkFILEStream stream(fullpath.c_str());
+        if (stream.getLength() > 0) {
+            return find_name_and_attributes(&stream, name, style, NULL);
         }
-        return false;
     }
+
+    if (isExpected) {
+        SkDebugf("---- failed to open <%s> as a font\n", fullpath.c_str());
+    }
+    return false;
 }
 
 // used to record our notion of the pre-existing fonts
@@ -617,6 +636,9 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-    return stream.get() ? SkFontHost::CreateTypefaceFromStream(stream) : NULL;
+    SkStream* stream = SkNEW_ARGS(SkMMAPStream, (path));
+    SkTypeface* face = SkFontHost::CreateTypefaceFromStream(stream);
+    // since we created the stream, we let go of our ref() here
+    stream->unref();
+    return face;
 }