- Revision
- 117544
- Author
- [email protected]
- Date
- 2012-05-17 22:35:07 -0700 (Thu, 17 May 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117543 => 117544)
--- trunk/Source/WebCore/ChangeLog 2012-05-18 05:33:17 UTC (rev 117543)
+++ trunk/Source/WebCore/ChangeLog 2012-05-18 05:35:07 UTC (rev 117544)
@@ -1,3 +1,27 @@
+2012-05-15 Kinuko Yasuda <[email protected]>
+
+ 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 <[email protected]>
AudioBufferSourceNode and MediaElementAudioSourceNode should support multi-channel > stereo
Modified: trunk/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp (117543 => 117544)
--- trunk/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp 2012-05-18 05:33:17 UTC (rev 117543)
+++ trunk/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp 2012-05-18 05:35:07 UTC (rev 117544)
@@ -68,6 +68,50 @@
{
}
+#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 = ""
+ // Remove the extra leading slash.
+ url.setPath(url.path() + encodeWithURLEscapeSequences(fullPath.substring(1)));
+ return url;
+}
+#endif
+
SecurityOrigin* DOMFileSystemBase::securityOrigin() const
{
return m_context->securityOrigin();
Modified: trunk/Source/WebCore/Modules/filesystem/LocalFileSystem.cpp (117543 => 117544)
--- trunk/Source/WebCore/Modules/filesystem/LocalFileSystem.cpp 2012-05-18 05:33:17 UTC (rev 117543)
+++ trunk/Source/WebCore/Modules/filesystem/LocalFileSystem.cpp 2012-05-18 05:35:07 UTC (rev 117544)
@@ -82,13 +82,13 @@
AsyncFileSystem::openFileSystem(basePath, identifier, create, callbacks);
}
-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.
context->postTask(createCallbackTask(&openFileSystem, fileSystemBasePath(), context->securityOrigin()->databaseIdentifier(), false, callbacks));
}
-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.
context->postTask(createCallbackTask(&openFileSystem, fileSystemBasePath(), context->securityOrigin()->databaseIdentifier(), true, callbacks));
Modified: trunk/Source/WebCore/platform/blackberry/AsyncFileSystemBlackBerry.cpp (117543 => 117544)
--- trunk/Source/WebCore/platform/blackberry/AsyncFileSystemBlackBerry.cpp 2012-05-18 05:33:17 UTC (rev 117543)
+++ trunk/Source/WebCore/platform/blackberry/AsyncFileSystemBlackBerry.cpp 2012-05-18 05:35:07 UTC (rev 117544)
@@ -40,7 +40,7 @@
return adoptPtr(new AsyncFileSystemBlackBerry());
}
-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);
UNUSED_PARAM(storageIdentifier);
Modified: trunk/Source/WebCore/platform/gtk/AsyncFileSystemGtk.cpp (117543 => 117544)
--- trunk/Source/WebCore/platform/gtk/AsyncFileSystemGtk.cpp 2012-05-18 05:33:17 UTC (rev 117543)
+++ trunk/Source/WebCore/platform/gtk/AsyncFileSystemGtk.cpp 2012-05-18 05:35:07 UTC (rev 117544)
@@ -40,7 +40,7 @@
return adoptPtr(new AsyncFileSystemGtk());
}
-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();
callbacks->didFail(NOT_SUPPORTED_ERR);
