Oilpan: Move the EventListener hierarchy to Oilpan's heap

Source/modules/filesystem/InspectorFileSystemAgent.cpp

 /*
  * Copyright (C) 2011, 2012 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 68 matching lines @@
 static const char fileSystemAgentEnabled[] = "fileSystemAgentEnabled";
 }
 
 namespace {
 
 template<typename BaseCallback, typename Handler, typename Argument>
 class CallbackDispatcher final : public BaseCallback {
 public:
     typedef bool (Handler::*HandlingMethod)(Argument);
 
-    static CallbackDispatcher* create(PassRefPtr<Handler> handler, HandlingMethod handlingMethod)
+    static CallbackDispatcher* create(PassRefPtrWillBeRawPtr<Handler> handler, HandlingMethod handlingMethod)
     {
         return new CallbackDispatcher(handler, handlingMethod);
     }
 
     void handleEvent(Argument argument) override
     {
         (m_handler.get()->*m_handlingMethod)(argument);
     }
 
+    typedef int HasInlinedTraceMethodMarker;
+    GC_PLUGIN_IGNORE("")

[haraken, 2015/07/17 02:44:28]

Hmm, this doesn't work either. I don't know how we can suppress the GC plugin
error.

+    virtual void trace(Visitor* visitor)
+    {
+        visitor->trace(m_handler);
+        BaseCallback::trace(visitor);
+    }
+    GC_PLUGIN_IGNORE("")
+    virtual void trace(InlinedGlobalMarkingVisitor visitor)
+    {
+        visitor->trace(m_handler);
+        BaseCallback::trace(visitor);
+    }
+
 private:
-    CallbackDispatcher(PassRefPtr<Handler> handler, HandlingMethod handlingMethod)
+    CallbackDispatcher(PassRefPtrWillBeRawPtr<Handler> handler, HandlingMethod handlingMethod)
         : m_handler(handler)
         , m_handlingMethod(handlingMethod) { }
 
-    RefPtr<Handler> m_handler;
+    RefPtrWillBeMember<Handler> m_handler;
     HandlingMethod m_handlingMethod;
 };
 
 template<typename BaseCallback>
 class CallbackDispatcherFactory {
 public:
     template<typename Handler, typename Argument>
     static CallbackDispatcher<BaseCallback, Handler, Argument>* create(Handler* handler, bool (Handler::*handlingMethod)(Argument))
     {
-        return CallbackDispatcher<BaseCallback, Handler, Argument>::create(PassRefPtr<Handler>(handler), handlingMethod);
+        return CallbackDispatcher<BaseCallback, Handler, Argument>::create(PassRefPtrWillBeRawPtr<Handler>(handler), handlingMethod);
     }
 };
 
-class FileSystemRootRequest : public RefCounted<FileSystemRootRequest> {
+class FileSystemRootRequest final : public RefCountedWillBeGarbageCollectedFinalized<FileSystemRootRequest> {
     WTF_MAKE_NONCOPYABLE(FileSystemRootRequest);
 public:
-    static PassRefPtr<FileSystemRootRequest> create(PassRefPtrWillBeRawPtr<RequestFileSystemRootCallback> requestCallback, const String& type)
+    static PassRefPtrWillBeRawPtr<FileSystemRootRequest> create(PassRefPtrWillBeRawPtr<RequestFileSystemRootCallback> requestCallback, const String& type)
     {
-        return adoptRef(new FileSystemRootRequest(requestCallback, type));
+        return adoptRefWillBeNoop(new FileSystemRootRequest(requestCallback, type));
     }
 
     void start(ExecutionContext*);
 
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_requestCallback);
+    }
+
 private:
     bool didHitError(FileError* error)
     {
         reportResult(error->code());
         return true;
     }
 
     bool didGetEntry(Entry*);
 
     void reportResult(FileError::ErrorCode errorCode, PassRefPtr<TypeBuilder::FileSystem::Entry> entry = nullptr)
     {
         m_requestCallback->sendSuccess(static_cast<int>(errorCode), entry);
     }
 
     FileSystemRootRequest(PassRefPtrWillBeRawPtr<RequestFileSystemRootCallback> requestCallback, const String& type)
         : m_requestCallback(requestCallback)
         , m_type(type) { }
 
-    RefPtrWillBePersistent<RequestFileSystemRootCallback> m_requestCallback;
+    RefPtrWillBeMember<RequestFileSystemRootCallback> m_requestCallback;
     String m_type;
 };
 
 void FileSystemRootRequest::start(ExecutionContext* executionContext)
 {
     ASSERT(executionContext);
 
     ErrorCallback* errorCallback = CallbackDispatcherFactory<ErrorCallback>::create(this, &FileSystemRootRequest::didHitError);
 
     FileSystemType type;
@@ skipping 16 matching lines @@
 bool FileSystemRootRequest::didGetEntry(Entry* entry)
 {
     RefPtr<TypeBuilder::FileSystem::Entry> result = TypeBuilder::FileSystem::Entry::create()
         .setUrl(entry->toURL())
         .setName("/")
         .setIsDirectory(true);
     reportResult(static_cast<FileError::ErrorCode>(0), result);
     return true;
 }
 
-class DirectoryContentRequest final : public RefCounted<DirectoryContentRequest> {
+class DirectoryContentRequest final : public RefCountedWillBeGarbageCollectedFinalized<DirectoryContentRequest> {
     WTF_MAKE_NONCOPYABLE(DirectoryContentRequest);
 public:
-    static PassRefPtr<DirectoryContentRequest> create(PassRefPtrWillBeRawPtr<RequestDirectoryContentCallback> requestCallback, const String& url)
+    static PassRefPtrWillBeRawPtr<DirectoryContentRequest> create(PassRefPtrWillBeRawPtr<RequestDirectoryContentCallback> requestCallback, const String& url)
     {
-        return adoptRef(new DirectoryContentRequest(requestCallback, url));
+        return adoptRefWillBeNoop(new DirectoryContentRequest(requestCallback, url));
     }
 
     ~DirectoryContentRequest()
     {
         reportResult(FileError::ABORT_ERR);

[haraken, 2015/07/17 07:49:37]

kinuko@: Currently we're reporting FileError::ABORT_ERR every time the
DirectoryContentRequest object gets destructed (even if the request has
completed successfully). Is this an expected behavior?

If we need to keep reporting FileError::ABORT_ERR in DirectoryContentRequest's
destructor, we can do that in the oilpan world as well. But if we can remove it,
that is easier.

     }
 
     void start(ExecutionContext*);
 
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_requestCallback);
+        visitor->trace(m_directoryReader);
+    }
+
 private:
     bool didHitError(FileError* error)
     {
         reportResult(error->code());
         return true;
     }
 
     bool didGetEntry(Entry*);
     bool didReadDirectoryEntries(const EntryHeapVector&);
 
     void reportResult(FileError::ErrorCode errorCode, PassRefPtr<Array<TypeBuilder::FileSystem::Entry>> entries = nullptr)
     {
         m_requestCallback->sendSuccess(static_cast<int>(errorCode), entries);
     }
 
     DirectoryContentRequest(PassRefPtrWillBeRawPtr<RequestDirectoryContentCallback> requestCallback, const String& url)
         : m_requestCallback(requestCallback)
         , m_url(ParsedURLString, url) { }
 
     void readDirectoryEntries();
 
-    RefPtrWillBePersistent<RequestDirectoryContentCallback> m_requestCallback;
+    RefPtrWillBeMember<RequestDirectoryContentCallback> m_requestCallback;
     KURL m_url;
     RefPtr<Array<TypeBuilder::FileSystem::Entry>> m_entries;
-    Persistent<DirectoryReader> m_directoryReader;
+    PersistentWillBeMember<DirectoryReader> m_directoryReader;
 };
 
 void DirectoryContentRequest::start(ExecutionContext* executionContext)
 {
     ASSERT(executionContext);
 
     ErrorCallback* errorCallback = CallbackDispatcherFactory<ErrorCallback>::create(this, &DirectoryContentRequest::didHitError);
     EntryCallback* successCallback = CallbackDispatcherFactory<EntryCallback>::create(this, &DirectoryContentRequest::didGetEntry);
 
     OwnPtr<AsyncFileSystemCallbacks> fileSystemCallbacks = ResolveURICallbacks::create(successCallback, errorCallback, executionContext);
@@ skipping 61 matching lines @@
             entryForFrontend->setMimeType(mimeType);
             entryForFrontend->setResourceType(resourceType);
         }
 
         m_entries->addItem(entryForFrontend);
     }
     readDirectoryEntries();
     return true;
 }
 
-class MetadataRequest final : public RefCounted<MetadataRequest> {
+class MetadataRequest final : public RefCountedWillBeGarbageCollectedFinalized<MetadataRequest> {
     WTF_MAKE_NONCOPYABLE(MetadataRequest);
 public:
-    static PassRefPtr<MetadataRequest> create(PassRefPtrWillBeRawPtr<RequestMetadataCallback> requestCallback, const String& url)
+    static PassRefPtrWillBeRawPtr<MetadataRequest> create(PassRefPtrWillBeRawPtr<RequestMetadataCallback> requestCallback, const String& url)
     {
-        return adoptRef(new MetadataRequest(requestCallback, url));
+        return adoptRefWillBeNoop(new MetadataRequest(requestCallback, url));
     }
 
     ~MetadataRequest()
     {
         reportResult(FileError::ABORT_ERR);
     }
 
     void start(ExecutionContext*);
 
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_requestCallback);
+    }
+
 private:
     bool didHitError(FileError* error)
     {
         reportResult(error->code());
         return true;
     }
 
     bool didGetEntry(Entry*);
     bool didGetMetadata(Metadata*);
 
     void reportResult(FileError::ErrorCode errorCode, PassRefPtr<TypeBuilder::FileSystem::Metadata> metadata = nullptr)
     {
         m_requestCallback->sendSuccess(static_cast<int>(errorCode), metadata);
     }
 
     MetadataRequest(PassRefPtrWillBeRawPtr<RequestMetadataCallback> requestCallback, const String& url)
         : m_requestCallback(requestCallback)
         , m_url(ParsedURLString, url) { }
 
-    RefPtrWillBePersistent<RequestMetadataCallback> m_requestCallback;
+    RefPtrWillBeMember<RequestMetadataCallback> m_requestCallback;
     KURL m_url;
     bool m_isDirectory;
 };
 
 void MetadataRequest::start(ExecutionContext* executionContext)
 {
     ASSERT(executionContext);
 
     ErrorCallback* errorCallback = CallbackDispatcherFactory<ErrorCallback>::create(this, &MetadataRequest::didHitError);
     EntryCallback* successCallback = CallbackDispatcherFactory<EntryCallback>::create(this, &MetadataRequest::didGetEntry);
@@ skipping 21 matching lines @@
     RefPtr<Metadata> result = Metadata::create()
         .setModificationTime(metadata->modificationTime())
         .setSize(metadata->size());
     reportResult(static_cast<FileError::ErrorCode>(0), result);
     return true;
 }
 
 class FileContentRequest final : public EventListener {
     WTF_MAKE_NONCOPYABLE(FileContentRequest);
 public:
-    static PassRefPtr<FileContentRequest> create(PassRefPtrWillBeRawPtr<RequestFileContentCallback> requestCallback, const String& url, bool readAsText, long long start, long long end, const String& charset)
+    static PassRefPtrWillBeRawPtr<FileContentRequest> create(PassRefPtrWillBeRawPtr<RequestFileContentCallback> requestCallback, const String& url, bool readAsText, long long start, long long end, const String& charset)
     {
-        return adoptRef(new FileContentRequest(requestCallback, url, readAsText, start, end, charset));
+        return adoptRefWillBeNoop(new FileContentRequest(requestCallback, url, readAsText, start, end, charset));
     }
 
     ~FileContentRequest() override
     {
         reportResult(FileError::ABORT_ERR);
     }
 
     void start(ExecutionContext*);
 
     bool operator==(const EventListener& other) override
     {
         return this == &other;
     }
 
     void handleEvent(ExecutionContext*, Event* event) override
     {
         if (event->type() == EventTypeNames::load)
             didRead();
         else if (event->type() == EventTypeNames::error)
             didHitError(m_reader->error());
     }
 
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        visitor->trace(m_requestCallback);
+        visitor->trace(m_reader);
+        EventListener::trace(visitor);
+    }
+
 private:
     bool didHitError(FileError* error)
     {
         reportResult(error->code());
         return true;
     }
 
     bool didGetEntry(Entry*);
     bool didGetFile(File*);
     void didRead();
 
     void reportResult(FileError::ErrorCode errorCode, const String* result = 0, const String* charset = 0)
     {
         m_requestCallback->sendSuccess(static_cast<int>(errorCode), result, charset);
     }
 
     FileContentRequest(PassRefPtrWillBeRawPtr<RequestFileContentCallback> requestCallback, const String& url, bool readAsText, long long start, long long end, const String& charset)
         : EventListener(EventListener::CPPEventListenerType)
         , m_requestCallback(requestCallback)
         , m_url(ParsedURLString, url)
         , m_readAsText(readAsText)
         , m_start(start)
         , m_end(end)
         , m_charset(charset) { }
 
-    RefPtrWillBePersistent<RequestFileContentCallback> m_requestCallback;
+    RefPtrWillBeMember<RequestFileContentCallback> m_requestCallback;
     KURL m_url;
     bool m_readAsText;
     int m_start;
     long long m_end;
     String m_mimeType;
     String m_charset;
 
-    Persistent<FileReader> m_reader;
+    PersistentWillBeMember<FileReader> m_reader;
 };
 
 void FileContentRequest::start(ExecutionContext* executionContext)
 {
     ASSERT(executionContext);
 
     ErrorCallback* errorCallback = CallbackDispatcherFactory<ErrorCallback>::create(this, &FileContentRequest::didHitError);
     EntryCallback* successCallback = CallbackDispatcherFactory<EntryCallback>::create(this, &FileContentRequest::didGetEntry);
 
     OwnPtr<AsyncFileSystemCallbacks> fileSystemCallbacks = ResolveURICallbacks::create(successCallback, errorCallback, executionContext);
@@ skipping 44 matching lines @@
         return;
     }
 
     OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create(m_mimeType, m_charset, true);
     String result = decoder->decode(static_cast<char*>(buffer->data()), buffer->byteLength());
     result = result + decoder->flush();
     m_charset = decoder->encoding().name();
     reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset);
 }
 
-class DeleteEntryRequest final : public RefCounted<DeleteEntryRequest> {
+class DeleteEntryRequest final : public RefCountedWillBeGarbageCollectedFinalized<DeleteEntryRequest> {
 public:
-    static PassRefPtr<DeleteEntryRequest> create(PassRefPtrWillBeRawPtr<DeleteEntryCallback> requestCallback, const KURL& url)
+    static PassRefPtrWillBeRawPtr<DeleteEntryRequest> create(PassRefPtrWillBeRawPtr<DeleteEntryCallback> requestCallback, const KURL& url)
     {
-        return adoptRef(new DeleteEntryRequest(requestCallback, url));
+        return adoptRefWillBeNoop(new DeleteEntryRequest(requestCallback, url));
     }
 
     ~DeleteEntryRequest()
     {
         reportResult(FileError::ABORT_ERR);
     }
 
     void start(ExecutionContext*);
 
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_requestCallback);
+    }
+
 private:
     // CallbackDispatcherFactory doesn't handle 0-arg handleEvent methods
     class VoidCallbackImpl final : public VoidCallback {
     public:
-        explicit VoidCallbackImpl(PassRefPtr<DeleteEntryRequest> handler)
+        explicit VoidCallbackImpl(PassRefPtrWillBeRawPtr<DeleteEntryRequest> handler)
             : m_handler(handler)
         {
         }
 
         void handleEvent() override
         {
             m_handler->didDeleteEntry();
         }
 
+        DEFINE_INLINE_VIRTUAL_TRACE()
+        {
+            visitor->trace(m_handler);
+            VoidCallback::trace(visitor);
+        }
+
     private:
-        RefPtr<DeleteEntryRequest> m_handler;
+        RefPtrWillBeMember<DeleteEntryRequest> m_handler;
     };
 
     bool didHitError(FileError* error)
     {
         reportResult(error->code());
         return true;
     }
 
     bool didGetEntry(Entry*);
     bool didDeleteEntry();
 
     void reportResult(FileError::ErrorCode errorCode)
     {
         m_requestCallback->sendSuccess(static_cast<int>(errorCode));
     }
 
     DeleteEntryRequest(PassRefPtrWillBeRawPtr<DeleteEntryCallback> requestCallback, const KURL& url)
         : m_requestCallback(requestCallback)
         , m_url(url) { }
 
-    RefPtrWillBePersistent<DeleteEntryCallback> m_requestCallback;
+    RefPtrWillBeMember<DeleteEntryCallback> m_requestCallback;
     KURL m_url;
 };
 
 void DeleteEntryRequest::start(ExecutionContext* executionContext)
 {
     ASSERT(executionContext);
 
     ErrorCallback* errorCallback = CallbackDispatcherFactory<ErrorCallback>::create(this, &DeleteEntryRequest::didHitError);
 
     FileSystemType type;
@@ skipping 161 matching lines @@
     return 0;
 }
 
 DEFINE_TRACE(InspectorFileSystemAgent)
 {
     visitor->trace(m_page);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink