Oilpan: Enable oilpan for callback classes

Source/modules/filesystem/DirectoryReader.cpp

 /*
  * Copyright (C) 2010 Google Inc. 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
@@ skipping 39 matching lines @@
         m_reader->addEntries(entries);
     }
 
     virtual void trace(Visitor* visitor) OVERRIDE
     {
         visitor->trace(m_reader);
         EntriesCallback::trace(visitor);
     }
 
 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 {
 public:
     explicit ErrorCallbackHelper(DirectoryReader* reader)
         : m_reader(reader)
     {
     }
 
     virtual void handleEvent(FileError* error) OVERRIDE
     {
         m_reader->onError(error);
     }
 
     virtual void trace(Visitor* visitor) OVERRIDE
     {
         visitor->trace(m_reader);
         ErrorCallback::trace(visitor);
     }
 
 private:
-    PersistentWillBeMember<DirectoryReader> m_reader;
+    Member<DirectoryReader> m_reader;
 };
 
 DirectoryReader::DirectoryReader(DOMFileSystemBase* fileSystem, const String& fullPath)
     : DirectoryReaderBase(fileSystem, fullPath)
     , m_isReading(false)
 {
 }
 
 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) {
         filesystem()->scheduleCallback(errorCallback, PassRefPtrWillBeRawPtr<FileError>(m_error.get()));
         return;
     }
 
     if (m_entriesCallback) {
         // Non-null m_entriesCallback means multiple readEntries() calls are made concurrently. We don't allow doing it.
         filesystem()->scheduleCallback(errorCallback, FileError::create(FileError::INVALID_STATE_ERR));
         return;
     }
 
     if (!m_hasMoreEntries || !m_entries.isEmpty()) {
         filesystem()->scheduleCallback(entriesCallback, m_entries);
         m_entries.clear();
         return;
     }
 
     m_entriesCallback = entriesCallback;
     m_errorCallback = errorCallback;
 }
 
 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);
     }
 }
 
 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);
     }
 }
 
 void DirectoryReader::trace(Visitor* visitor)
 {
     visitor->trace(m_entries);
     visitor->trace(m_error);
     visitor->trace(m_entriesCallback);
     visitor->trace(m_errorCallback);
     DirectoryReaderBase::trace(visitor);
 }
 
 }