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

Side by Side Diff: third_party/WebKit/Source/modules/filesystem/DataTransferItemFileSystem.cpp

Issue 2582463002: Fix webkitGetEntry for non-native files. (Closed)
Patch Set: . Created 4 years 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 unified diff | Download patch
OLDNEW
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(); 57 Blob* file = item.getAsFile();
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 0; 60 return 0;
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 *item.getDataObjectItem());
66 if (!domFileSystem) { 67 if (!domFileSystem) {
67 // IsolatedFileSystem may not be enabled. 68 // IsolatedFileSystem may not be enabled.
68 return 0; 69 return 0;
69 } 70 }
70 71
71 // The dropped entries are mapped as top-level entries in the isolated 72 // The dropped entries are mapped as top-level entries in the isolated
72 // filesystem. 73 // filesystem.
73 String virtualPath = DOMFilePath::append("/", toFile(file)->name()); 74 String virtualPath = DOMFilePath::append("/", toFile(file)->name());
74 75
75 // FIXME: This involves synchronous file operation. Consider passing file type 76 // FIXME: This involves synchronous file operation. Consider passing file type
76 // data when we dispatch drag event. 77 // data when we dispatch drag event.
77 FileMetadata metadata; 78 FileMetadata metadata;
78 if (!getFileMetadata(toFile(file)->path(), metadata)) 79 if (!getFileMetadata(toFile(file)->path(), metadata))
79 return 0; 80 return 0;
80 81
81 if (metadata.type == FileMetadata::TypeDirectory) 82 if (metadata.type == FileMetadata::TypeDirectory)
82 return DirectoryEntry::create(domFileSystem, virtualPath); 83 return DirectoryEntry::create(domFileSystem, virtualPath);
83 return FileEntry::create(domFileSystem, virtualPath); 84 return FileEntry::create(domFileSystem, virtualPath);
84 } 85 }
85 86
86 } // namespace blink 87 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698