| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/filesystem/DOMFilePath.h" | 32 #include "modules/filesystem/DOMFilePath.h" |
| 33 | 33 |
| 34 #include "wtf/Vector.h" | 34 #include "wtf/Vector.h" |
| 35 #include "wtf/text/CString.h" | 35 #include "wtf/text/CString.h" |
| 36 #include "wtf/text/StringBuilder.h" | 36 #include "wtf/text/StringBuilder.h" |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace blink { |
| 39 | 39 |
| 40 const char DOMFilePath::separator = '/'; | 40 const char DOMFilePath::separator = '/'; |
| 41 const char DOMFilePath::root[] = "/"; | 41 const char DOMFilePath::root[] = "/"; |
| 42 | 42 |
| 43 String DOMFilePath::append(const String& base, const String& components) | 43 String DOMFilePath::append(const String& base, const String& components) |
| 44 { | 44 { |
| 45 return ensureDirectoryPath(base) + components; | 45 return ensureDirectoryPath(base) + components; |
| 46 } | 46 } |
| 47 | 47 |
| 48 String DOMFilePath::ensureDirectoryPath(const String& path) | 48 String DOMFilePath::ensureDirectoryPath(const String& path) |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 bool DOMFilePath::isValidName(const String& name) | 137 bool DOMFilePath::isValidName(const String& name) |
| 138 { | 138 { |
| 139 if (name.isEmpty()) | 139 if (name.isEmpty()) |
| 140 return true; | 140 return true; |
| 141 // '/' is not allowed in name. | 141 // '/' is not allowed in name. |
| 142 if (name.contains('/')) | 142 if (name.contains('/')) |
| 143 return false; | 143 return false; |
| 144 return isValidPath(name); | 144 return isValidPath(name); |
| 145 } | 145 } |
| 146 | 146 |
| 147 } // namespace WebCore | 147 } // namespace blink |
| OLD | NEW |