| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 61   ASSERT(file->isFile()); | 61   ASSERT(file->isFile()); | 
| 62 | 62 | 
| 63   DOMFileSystem* domFileSystem = | 63   DOMFileSystem* domFileSystem = | 
| 64       DraggedIsolatedFileSystemImpl::getDOMFileSystem( | 64       DraggedIsolatedFileSystemImpl::getDOMFileSystem( | 
| 65           item.getDataTransfer()->dataObject(), executionContext); | 65           item.getDataTransfer()->dataObject(), executionContext); | 
| 66   if (!domFileSystem) { | 66   if (!domFileSystem) { | 
| 67     // IsolatedFileSystem may not be enabled. | 67     // IsolatedFileSystem may not be enabled. | 
| 68     return 0; | 68     return 0; | 
| 69   } | 69   } | 
| 70 | 70 | 
| 71   // The dropped entries are mapped as top-level entries in the isolated filesys
    tem. | 71   // The dropped entries are mapped as top-level entries in the isolated | 
|  | 72   // filesystem. | 
| 72   String virtualPath = DOMFilePath::append("/", toFile(file)->name()); | 73   String virtualPath = DOMFilePath::append("/", toFile(file)->name()); | 
| 73 | 74 | 
| 74   // FIXME: This involves synchronous file operation. Consider passing file type
     data when we dispatch drag event. | 75   // FIXME: This involves synchronous file operation. Consider passing file type | 
|  | 76   // data when we dispatch drag event. | 
| 75   FileMetadata metadata; | 77   FileMetadata metadata; | 
| 76   if (!getFileMetadata(toFile(file)->path(), metadata)) | 78   if (!getFileMetadata(toFile(file)->path(), metadata)) | 
| 77     return 0; | 79     return 0; | 
| 78 | 80 | 
| 79   if (metadata.type == FileMetadata::TypeDirectory) | 81   if (metadata.type == FileMetadata::TypeDirectory) | 
| 80     return DirectoryEntry::create(domFileSystem, virtualPath); | 82     return DirectoryEntry::create(domFileSystem, virtualPath); | 
| 81   return FileEntry::create(domFileSystem, virtualPath); | 83   return FileEntry::create(domFileSystem, virtualPath); | 
| 82 } | 84 } | 
| 83 | 85 | 
| 84 }  // namespace blink | 86 }  // namespace blink | 
| OLD | NEW | 
|---|