| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 if (!item.dataObjectItem()->isFilename()) | 53 if (!item.dataObjectItem()->isFilename()) |
| 54 return nullptr; | 54 return nullptr; |
| 55 | 55 |
| 56 // For dragged files getAsFile must be pretty lightweight. | 56 // For dragged files getAsFile must be pretty lightweight. |
| 57 Blob* file = item.getAsFile().get(); | 57 Blob* file = item.getAsFile().get(); |
| 58 // The clipboard may not be in a readable state. | 58 // The clipboard may not be in a readable state. |
| 59 if (!file) | 59 if (!file) |
| 60 return nullptr; | 60 return nullptr; |
| 61 ASSERT(file->isFile()); | 61 ASSERT(file->isFile()); |
| 62 | 62 |
| 63 DraggedIsolatedFileSystem* filesystem = DraggedIsolatedFileSystem::from(item
.clipboard()->dataObject().get()); | 63 DOMFileSystem* domFileSystem = DraggedIsolatedFileSystem::getDOMFileSystem(i
tem.clipboard()->dataObject().get(), executionContext); |
| 64 DOMFileSystem* domFileSystem = filesystem ? filesystem->getDOMFileSystem(exe
cutionContext) : 0; | 64 if (!domFileSystem) { |
| 65 if (!filesystem) { | |
| 66 // IsolatedFileSystem may not be enabled. | 65 // IsolatedFileSystem may not be enabled. |
| 67 return nullptr; | 66 return nullptr; |
| 68 } | 67 } |
| 69 | 68 |
| 70 ASSERT(domFileSystem); | |
| 71 | |
| 72 // The dropped entries are mapped as top-level entries in the isolated files
ystem. | 69 // The dropped entries are mapped as top-level entries in the isolated files
ystem. |
| 73 String virtualPath = DOMFilePath::append("/", toFile(file)->name()); | 70 String virtualPath = DOMFilePath::append("/", toFile(file)->name()); |
| 74 | 71 |
| 75 // FIXME: This involves synchronous file operation. Consider passing file ty
pe data when we dispatch drag event. | 72 // FIXME: This involves synchronous file operation. Consider passing file ty
pe data when we dispatch drag event. |
| 76 FileMetadata metadata; | 73 FileMetadata metadata; |
| 77 if (!getFileMetadata(toFile(file)->path(), metadata)) | 74 if (!getFileMetadata(toFile(file)->path(), metadata)) |
| 78 return nullptr; | 75 return nullptr; |
| 79 | 76 |
| 80 if (metadata.type == FileMetadata::TypeDirectory) | 77 if (metadata.type == FileMetadata::TypeDirectory) |
| 81 return DirectoryEntry::create(domFileSystem, virtualPath); | 78 return DirectoryEntry::create(domFileSystem, virtualPath); |
| 82 return FileEntry::create(domFileSystem, virtualPath); | 79 return FileEntry::create(domFileSystem, virtualPath); |
| 83 } | 80 } |
| 84 | 81 |
| 85 } // namespace WebCore | 82 } // namespace WebCore |
| OLD | NEW |