Oilpan: Enable oilpan for callback classes

Source/modules/filesystem/DirectoryReader.cpp

Index: Source/modules/filesystem/DirectoryReader.cpp
diff --git a/Source/modules/filesystem/DirectoryReader.cpp b/Source/modules/filesystem/DirectoryReader.cpp
index 7aa73251c945b35d0801ddff8a95d5f6dd99568d..7516078e2b83ac840cd0a2ac0230f81bde22df4c 100644
--- a/Source/modules/filesystem/DirectoryReader.cpp
+++ b/Source/modules/filesystem/DirectoryReader.cpp
@@ -58,7 +58,7 @@ public:
 
 private:
     // FIXME: This Persistent keeps the reader alive until all of the readDirectory results are received. crbug.com/350285

[tkent, 2014/09/22 02:04:05]

Will this FIXME be resolved?

[keishi, 2014/09/22 05:44:01]

I don't think it is resolved, we still need this to keep the reader alive.
Changed comment from Persistent to Member.

-    PersistentWillBeMember<DirectoryReader> m_reader;
+    Member<DirectoryReader> m_reader;
 };
 
 class DirectoryReader::ErrorCallbackHelper FINAL : public ErrorCallback {
@@ -80,7 +80,7 @@ public:
     }
 
 private:
-    PersistentWillBeMember<DirectoryReader> m_reader;
+    Member<DirectoryReader> m_reader;
 };
 
 DirectoryReader::DirectoryReader(DOMFileSystemBase* fileSystem, const String& fullPath)
@@ -93,11 +93,11 @@ DirectoryReader::~DirectoryReader()
 {
 }
 
-void DirectoryReader::readEntries(PassOwnPtrWillBeRawPtr<EntriesCallback> entriesCallback, PassOwnPtrWillBeRawPtr<ErrorCallback> errorCallback)
+void DirectoryReader::readEntries(EntriesCallback* entriesCallback, ErrorCallback* errorCallback)
 {
     if (!m_isReading) {
         m_isReading = true;
-        filesystem()->readDirectory(this, m_fullPath, adoptPtrWillBeNoop(new EntriesCallbackHelper(this)), adoptPtrWillBeNoop(new ErrorCallbackHelper(this)));
+        filesystem()->readDirectory(this, m_fullPath, new EntriesCallbackHelper(this), new ErrorCallbackHelper(this));
     }
 
     if (m_error) {
@@ -126,7 +126,7 @@ void DirectoryReader::addEntries(const EntryHeapVector& entries)
     m_entries.appendVector(entries);
     m_errorCallback = nullptr;
     if (m_entriesCallback) {
-        OwnPtrWillBeRawPtr<EntriesCallback> entriesCallback = m_entriesCallback.release();
+        EntriesCallback* entriesCallback = m_entriesCallback.release();
         EntryHeapVector entries;
         entries.swap(m_entries);
         entriesCallback->handleEvent(entries);
@@ -138,7 +138,7 @@ void DirectoryReader::onError(FileError* error)
     m_error = error;
     m_entriesCallback = nullptr;
     if (m_errorCallback) {
-        OwnPtrWillBeRawPtr<ErrorCallback> errorCallback = m_errorCallback.release();
+        ErrorCallback* errorCallback = m_errorCallback;

[tkent, 2014/09/22 02:04:05]

Are you sure we don't need .release()?

[keishi, 2014/09/22 05:44:01]

Added back.

         errorCallback->handleEvent(error);
     }
 }