Web expose FileSystemFileEntry, FileSystemDirectoryEntry and friends

third_party/WebKit/Source/modules/filesystem/FileSystem.h

Index: third_party/WebKit/Source/modules/filesystem/FileSystem.h
diff --git a/third_party/WebKit/Source/modules/filesystem/DOMFileSystem.h b/third_party/WebKit/Source/modules/filesystem/FileSystem.h
similarity index 69%
rename from third_party/WebKit/Source/modules/filesystem/DOMFileSystem.h
rename to third_party/WebKit/Source/modules/filesystem/FileSystem.h
index 4d6e193c5f7a461819afd3c8bb76a0a4c9d8962e..8d30a217d35385f2aac7eb83a4533345eae203d8 100644
--- a/third_party/WebKit/Source/modules/filesystem/DOMFileSystem.h
+++ b/third_party/WebKit/Source/modules/filesystem/FileSystem.h
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DOMFileSystem_h
-#define DOMFileSystem_h
+#ifndef FileSystem_h
+#define FileSystem_h
 
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptWrappable.h"
@@ -37,39 +37,39 @@
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "modules/ModulesExport.h"
-#include "modules/filesystem/DOMFileSystemBase.h"
-#include "modules/filesystem/EntriesCallback.h"
+#include "modules/filesystem/FileSystemBase.h"
+#include "modules/filesystem/FileSystemEntriesCallback.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 
-class DirectoryEntry;
 class BlobCallback;
-class FileEntry;
+class FileSystemDirectoryEntry;
+class FileSystemFileEntry;
 class FileWriterCallback;
 
-class MODULES_EXPORT DOMFileSystem final : public DOMFileSystemBase,
-                                           public ScriptWrappable,
-                                           public ActiveScriptWrappable,
-                                           public ActiveDOMObject {
+class MODULES_EXPORT FileSystem final : public FileSystemBase,
+                                        public ScriptWrappable,
+                                        public ActiveScriptWrappable,
+                                        public ActiveDOMObject {
   DEFINE_WRAPPERTYPEINFO();
-  USING_GARBAGE_COLLECTED_MIXIN(DOMFileSystem);
+  USING_GARBAGE_COLLECTED_MIXIN(FileSystem);
 
  public:
-  static DOMFileSystem* create(ExecutionContext*,
-                               const String& name,
-                               FileSystemType,
-                               const KURL& rootURL);
+  static FileSystem* create(ExecutionContext*,
+                            const String& name,
+                            FileSystemType,
+                            const KURL& rootURL);
 
   // Creates a new isolated file system for the given filesystemId.
-  static DOMFileSystem* createIsolatedFileSystem(ExecutionContext*,
-                                                 const String& filesystemId);
+  static FileSystem* createIsolatedFileSystem(ExecutionContext*,
+                                              const String& filesystemId);
 
-  DirectoryEntry* root() const;
+  FileSystemDirectoryEntry* root() const;
 
-  // DOMFileSystemBase overrides.
+  // FileSystemBase overrides.
   void addPendingCallbacks() override;
   void removePendingCallbacks() override;
   void reportError(ErrorCallbackBase*, FileError::ErrorCode) override;
@@ -81,8 +81,12 @@ class MODULES_EXPORT DOMFileSystem final : public DOMFileSystemBase,
   // ScriptWrappable overrides.
   bool hasPendingActivity() const final;
 
-  void createWriter(const FileEntry*, FileWriterCallback*, ErrorCallbackBase*);
-  void createFile(const FileEntry*, BlobCallback*, ErrorCallbackBase*);
+  void createWriter(const FileSystemFileEntry*,
+                    FileWriterCallback*,
+                    ErrorCallbackBase*);
+  void createFile(const FileSystemFileEntry*,
+                  BlobCallback*,
+                  ErrorCallbackBase*);
 
   // Schedule a callback. This should not cross threads (should be called on the
   // same context thread).
@@ -96,17 +100,17 @@ class MODULES_EXPORT DOMFileSystem final : public DOMFileSystemBase,
   DECLARE_VIRTUAL_TRACE();
 
  private:
-  DOMFileSystem(ExecutionContext*,
-                const String& name,
-                FileSystemType,
-                const KURL& rootURL);
+  FileSystem(ExecutionContext*,
+             const String& name,
+             FileSystemType,
+             const KURL& rootURL);
 
   static String taskNameForInstrumentation() { return "FileSystem"; }
 
   int m_numberOfPendingCallbacks;
-  Member<DirectoryEntry> m_rootEntry;
+  Member<FileSystemDirectoryEntry> m_rootEntry;
 };
 
 }  // namespace blink
 
-#endif  // DOMFileSystem_h
+#endif  // FileSystem_h