Replace EntryArraySync type by an EntrySync[]

Source/modules/filesystem/SyncCallbackHelper.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
@@ skipping 15 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SyncCallbackHelper_h
 #define SyncCallbackHelper_h
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/fileapi/FileError.h"
 #include "core/html/VoidCallback.h"
 #include "modules/filesystem/DirectoryEntry.h"
+#include "modules/filesystem/DirectoryReaderSync.h"
 #include "modules/filesystem/EntriesCallback.h"
-#include "modules/filesystem/EntryArraySync.h"
 #include "modules/filesystem/EntryCallback.h"
+#include "modules/filesystem/EntrySync.h"
 #include "modules/filesystem/ErrorCallback.h"
 #include "modules/filesystem/FileEntry.h"
 #include "modules/filesystem/FileSystemCallback.h"
 #include "modules/filesystem/MetadataCallback.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace WebCore {
 
-class AsyncFileSystem;
-class DirectoryEntrySync;
-class EntryArraySync;
-class EntrySync;
-class FileEntrySync;
+template <typename ResultType, typename CallbackArg>
+struct HelperResultType {

[kinuko, 2013/08/09 02:15:54]

nit: these helper classes can be in an anonymous namespace.

[do-not-use, 2013/08/09 06:39:21]

This would apparently be against coding style:
"Source/modules/filesystem/SyncCallbackHelper.h:52:  Do not use unnamed
namespaces in header files.  See
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces for
more information."

+    typedef PassRefPtr<ResultType> ReturnType;
+    typedef RefPtr<ResultType> StorageType;
+
+    static ReturnType createFromCallbackArg(CallbackArg argument)
+    {
+        return ResultType::create(argument);
+    }
+};
+
+template <>
+struct HelperResultType<EntrySyncVector, const EntryVector&> {
+    typedef EntrySyncVector ReturnType;
+    typedef EntrySyncVector StorageType;
+
+    static EntrySyncVector createFromCallbackArg(const EntryVector& entries)
+    {
+        EntrySyncVector result;
+        size_t entryCount = entries.size();
+        result.reserveInitialCapacity(entryCount);
+        for (size_t i = 0; i < entryCount; ++i)
+            result.uncheckedAppend(EntrySync::create(entries[i].get()));
+        return result;
+    }
+};
 
 // A helper template for FileSystemSync implementation.
 template <typename SuccessCallback, typename ObserverType, typename CallbackArg, typename ResultType>
 class SyncCallbackHelper {
     WTF_MAKE_NONCOPYABLE(SyncCallbackHelper);
 public:
     typedef SyncCallbackHelper<SuccessCallback, ObserverType, CallbackArg, ResultType> HelperType;
+    typedef HelperResultType<ResultType, CallbackArg> ResultTypeTrait;
+    typedef typename ResultTypeTrait::StorageType ResultStorageType;
+    typedef typename ResultTypeTrait::ReturnType ResultReturnType;
+
     SyncCallbackHelper(ObserverType* observer = 0)
         : m_observer(observer)
         , m_successCallback(SuccessCallbackImpl::create(this))
         , m_errorCallback(ErrorCallbackImpl::create(this))
         , m_errorCode(FileError::OK)
         , m_completed(false)
     {
     }
 
-    PassRefPtr<ResultType> getResult(ExceptionState& es)
+    ResultReturnType getResult(ExceptionState& es)
     {
         if (m_observer) {
             while (!m_completed) {
                 if (!m_observer->waitForOperationToComplete()) {
                     m_errorCode = FileError::ABORT_ERR;
                     break;
                 }
             }
         }
         if (m_errorCode)
             FileError::throwDOMException(es, m_errorCode);
 
-        return m_result.release();
+        return m_result;
     }
 
     PassRefPtr<SuccessCallback> successCallback() { return m_successCallback; }
     PassRefPtr<ErrorCallback> errorCallback() { return m_errorCallback; }
 
 private:
     class SuccessCallbackImpl : public SuccessCallback {
     public:
         static PassRefPtr<SuccessCallbackImpl> create(HelperType* helper)
         {
             return adoptRef(new SuccessCallbackImpl(helper));
         }
 
         virtual bool handleEvent()
         {
             m_helper->setError(FileError::OK);
             return true;
         }
 
         virtual bool handleEvent(CallbackArg arg)
         {
-            m_helper->setResult(ResultType::create(arg));
+            m_helper->setResult(arg);
             return true;
         }
 
     private:
         explicit SuccessCallbackImpl(HelperType* helper)
             : m_helper(helper)
         {
         }
         HelperType* m_helper;
     };
@@ skipping 22 matching lines @@
 
     friend class SuccessCallbackImpl;
     friend class ErrorCallbackImpl;
 
     void setError(FileError::ErrorCode code)
     {
         m_errorCode = code;
         m_completed = true;
     }
 
-    void setResult(PassRefPtr<ResultType> result)
+    void setResult(CallbackArg result)
     {
-        m_result = result;
+        m_result = ResultTypeTrait::createFromCallbackArg(result);
         m_completed = true;
     }
 
     ObserverType* m_observer;
     RefPtr<SuccessCallbackImpl> m_successCallback;
     RefPtr<ErrorCallbackImpl> m_errorCallback;
-    RefPtr<ResultType> m_result;
+    ResultStorageType m_result;
     FileError::ErrorCode m_errorCode;
     bool m_completed;
 };
 
 struct EmptyType : public RefCounted<EmptyType> {
     static PassRefPtr<EmptyType> create(EmptyType*)
     {
         return 0;
     }
 };
 
 struct EmptyObserverType {
     bool waitForOperationToComplete()
     {
         return false;
     }
 };
 
 typedef SyncCallbackHelper<EntryCallback, AsyncFileSystem, Entry*, EntrySync> EntrySyncCallbackHelper;
-typedef SyncCallbackHelper<EntriesCallback, AsyncFileSystem, const EntryVector&, EntryArraySync> EntriesSyncCallbackHelper;
+typedef SyncCallbackHelper<EntriesCallback, AsyncFileSystem, const EntryVector&, EntrySyncVector> EntriesSyncCallbackHelper;
 typedef SyncCallbackHelper<MetadataCallback, AsyncFileSystem, Metadata*, Metadata> MetadataSyncCallbackHelper;
 typedef SyncCallbackHelper<VoidCallback, AsyncFileSystem, EmptyType*, EmptyType> VoidSyncCallbackHelper;
 typedef SyncCallbackHelper<FileSystemCallback, EmptyObserverType, DOMFileSystem*, DOMFileSystemSync> FileSystemSyncCallbackHelper;
 
 } // namespace WebCore
 
 #endif // SyncCallbackHelper_h