Move SkOSFile::Iter impls into ports.

include/core/SkOSFile.h

Index: include/core/SkOSFile.h
diff --git a/include/core/SkOSFile.h b/include/core/SkOSFile.h
index 69a74dfcaa3331594a1ef68a9824c4eb700945e3..f12b9841de9a0d67d7545bf4ce8efec6fdb6682c 100644
--- a/include/core/SkOSFile.h
+++ b/include/core/SkOSFile.h
@@ -14,12 +14,6 @@
 
 #include "SkString.h"
 
-#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS)
-    #include <dirent.h>
-#endif
-
-#include <stddef.h> // ptrdiff_t
-
 struct SkFILE;
 
 enum SkFILE_Flags {
@@ -109,14 +103,9 @@ public:
         */
         bool next(SkString* name, bool getDir = false);
 
+        static const size_t StorageSize = 40;

[reed1, 2015/02/12 14:28:25]

nit: convention would be kStorageSize

[bungeman-skia, 2015/02/12 15:11:38]

Done.

     private:
-#ifdef SK_BUILD_FOR_WIN
-        HANDLE      fHandle;
-        uint16_t*   fPath16;
-#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS)
-        DIR*        fDIR;
-        SkString    fPath, fSuffix;
-#endif
+        SkAlignedSStorage<StorageSize> fSelf;
     };
 };
 
@@ -154,7 +143,6 @@ public:
      *      final slash, or the full name if ending in a slash.
      */
     static SkString Dirname(const char* fullPath);
-    
 };
 
 #endif