Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / filesystem / DirectoryReader.h

diff --git a/src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.h b/src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.h
index 9a8f838..0e882ce 100644 (file)
--- a/src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.h
+++ b/src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.h
@@ -31,52 +31,50 @@
 #ifndef DirectoryReader_h
 #define DirectoryReader_h
 
-#include "bindings/v8/ScriptWrappable.h"
+#include "bindings/core/v8/ScriptWrappable.h"
 #include "modules/filesystem/DOMFileSystem.h"
 #include "modules/filesystem/DirectoryReaderBase.h"
+#include "modules/filesystem/EntriesCallback.h"
 #include "platform/heap/Handle.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
+namespace blink {
 
-class EntriesCallback;
-class EntriesCallbacks;
 class ErrorCallback;
 
 class DirectoryReader : public DirectoryReaderBase, public ScriptWrappable {
+    DEFINE_WRAPPERTYPEINFO();
 public:
-    static PassRefPtrWillBeRawPtr<DirectoryReader> create(PassRefPtrWillBeRawPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
+    static DirectoryReader* create(DOMFileSystemBase* fileSystem, const String& fullPath)
     {
-        return adoptRefWillBeNoop(new DirectoryReader(fileSystem, fullPath));
+        return new DirectoryReader(fileSystem, fullPath);
     }
 
     virtual ~DirectoryReader();
 
-    void readEntries(PassOwnPtr<EntriesCallback>, PassOwnPtr<ErrorCallback> = nullptr);
+    void readEntries(EntriesCallback*, ErrorCallback* = nullptr);
 
     DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fileSystem.get()); }
 
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
 private:
     class EntriesCallbackHelper;
     class ErrorCallbackHelper;
 
-    DirectoryReader(PassRefPtrWillBeRawPtr<DOMFileSystemBase>, const String& fullPath);
+    DirectoryReader(DOMFileSystemBase*, const String& fullPath);
 
-    void addEntries(const WillBeHeapVector<RefPtrWillBeMember<Entry> >& entries);
+    void addEntries(const EntryHeapVector& entries);
 
     void onError(FileError*);
 
     bool m_isReading;
-    WillBeHeapVector<RefPtrWillBeMember<Entry> > m_entries;
-    RefPtrWillBeMember<FileError> m_error;
-    OwnPtr<EntriesCallback> m_entriesCallback;
-    OwnPtr<ErrorCallback> m_errorCallback;
+    EntryHeapVector m_entries;
+    Member<FileError> m_error;
+    Member<EntriesCallback> m_entriesCallback;
+    Member<ErrorCallback> m_errorCallback;
 };
 
-}
+} // namespace blink
 
 #endif // DirectoryReader_h