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

Unified Diff: Source/modules/filesystem/DataTransferItemFileSystem.cpp

Issue 314333002: Enable Oilpan by default in modules/filesystem/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove consts from conversion ctor + copy assignment op Created 6 years, 6 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/filesystem/DataTransferItemFileSystem.h ('k') | Source/modules/filesystem/DirectoryEntry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/filesystem/DataTransferItemFileSystem.cpp
diff --git a/Source/modules/filesystem/DataTransferItemFileSystem.cpp b/Source/modules/filesystem/DataTransferItemFileSystem.cpp
index ab61d0365b3c8719c94252150d1cd01851f2ee26..4aadb40dabbcb2d33065ae010566a064ac01564e 100644
--- a/Source/modules/filesystem/DataTransferItemFileSystem.cpp
+++ b/Source/modules/filesystem/DataTransferItemFileSystem.cpp
@@ -48,22 +48,22 @@
namespace WebCore {
// static
-PassRefPtrWillBeRawPtr<Entry> DataTransferItemFileSystem::webkitGetAsEntry(ExecutionContext* executionContext, DataTransferItem& item)
+Entry* DataTransferItemFileSystem::webkitGetAsEntry(ExecutionContext* executionContext, DataTransferItem& item)
{
if (!item.dataObjectItem()->isFilename())
- return nullptr;
+ return 0;
// For dragged files getAsFile must be pretty lightweight.
Blob* file = item.getAsFile().get();
// The clipboard may not be in a readable state.
if (!file)
- return nullptr;
+ return 0;
ASSERT(file->isFile());
DOMFileSystem* domFileSystem = DraggedIsolatedFileSystem::getDOMFileSystem(item.clipboard()->dataObject().get(), executionContext);
if (!domFileSystem) {
// IsolatedFileSystem may not be enabled.
- return nullptr;
+ return 0;
}
// The dropped entries are mapped as top-level entries in the isolated filesystem.
@@ -72,7 +72,7 @@ PassRefPtrWillBeRawPtr<Entry> DataTransferItemFileSystem::webkitGetAsEntry(Execu
// FIXME: This involves synchronous file operation. Consider passing file type data when we dispatch drag event.
FileMetadata metadata;
if (!getFileMetadata(toFile(file)->path(), metadata))
- return nullptr;
+ return 0;
if (metadata.type == FileMetadata::TypeDirectory)
return DirectoryEntry::create(domFileSystem, virtualPath);
« no previous file with comments | « Source/modules/filesystem/DataTransferItemFileSystem.h ('k') | Source/modules/filesystem/DirectoryEntry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698