Index: Source/modules/filesystem/SyncCallbackHelper.h |
diff --git a/Source/modules/filesystem/SyncCallbackHelper.h b/Source/modules/filesystem/SyncCallbackHelper.h |
index 4edb746050151409db1ab72d6f774be01034b5ea..76b8ae31951d7b7b955fd75e4f93acfbf7f1dd91 100644 |
--- a/Source/modules/filesystem/SyncCallbackHelper.h |
+++ b/Source/modules/filesystem/SyncCallbackHelper.h |
@@ -53,8 +53,8 @@ template <typename ResultType, typename CallbackArg> |
struct HelperResultType { |
DISALLOW_ALLOCATION(); |
public: |
- typedef PassRefPtrWillBeRawPtr<ResultType> ReturnType; |
- typedef RefPtrWillBePersistent<ResultType> StorageType; |
+ typedef ResultType* ReturnType; |
+ typedef Persistent<ResultType> StorageType; |
static ReturnType createFromCallbackArg(CallbackArg argument) |
{ |
@@ -157,10 +157,10 @@ private: |
bool m_completed; |
}; |
-struct EmptyType : public RefCountedWillBeGarbageCollected<EmptyType> { |
- static PassRefPtrWillBeRawPtr<EmptyType> create(EmptyType*) |
+struct EmptyType : public GarbageCollected<EmptyType> { |
+ static EmptyType* create(EmptyType*) |
{ |
- return nullptr; |
+ return 0; |
} |
void trace(Visitor*) { } |