Chromium Code Reviews| Index: Source/modules/filesystem/SyncCallbackHelper.h |
| diff --git a/Source/modules/filesystem/SyncCallbackHelper.h b/Source/modules/filesystem/SyncCallbackHelper.h |
| index 13518fdc333a7575f44188cf8c07eb233dacc5cc..5478d219d73955ee4d30dc32c3a3c4047b9180f1 100644 |
| --- a/Source/modules/filesystem/SyncCallbackHelper.h |
| +++ b/Source/modules/filesystem/SyncCallbackHelper.h |
| @@ -35,6 +35,7 @@ |
| #include "bindings/v8/ExceptionState.h" |
| #include "core/fileapi/FileError.h" |
| #include "core/html/VoidCallback.h" |
| +#include "heap/Handle.h" |
| #include "modules/filesystem/DirectoryEntry.h" |
| #include "modules/filesystem/DirectoryReaderSync.h" |
| #include "modules/filesystem/EntriesCallback.h" |
| @@ -51,8 +52,8 @@ namespace WebCore { |
| template <typename ResultType, typename CallbackArg> |
| struct HelperResultType { |
| - typedef PassRefPtr<ResultType> ReturnType; |
| - typedef RefPtr<ResultType> StorageType; |
| + typedef PassRefPtrWillBeRawPtr<ResultType> ReturnType; |
|
haraken
2014/03/07 08:24:35
This is used by only one place. Shall we avoid usi
sof
2014/03/07 09:37:36
It is used later by derived classes to gain access
|
| + typedef RefPtrWillBeRawPtr<ResultType> StorageType; |
|
haraken
2014/03/07 08:24:35
This is unused. Shall we remove?
sof
2014/03/07 09:37:36
Same, elsewhere used.
|
| static ReturnType createFromCallbackArg(CallbackArg argument) |
| { |
| @@ -80,6 +81,7 @@ struct HelperResultType<EntrySyncVector, const EntryVector&> { |
| template <typename SuccessCallback, typename CallbackArg, typename ResultType> |
| class SyncCallbackHelper { |
| WTF_MAKE_NONCOPYABLE(SyncCallbackHelper); |
| + STACK_ALLOCATED(); |
| public: |
| typedef SyncCallbackHelper<SuccessCallback, CallbackArg, ResultType> HelperType; |
| typedef HelperResultType<ResultType, CallbackArg> ResultTypeTrait; |
| @@ -168,7 +170,7 @@ private: |
| }; |
| struct EmptyType : public RefCounted<EmptyType> { |
| - static PassRefPtr<EmptyType> create(EmptyType*) |
| + static PassRefPtrWillBeRawPtr<EmptyType> create(EmptyType*) |
| { |
| return nullptr; |
| } |