Move LocalFileSystem to hang off LocalFrame instead of Page.

Source/modules/filesystem/LocalFileSystem.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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef LocalFileSystem_h
 #define LocalFileSystem_h
 
-#include "core/page/Page.h"
 #include "core/workers/WorkerClients.h"
 #include "platform/FileSystemType.h"
 #include "wtf/Forward.h"
 #include "wtf/Functional.h"
 
 namespace WebCore {
 
 class AsyncFileSystemCallbacks;
 class CallbackWrapper;
 class FileSystemClient;
 class ExecutionContext;
+class KURL;
+class LocalFrame;
 
-class LocalFileSystem FINAL : public NoBaseWillBeGarbageCollectedFinalized<LocalFileSystem>, public WillBeHeapSupplement<Page>, public WillBeHeapSupplement<WorkerClients> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFileSystem);
+class LocalFileSystem FINAL : public Supplement<LocalFrame>, public Supplement<WorkerClients> {

[haraken, 2014/06/07 02:33:16]

Ian (or oilpan experts): WorkerClients is already on-heap. Is it safe for an
off-heap object (i.e., LocalFileSystem) to derive WorkerClients as
Supplement<WorkerClients>, not HeapSupplement<WorkerClients> ? In my
understanding, if WorkerClients is on-heap, all supplementing objects need to be
on-heap.

If my understanding is correct, it's tricky to make this CL workable, because
LocalFileSystem supplements both LocalFrame (off-heap) and WorkerClients
(on-heap). Probably do we need to move LocalFrame to the heap so that we can
make LocalFileSystem on-heap?

     WTF_MAKE_NONCOPYABLE(LocalFileSystem);
 public:
-    static PassOwnPtrWillBeRawPtr<LocalFileSystem> create(PassOwnPtr<FileSystemClient>);
+    static PassOwnPtr<LocalFileSystem> create(PassOwnPtr<FileSystemClient>);
     virtual ~LocalFileSystem();
 
     void resolveURL(ExecutionContext*, const KURL&, PassOwnPtr<AsyncFileSystemCallbacks>);
     void requestFileSystem(ExecutionContext*, FileSystemType, long long size, PassOwnPtr<AsyncFileSystemCallbacks>);
     void deleteFileSystem(ExecutionContext*, FileSystemType, PassOwnPtr<AsyncFileSystemCallbacks>);
 
     FileSystemClient* client() { return m_client.get(); }
 
     static const char* supplementName();
     static LocalFileSystem* from(ExecutionContext&);
 
     virtual void trace(Visitor* visitor) OVERRIDE
     {
-        WillBeHeapSupplement<Page>::trace(visitor);
+        WillBeHeapSupplement<LocalFrame>::trace(visitor);

[sof, 2014/06/06 20:32:41]

s/WillBeHeapSupplement/Supplement/

         WillBeHeapSupplement<WorkerClients>::trace(visitor);

[sof, 2014/06/06 20:32:41]

s/WillBeHeapSupplement/Supplement/

     }
 
 protected:
     explicit LocalFileSystem(PassOwnPtr<FileSystemClient>);
 
 private:
     void requestFileSystemAccessInternal(ExecutionContext*, const Closure& allowed, const Closure& denied);
     void fileSystemNotAllowedInternal(PassRefPtr<ExecutionContext>, PassRefPtr<CallbackWrapper>);
     void fileSystemAllowedInternal(PassRefPtr<ExecutionContext>, FileSystemType, PassRefPtr<CallbackWrapper>);
     void resolveURLInternal(const KURL&, PassRefPtr<CallbackWrapper>);
     void deleteFileSystemInternal(PassRefPtr<ExecutionContext>, FileSystemType, PassRefPtr<CallbackWrapper>);
     OwnPtr<FileSystemClient> m_client;
 };
 
 } // namespace WebCore
 
 #endif // LocalFileSystem_h