Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: include/core/SkOSFile.h

Issue 920593002: Move SkOSFile::Iter impls into ports. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comments. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/ports/SkOSFile_none.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkOSFile.h
diff --git a/include/core/SkOSFile.h b/include/core/SkOSFile.h
index 69a74dfcaa3331594a1ef68a9824c4eb700945e3..3ee3aa44a042bf5e82a7eb0406387f67155670d9 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 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;
};
};
@@ -154,7 +143,6 @@ public:
* final slash, or the full name if ending in a slash.
*/
static SkString Dirname(const char* fullPath);
-
};
#endif
« no previous file with comments | « no previous file | src/ports/SkOSFile_none.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698