Changeset 201486 in webkit
- Timestamp:
- May 28, 2016 10:05:06 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r201485 r201486 1 2016-05-28 Konstantin Tokarev <annulen@yandex.ru> 2 3 FileSystem: use OS(WINDOWS) instead of PLATFORM(WIN). 4 https://bugs.webkit.org/show_bug.cgi?id=158168 5 6 Reviewed by Darin Adler. 7 8 No new tests needed. 9 10 * platform/FileSystem.cpp: 11 (WebCore::lastComponentOfPathIgnoringTrailingSlash): 12 (WebCore::MappedFileData::~MappedFileData): 13 (WebCore::MappedFileData::MappedFileData): 14 * platform/FileSystem.h: Removed unused PlatformFilePathSeparator 15 constant. 16 1 17 2016-05-28 Konstantin Tokarev <annulen@yandex.ru> 2 18 -
trunk/Source/WebCore/platform/FileSystem.cpp
r200212 r201486 33 33 #include <wtf/text/StringBuilder.h> 34 34 35 #if ! PLATFORM(WIN)35 #if !OS(WINDOWS) 36 36 #include <fcntl.h> 37 37 #include <sys/mman.h> … … 196 196 String lastComponentOfPathIgnoringTrailingSlash(const String& path) 197 197 { 198 #if PLATFORM(WIN)199 char pathSep erator = '\\';198 #if OS(WINDOWS) 199 char pathSeparator = '\\'; 200 200 #else 201 char pathSep erator = '/';202 #endif 203 204 auto position = path.reverseFind(pathSep erator);201 char pathSeparator = '/'; 202 #endif 203 204 auto position = path.reverseFind(pathSeparator); 205 205 if (position == notFound) 206 206 return path; … … 209 209 if (position == endOfSubstring) { 210 210 --endOfSubstring; 211 position = path.reverseFind(pathSep erator, endOfSubstring);211 position = path.reverseFind(pathSeparator, endOfSubstring); 212 212 } 213 213 … … 266 266 MappedFileData::~MappedFileData() 267 267 { 268 #if ! PLATFORM(WIN)268 #if !OS(WINDOWS) 269 269 if (!m_fileData) 270 270 return; … … 275 275 MappedFileData::MappedFileData(const String& filePath, bool& success) 276 276 { 277 #if PLATFORM(WIN)277 #if OS(WINDOWS) 278 278 // FIXME: Implement mapping 279 279 success = false; -
trunk/Source/WebCore/platform/FileSystem.h
r200163 r201486 129 129 }; 130 130 131 #if OS(WINDOWS)132 static const char PlatformFilePathSeparator = '\\';133 #else134 static const char PlatformFilePathSeparator = '/';135 #endif136 137 131 struct FileMetadata; 138 132
Note: See TracChangeset
for help on using the changeset viewer.