Move LocalFileSystem to hang off LocalFrame instead of Page.

Source/modules/filesystem/LocalFileSystem.cpp

 /*
  * Copyright (C) 2013 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 18 matching lines @@
  */
 
 #include "config.h"
 #include "modules/filesystem/LocalFileSystem.h"
 
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fileapi/FileError.h"
-#include "core/inspector/InspectorController.h"
+#include "core/frame/LocalFrame.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/filesystem/FileSystemClient.h"
-#include "modules/filesystem/InspectorFileSystemAgent.h"
 #include "platform/AsyncFileSystemCallbacks.h"
 #include "platform/PermissionCallbacks.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFileSystem.h"
 #include "wtf/Functional.h"
 #include "wtf/RefCounted.h"
 
 namespace WebCore {
 
 namespace {
@@ skipping 14 matching lines @@
     virtual ~CallbackWrapper() { }
     PassOwnPtr<AsyncFileSystemCallbacks> release()
     {
         return m_callbacks.release();
     }
 
 private:
     OwnPtr<AsyncFileSystemCallbacks> m_callbacks;
 };
 
-PassOwnPtrWillBeRawPtr<LocalFileSystem> LocalFileSystem::create(PassOwnPtr<FileSystemClient> client)

[zerny-chromium, 2014/06/10 11:39:59]

revert

+PassOwnPtr<LocalFileSystem> LocalFileSystem::create(PassOwnPtr<FileSystemClient> client)
 {
-    return adoptPtrWillBeNoop(new LocalFileSystem(client));

[zerny-chromium, 2014/06/10 11:39:59]

revert

+    return adoptPtr(new LocalFileSystem(client));
 }
 
 LocalFileSystem::~LocalFileSystem()
 {
 }
 
 void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     RefPtr<CallbackWrapper> wrapper = adoptRef(new CallbackWrapper(callbacks));
     requestFileSystemAccessInternal(context,
@@ skipping 77 matching lines @@
 }
 
 const char* LocalFileSystem::supplementName()
 {
     return "LocalFileSystem";
 }
 
 LocalFileSystem* LocalFileSystem::from(ExecutionContext& context)
 {
     if (context.isDocument()) {
-        return static_cast<LocalFileSystem*>(WillBeHeapSupplement<Page>::from(toDocument(context).page(), supplementName()));
+        return static_cast<LocalFileSystem*>(Supplement<LocalFrame>::from(toDocument(context).frame(), supplementName()));

[zerny-chromium, 2014/06/10 11:39:59]

WillBeHeapSupplement<LocalFrame>

     }
     ASSERT(context.isWorkerGlobalScope());
     return static_cast<LocalFileSystem*>(WillBeHeapSupplement<WorkerClients>::from(toWorkerGlobalScope(context).clients(), supplementName()));
 }
 
-void provideLocalFileSystemTo(Page& page, PassOwnPtr<FileSystemClient> client)
+void provideLocalFileSystemTo(LocalFrame& frame, PassOwnPtr<FileSystemClient> client)
 {
-    page.provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(client));
-    page.inspectorController().registerModuleAgent(InspectorFileSystemAgent::create(&page));
+    frame.provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(client));
 }
 
 void provideLocalFileSystemToWorker(WorkerClients* clients, PassOwnPtr<FileSystemClient> client)
 {
     clients->provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(client));
 }
 
 } // namespace WebCore