Changeset 65482 in webkit

Timestamp:

Aug 16, 2010 8:53:40 PM (14 years ago)

Author:

kinuko@chromium.org

Message:

2010-08-16 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Jian Li.

[chromium] Prepare to rename WebFileSystem interface to WebFileUtilities
​https://bugs.webkit.org/show_bug.cgi?id=44077

We are going to have an implementation for HTML5 FileSystem API and
it would probably be less confusing to use the name "WebFileSystem"
for an WebKit API for the HTML5 API.

This patch adds WebFileUtilities interface that is meant to replace
the existing WebFileSystem.

• WebKit.gyp:
• public/WebFileSystem.h:
• public/WebFileUtilities.h: Added.
• public/WebKitClient.h: (WebKit::WebKitClient::fileUtilities): Added.
• src/ChromiumBridge.cpp: (WebCore::ChromiumBridge::fileExists): (WebCore::ChromiumBridge::deleteFile): (WebCore::ChromiumBridge::deleteEmptyDirectory): (WebCore::ChromiumBridge::getFileSize): (WebCore::ChromiumBridge::getFileModificationTime): (WebCore::ChromiumBridge::directoryName): (WebCore::ChromiumBridge::pathByAppendingComponent): (WebCore::ChromiumBridge::makeAllDirectories): (WebCore::ChromiumBridge::getAbsolutePath): (WebCore::ChromiumBridge::isDirectory): (WebCore::ChromiumBridge::filePathToURL): (WebCore::ChromiumBridge::openFile): (WebCore::ChromiumBridge::closeFile): (WebCore::ChromiumBridge::seekFile): (WebCore::ChromiumBridge::truncateFile): (WebCore::ChromiumBridge::readFromFile): (WebCore::ChromiumBridge::writeToFile):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• public/WebFileSystem.h (modified) (1 diff)
• public/WebFileUtilities.h (added)
• public/WebKitClient.h (modified) (3 diffs)
• src/ChromiumBridge.cpp (modified) (4 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-08-16  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by Jian Li.
+
+        [chromium] Prepare to rename WebFileSystem interface to WebFileUtilities
+        https://bugs.webkit.org/show_bug.cgi?id=44077
+
+        We are going to have an implementation for HTML5 FileSystem API and
+        it would probably be less confusing to use the name "WebFileSystem"
+        for an WebKit API for the HTML5 API.
+
+        This patch adds WebFileUtilities interface that is meant to replace
+        the existing WebFileSystem.
+
+        * WebKit.gyp:
+        * public/WebFileSystem.h:
+        * public/WebFileUtilities.h: Added.
+        * public/WebKitClient.h:
+        (WebKit::WebKitClient::fileUtilities): Added.
+        * src/ChromiumBridge.cpp:
+        (WebCore::ChromiumBridge::fileExists):
+        (WebCore::ChromiumBridge::deleteFile):
+        (WebCore::ChromiumBridge::deleteEmptyDirectory):
+        (WebCore::ChromiumBridge::getFileSize):
+        (WebCore::ChromiumBridge::getFileModificationTime):
+        (WebCore::ChromiumBridge::directoryName):
+        (WebCore::ChromiumBridge::pathByAppendingComponent):
+        (WebCore::ChromiumBridge::makeAllDirectories):
+        (WebCore::ChromiumBridge::getAbsolutePath):
+        (WebCore::ChromiumBridge::isDirectory):
+        (WebCore::ChromiumBridge::filePathToURL):
+        (WebCore::ChromiumBridge::openFile):
+        (WebCore::ChromiumBridge::closeFile):
+        (WebCore::ChromiumBridge::seekFile):
+        (WebCore::ChromiumBridge::truncateFile):
+        (WebCore::ChromiumBridge::readFromFile):
+        (WebCore::ChromiumBridge::writeToFile):
+
 2010-08-16  Nate Chapin  <japhet@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -159 +159 @@
                 'public/WebFileInfo.h',
                 'public/WebFileSystem.h',
+                'public/WebFileUtilities.h',
                 'public/WebFindOptions.h',
                 'public/WebFloatPoint.h',

trunk/WebKit/chromium/public/WebFileSystem.h

@@ -32 +32 @@
 #define WebFileSystem_h
 
-#include "WebCommon.h"
-#include "WebString.h"
-#include "WebURL.h"
+#include "WebFileUtilities.h"
 
 namespace WebKit {
 
-class WebFileSystem {
-public:
-#ifdef WIN32
-    typedef HANDLE FileHandle;
-#else
-    typedef int FileHandle;
-#endif
-
-    virtual bool fileExists(const WebString& path) { return false; }
-    virtual bool deleteFile(const WebString& path) { return false; }
-    virtual bool deleteEmptyDirectory(const WebString& path) { return false; }
-    virtual bool getFileSize(const WebString& path, long long& result) { return false; }
-    virtual bool getFileModificationTime(const WebString& path, double& result) { return false; }
-    virtual WebString directoryName(const WebString& path)  { return WebString(); }
-    virtual WebString pathByAppendingComponent(const WebString& path, const WebString& component)  { return WebString(); }
-    virtual bool makeAllDirectories(const WebString& path) { return false; }
-    virtual WebString getAbsolutePath(const WebString& path)  { return WebString(); }
-    virtual bool isDirectory(const WebString& path) { return false; }
-    virtual WebURL filePathToURL(const WebString& path)  { return WebURL(); }
-    virtual FileHandle openFile(const WebString& path, int mode)  { return FileHandle(); }
-    // Should set the FileHandle to a invalid value if the file is closed successfully.
-    virtual void closeFile(FileHandle&) { }
-    virtual long long seekFile(FileHandle, long long offset, int origin) { return 0; }
-    virtual bool truncateFile(FileHandle, long long offset) { return false; }
-    virtual int readFromFile(FileHandle, char* data, int length) { return 0; }
-    virtual int writeToFile(FileHandle, const char* data, int length) { return 0; }
-
-protected:
-    ~WebFileSystem() {}
+// FIXME: Clean up this class once the renaming to WebFileUtilities is done.
+class WebFileSystem : public WebFileUtilities {
 };
 

trunk/WebKit/chromium/public/WebKitClient.h

@@ -34 +34 @@
 #include "WebCommon.h"
 #include "WebData.h"
+#include "WebFileSystem.h"
 #include "WebLocalizedString.h"
 #include "WebString.h"
@@ -50 +51 @@
 class WebClipboard;
 class WebCookieJar;
-class WebFileSystem;
+class WebFileUtilities;
 class WebGLES2Context;
 class WebGraphicsContext3D;
@@ -73 +74 @@
 
     // Must return non-null.
+    // FIXME: Clean up this one once the renaming to WebFileUtilities is done.
     virtual WebFileSystem* fileSystem() { return 0; }
+
+    // Must return non-null.
+    // FIXME: Clean up this one once the renaming from WebFileSystem is done.
+    virtual WebFileUtilities* fileUtilities() { return fileSystem(); }
 
     // May return null if sandbox support is not necessary

trunk/WebKit/chromium/src/ChromiumBridge.cpp

@@ -42 +42 @@
 #include "WebData.h"
 #include "WebDragData.h"
-#include "WebFileSystem.h"
+#include "WebFileUtilities.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
@@ -321 +321 @@
 bool ChromiumBridge::fileExists(const String& path)
 {
-    return webKitClient()->fileSystem()->fileExists(path);
+    return webKitClient()->fileUtilities()->fileExists(path);
 }
 
 bool ChromiumBridge::deleteFile(const String& path)
 {
-    return webKitClient()->fileSystem()->deleteFile(path);
+    return webKitClient()->fileUtilities()->deleteFile(path);
 }
 
 bool ChromiumBridge::deleteEmptyDirectory(const String& path)
 {
-    return webKitClient()->fileSystem()->deleteEmptyDirectory(path);
+    return webKitClient()->fileUtilities()->deleteEmptyDirectory(path);
 }
 
 bool ChromiumBridge::getFileSize(const String& path, long long& result)
 {
-    return webKitClient()->fileSystem()->getFileSize(path, result);
+    return webKitClient()->fileUtilities()->getFileSize(path, result);
 }
 
@@ -342 +342 @@
 {
     double modificationTime;
-    if (!webKitClient()->fileSystem()->getFileModificationTime(path, modificationTime))
+    if (!webKitClient()->fileUtilities()->getFileModificationTime(path, modificationTime))
         return false;
     result = static_cast<time_t>(modificationTime);
@@ -350 +350 @@
 String ChromiumBridge::directoryName(const String& path)
 {
-    return webKitClient()->fileSystem()->directoryName(path);
+    return webKitClient()->fileUtilities()->directoryName(path);
 }
 
 String ChromiumBridge::pathByAppendingComponent(const String& path, const String& component)
 {
-    return webKitClient()->fileSystem()->pathByAppendingComponent(path, component);
+    return webKitClient()->fileUtilities()->pathByAppendingComponent(path, component);
 }
 
 bool ChromiumBridge::makeAllDirectories(const String& path)
 {
-    return webKitClient()->fileSystem()->makeAllDirectories(path);
+    return webKitClient()->fileUtilities()->makeAllDirectories(path);
 }
 
 String ChromiumBridge::getAbsolutePath(const String& path)
 {
-    return webKitClient()->fileSystem()->getAbsolutePath(path);
+    return webKitClient()->fileUtilities()->getAbsolutePath(path);
 }
 
 bool ChromiumBridge::isDirectory(const String& path)
 {
-    return webKitClient()->fileSystem()->isDirectory(path);
+    return webKitClient()->fileUtilities()->isDirectory(path);
 }
 
 KURL ChromiumBridge::filePathToURL(const String& path)
 {
-    return webKitClient()->fileSystem()->filePathToURL(path);
+    return webKitClient()->fileUtilities()->filePathToURL(path);
 }
 
 PlatformFileHandle ChromiumBridge::openFile(const String& path, FileOpenMode mode)
 {
-    return webKitClient()->fileSystem()->openFile(path, mode);
+    return webKitClient()->fileUtilities()->openFile(path, mode);
 }
 
 void ChromiumBridge::closeFile(PlatformFileHandle& handle)
 {
-    webKitClient()->fileSystem()->closeFile(handle);
+    webKitClient()->fileUtilities()->closeFile(handle);
 }
 
 long long ChromiumBridge::seekFile(PlatformFileHandle handle, long long offset, FileSeekOrigin origin)
 {
-    return webKitClient()->fileSystem()->seekFile(handle, offset, origin);
+    return webKitClient()->fileUtilities()->seekFile(handle, offset, origin);
 }
 
 bool ChromiumBridge::truncateFile(PlatformFileHandle handle, long long offset)
 {
-    return webKitClient()->fileSystem()->truncateFile(handle, offset);
+    return webKitClient()->fileUtilities()->truncateFile(handle, offset);
 }
 
 int ChromiumBridge::readFromFile(PlatformFileHandle handle, char* data, int length)
 {
-    return webKitClient()->fileSystem()->readFromFile(handle, data, length);
+    return webKitClient()->fileUtilities()->readFromFile(handle, data, length);
 }
 
 int ChromiumBridge::writeToFile(PlatformFileHandle handle, const char* data, int length)
 {
-    return webKitClient()->fileSystem()->writeToFile(handle, data, length);
+    return webKitClient()->fileUtilities()->writeToFile(handle, data, length);
 }