Move SkOSFile::Iter impls into ports.

include/core/SkOSFile.h

 
 /*
  * 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.
  */
 
 
 // TODO: add unittests for all these operations
 
 #ifndef SkOSFile_DEFINED
 #define SkOSFile_DEFINED
 
 #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 {
     kRead_SkFILE_Flag   = 0x01,
     kWrite_SkFILE_Flag  = 0x02
 };
 
 #ifdef _WIN32
 const static char SkPATH_SEPARATOR = '\\';
 #else
@@ skipping 69 matching lines @@
         Iter(const char path[], const char suffix[] = NULL);
         ~Iter();
 
         void reset(const char path[], const char suffix[] = NULL);
         /** If getDir is true, only returns directories.
             Results are undefined if true and false calls are
             interleaved on a single iterator.
         */
         bool next(SkString* name, bool getDir = false);
 
+        static const size_t kStorageSize = 40;
     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<kStorageSize> fSelf;
     };
 };
 
 /**
  *  Functions for modifying SkStrings which represent paths on the filesystem.
  */
 class SkOSPath   {
 public:
     /**
      * Assembles rootPath and relativePath into a single path, like this:
@@ skipping 17 matching lines @@
 
     /**
      *  Given a qualified file name returns the directory.
      *  Behaves like python's os.path.dirname. If the fullPath is
      *  /dir/subdir/ the return will be /dir/subdir/
      *  @param fullPath Full path to the file.
      *  @return SkString The dir containing the file - anything preceding the
      *      final slash, or the full name if ending in a slash.
      */
     static SkString Dirname(const char* fullPath);
-    
 };
 
 #endif