Make WebFileSystemCallbacks not self-destruct, deprecate AsyncFileSystem

Source/modules/filesystem/DOMFileSystem.h

 /*
  * 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 29 matching lines @@
 namespace WebCore {
 
 class DirectoryEntry;
 class File;
 class FileCallback;
 class FileEntry;
 class FileWriterCallback;
 
 class DOMFileSystem : public DOMFileSystemBase, public ScriptWrappable, public ActiveDOMObject {
 public:
-    static PassRefPtr<DOMFileSystem> create(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL, PassOwnPtr<AsyncFileSystem>);
+    static PassRefPtr<DOMFileSystem> create(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL);
 
     // Creates a new isolated file system for the given filesystemId.
     static PassRefPtr<DOMFileSystem> createIsolatedFileSystem(ScriptExecutionContext*, const String& filesystemId);
 
     PassRefPtr<DirectoryEntry> root();
 
-    // ActiveDOMObject methods.
-    virtual void stop();
-    virtual bool hasPendingActivity() const;
-    virtual void contextDestroyed();
+    // DOMFileSystemBase overrides.
+    virtual void addPendingCallbacks() OVERRIDE;
+    virtual void removePendingCallbacks() OVERRIDE;
+
+    // ActiveDOMObject overrides.
+    virtual bool hasPendingActivity() const OVERRIDE;
 
     void createWriter(const FileEntry*, PassRefPtr<FileWriterCallback>, PassRefPtr<ErrorCallback>);
     void createFile(const FileEntry*, PassRefPtr<FileCallback>, PassRefPtr<ErrorCallback>);
 
     // Schedule a callback. This should not cross threads (should be called on the same context thread).
     // FIXME: move this to a more generic place.
     template <typename CB, typename CBArg>
     static void scheduleCallback(ScriptExecutionContext*, PassRefPtr<CB>, PassRefPtr<CBArg>);
 
     template <typename CB, typename CBArg>
     static void scheduleCallback(ScriptExecutionContext*, PassRefPtr<CB>, const CBArg&);
 
     template <typename CB, typename CBArg>
     void scheduleCallback(PassRefPtr<CB> callback, PassRefPtr<CBArg> callbackArg)
     {
         scheduleCallback(scriptExecutionContext(), callback, callbackArg);
     }
 
     template <typename CB, typename CBArg>
     void scheduleCallback(PassRefPtr<CB> callback,  const CBArg& callbackArg)
     {
         scheduleCallback(scriptExecutionContext(), callback, callbackArg);
     }
 
 private:
-    DOMFileSystem(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL, PassOwnPtr<AsyncFileSystem>);
+    DOMFileSystem(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL);
 
     // A helper template to schedule a callback task.
     template <typename CB, typename CBArg>
     class DispatchCallbacRefPtrArgTask : public ScriptExecutionContext::Task {
     public:
         DispatchCallbacRefPtrArgTask(PassRefPtr<CB> callback, PassRefPtr<CBArg> arg)
             : m_callback(callback)
             , m_callbackArg(arg)
         {
         }
@@ skipping 19 matching lines @@
 
         virtual void performTask(ScriptExecutionContext*)
         {
             m_callback->handleEvent(m_callbackArg);
         }
 
     private:
         RefPtr<CB> m_callback;
         CBArg m_callbackArg;
     };
+
+    int m_pendingCallbacks;
 };
 
 template <typename CB, typename CBArg>
 void DOMFileSystem::scheduleCallback(ScriptExecutionContext* scriptExecutionContext, PassRefPtr<CB> callback, PassRefPtr<CBArg> arg)
 {
     ASSERT(scriptExecutionContext->isContextThread());
     if (callback)
         scriptExecutionContext->postTask(adoptPtr(new DispatchCallbacRefPtrArgTask<CB, CBArg>(callback, arg)));
 }
 
 template <typename CB, typename CBArg>
 void DOMFileSystem::scheduleCallback(ScriptExecutionContext* scriptExecutionContext, PassRefPtr<CB> callback, const CBArg& arg)
 {
     ASSERT(scriptExecutionContext->isContextThread());
     if (callback)
         scriptExecutionContext->postTask(adoptPtr(new DispatchCallbackNonPtrArgTask<CB, CBArg>(callback, arg)));
 }
 
 } // namespace
 
 #endif // DOMFileSystem_h