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

Review URL: https://codereview.chromium.org/12921003

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

1 files changed, 22 insertions, 0 deletions

diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp
index 3e0c71a0e8..8fbca7af5f 100644
--- a/src/core/SkData.cpp
+++ b/src/core/SkData.cpp
@@ -8,6 +8,13 @@
 #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) {
@@ -120,6 +127,20 @@ 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 {
@@ -300,3 +321,4 @@ SkDataSet* SkDataSet::NewEmpty() {
     gEmptySet->ref();
     return gEmptySet;
 }
+