Index: Source/modules/filesystem/DOMFileSystem.cpp |
diff --git a/Source/modules/filesystem/DOMFileSystem.cpp b/Source/modules/filesystem/DOMFileSystem.cpp |
index 8796559da3298df2253a1ccffdc967f4f61a8592..2b93fb2678470ec8e21b444d50e975a8e67156da 100644 |
--- a/Source/modules/filesystem/DOMFileSystem.cpp |
+++ b/Source/modules/filesystem/DOMFileSystem.cpp |
@@ -54,14 +54,14 @@ |
namespace WebCore { |
// static |
-PassRefPtrWillBeRawPtr<DOMFileSystem> DOMFileSystem::create(ExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL) |
+DOMFileSystem* DOMFileSystem::create(ExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL) |
{ |
- RefPtrWillBeRawPtr<DOMFileSystem> fileSystem(adoptRefWillBeRefCountedGarbageCollected(new DOMFileSystem(context, name, type, rootURL))); |
+ DOMFileSystem* fileSystem(new DOMFileSystem(context, name, type, rootURL)); |
fileSystem->suspendIfNeeded(); |
- return fileSystem.release(); |
+ return fileSystem; |
} |
-PassRefPtrWillBeRawPtr<DOMFileSystem> DOMFileSystem::createIsolatedFileSystem(ExecutionContext* context, const String& filesystemId) |
+DOMFileSystem* DOMFileSystem::createIsolatedFileSystem(ExecutionContext* context, const String& filesystemId) |
{ |
if (filesystemId.isEmpty()) |
return nullptr; |
@@ -93,7 +93,7 @@ DOMFileSystem::DOMFileSystem(ExecutionContext* context, const String& name, File |
ScriptWrappable::init(this); |
} |
-PassRefPtrWillBeRawPtr<DirectoryEntry> DOMFileSystem::root() |
+DirectoryEntry* DOMFileSystem::root() |
{ |
return DirectoryEntry::create(this, DOMFilePath::root); |
} |
@@ -157,7 +157,7 @@ namespace { |
class SnapshotFileCallback : public FileSystemCallbacksBase { |
public: |
- static PassOwnPtr<AsyncFileSystemCallbacks> create(PassRefPtrWillBeRawPtr<DOMFileSystem> filesystem, const String& name, const KURL& url, PassOwnPtr<FileCallback> successCallback, PassOwnPtr<ErrorCallback> errorCallback, ExecutionContext* context) |
+ static PassOwnPtr<AsyncFileSystemCallbacks> create(DOMFileSystem* filesystem, const String& name, const KURL& url, PassOwnPtr<FileCallback> successCallback, PassOwnPtr<ErrorCallback> errorCallback, ExecutionContext* context) |
{ |
return adoptPtr(static_cast<AsyncFileSystemCallbacks*>(new SnapshotFileCallback(filesystem, name, url, successCallback, errorCallback, context))); |
} |
@@ -190,8 +190,8 @@ public: |
} |
private: |
- SnapshotFileCallback(PassRefPtrWillBeRawPtr<DOMFileSystem> filesystem, const String& name, const KURL& url, PassOwnPtr<FileCallback> successCallback, PassOwnPtr<ErrorCallback> errorCallback, ExecutionContext* context) |
- : FileSystemCallbacksBase(errorCallback, filesystem.get(), context) |
+ SnapshotFileCallback(DOMFileSystem* filesystem, const String& name, const KURL& url, PassOwnPtr<FileCallback> successCallback, PassOwnPtr<ErrorCallback> errorCallback, ExecutionContext* context) |
+ : FileSystemCallbacksBase(errorCallback, filesystem, context) |
, m_name(name) |
, m_url(url) |
, m_successCallback(successCallback) |