Changeset 117544 in webkit

Timestamp:

May 17, 2012 10:35:07 PM (12 years ago)

Author:

kinuko@chromium.org

Message:

Some Spelling Mistakes Result in Compile Errors with ENABLE(FILE_SYSTEM) in LocalFileSystem.cpp
​https://bugs.webkit.org/show_bug.cgi?id=86103

Reviewed by Rob Buis.

Added build fixes and some (limited) common implementation for non-chromium ports.

No new tests as this should have no functionality changes.

• Modules/filesystem/DOMFileSystemBase.cpp:

(WebCore::DOMFileSystemBase::isValidType): Added common implementation for non-chromium ports.
(WebCore::DOMFileSystemBase::crackFileSystemURL): Ditto.
(WebCore::DOMFileSystemBase::supportsToURL): Ditto.
(WebCore::DOMFileSystemBase::createFileSystemURL): Ditto.

• Modules/filesystem/LocalFileSystem.cpp:

(WebCore::LocalFileSystem::readFileSystem): Fixed.
(WebCore::LocalFileSystem::requestFileSystem): Fixed.

• platform/blackberry/AsyncFileSystemBlackBerry.cpp:

(WebCore::AsyncFileSystem::openFileSystem): Fixed.

• platform/gtk/AsyncFileSystemGtk.cpp:

(WebCore::AsyncFileSystem::openFileSystem): Fixed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/filesystem/DOMFileSystemBase.cpp (modified) (1 diff)
• Modules/filesystem/LocalFileSystem.cpp (modified) (2 diffs)
• platform/blackberry/AsyncFileSystemBlackBerry.cpp (modified) (1 diff)
• platform/gtk/AsyncFileSystemGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Some Spelling Mistakes Result in Compile Errors with ENABLE(FILE_SYSTEM) in LocalFileSystem.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=86103
+
+        Reviewed by Rob Buis.
+
+        Added build fixes and some (limited) common implementation for non-chromium ports.
+
+        No new tests as this should have no functionality changes.
+
+        * Modules/filesystem/DOMFileSystemBase.cpp:
+        (WebCore::DOMFileSystemBase::isValidType): Added common implementation for non-chromium ports.
+        (WebCore::DOMFileSystemBase::crackFileSystemURL): Ditto.
+        (WebCore::DOMFileSystemBase::supportsToURL): Ditto.
+        (WebCore::DOMFileSystemBase::createFileSystemURL): Ditto.
+        * Modules/filesystem/LocalFileSystem.cpp:
+        (WebCore::LocalFileSystem::readFileSystem): Fixed.
+        (WebCore::LocalFileSystem::requestFileSystem): Fixed.
+        * platform/blackberry/AsyncFileSystemBlackBerry.cpp:
+        (WebCore::AsyncFileSystem::openFileSystem): Fixed.
+        * platform/gtk/AsyncFileSystemGtk.cpp:
+        (WebCore::AsyncFileSystem::openFileSystem): Fixed.
+
 2012-05-17  Wei James  <james.wei@intel.com>
 

trunk/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp

@@ -69 +69 @@
 }
 
+#if !PLATFORM(CHROMIUM)
+// static
+bool DOMFileSystemBase::isValidType(FileSystemType type)
+{
+    return type == FileSystemTypeTemporary || type == FileSystemTypePersistent;
+}
+
+// static
+bool DOMFileSystemBase::crackFileSystemURL(const KURL& url, FileSystemType& type, String& filePath)
+{
+    if (!url.protocolIs("filesystem"))
+        return false;
+
+    if (!url.innerURL())
+        return false;
+
+    String typeString = url.innerURL()->path().substring(1);
+    if (typeString == temporaryPathPrefix)
+        type = FileSystemTypeTemporary;
+    else if (typeString == persistentPathPrefix)
+        type = FileSystemTypePersistent;
+    else
+        return false;
+
+    filePath = decodeURLEscapeSequences(url.path());
+    return true;
+}
+
+bool DOMFileSystemBase::supportsToURL() const
+{
+    ASSERT(isValidType(m_type));
+    return true;
+}
+
+KURL DOMFileSystemBase::createFileSystemURL(const String& fullPath) const
+{
+    ASSERT(DOMFilePath::isAbsolute(fullPath));
+    KURL url = m_filesystemRootURL;
+    // Remove the extra leading slash.
+    url.setPath(url.path() + encodeWithURLEscapeSequences(fullPath.substring(1)));
+    return url;
+}
+#endif
+
 SecurityOrigin* DOMFileSystemBase::securityOrigin() const
 {

trunk/Source/WebCore/Modules/filesystem/LocalFileSystem.cpp

@@ -83 +83 @@
 }
 
-void LocalFileSystem::readFileSystem(ScriptExecutionContext* context, DOMFileSystemBase::Type, PassOwnPtr<AsyncFileSystemCallbacks> callbacks, FileSystemSynchronousMode)
+void LocalFileSystem::readFileSystem(ScriptExecutionContext* context, FileSystemType, PassOwnPtr<AsyncFileSystemCallbacks> callbacks, FileSystemSynchronousType)
 {
     // AsyncFileSystem::openFileSystem calls callbacks synchronously, so the method needs to be called asynchronously.
@@ -89 +89 @@
 }
 
-void LocalFileSystem::requestFileSystem(ScriptExecutionContext* context, DOMFileSystemBase::Type, long long, PassOwnPtr<AsyncFileSystemCallbacks> callbacks, FileSystemSynchronousType)
+void LocalFileSystem::requestFileSystem(ScriptExecutionContext* context, FileSystemType, long long, PassOwnPtr<AsyncFileSystemCallbacks> callbacks, FileSystemSynchronousType)
 {
     // AsyncFileSystem::openFileSystem calls callbacks synchronously, so the method needs to be called asynchronously.

trunk/Source/WebCore/platform/blackberry/AsyncFileSystemBlackBerry.cpp

@@ -41 +41 @@
 }
 
-void AsyncFileSystem::openFileSystem(const KURL& basePath, const String& storageIdentifier, bool, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
+void AsyncFileSystem::openFileSystem(const String& basePath, const String& storageIdentifier, bool, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     UNUSED_PARAM(basePath);

trunk/Source/WebCore/platform/gtk/AsyncFileSystemGtk.cpp

@@ -41 +41 @@
 }
 
-void AsyncFileSystem::openFileSystem(const KURL& basePath, const String& storageIdentifier, bool, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
+void AsyncFileSystem::openFileSystem(const String& basePath, const String& storageIdentifier, bool, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     notImplemented();