Title: [149034] trunk/Source/WebCore
Revision
149034
Author
[email protected]
Date
2013-04-24 07:27:13 -0700 (Wed, 24 Apr 2013)

Log Message

DOMFileSystemBase: fix multiple definitions in the BlackBerry port
https://bugs.webkit.org/show_bug.cgi?id=114950

Patch by Alberto Garcia <[email protected]> on 2013-04-24
Reviewed by Xan Lopez.

The following  methods are already defined in DOMFileSystemBlackBerry.cpp:

crackFileSystemURL()
createFileSystemURL()
isValidType()
supportsToURL()

* Modules/filesystem/DOMFileSystemBase.cpp:
(WebCore):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (149033 => 149034)


--- trunk/Source/WebCore/ChangeLog	2013-04-24 14:10:47 UTC (rev 149033)
+++ trunk/Source/WebCore/ChangeLog	2013-04-24 14:27:13 UTC (rev 149034)
@@ -1,3 +1,20 @@
+2013-04-24  Alberto Garcia  <[email protected]>
+
+        DOMFileSystemBase: fix multiple definitions in the BlackBerry port
+        https://bugs.webkit.org/show_bug.cgi?id=114950
+
+        Reviewed by Xan Lopez.
+
+        The following  methods are already defined in DOMFileSystemBlackBerry.cpp:
+
+        crackFileSystemURL()
+        createFileSystemURL()
+        isValidType()
+        supportsToURL()
+
+        * Modules/filesystem/DOMFileSystemBase.cpp:
+        (WebCore):
+
 2013-04-24  George Staikos  <[email protected]>
 
         [BlackBerry] Add support for JPEG image quality during encoding.

Modified: trunk/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp (149033 => 149034)


--- trunk/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp	2013-04-24 14:10:47 UTC (rev 149033)
+++ trunk/Source/WebCore/Modules/filesystem/DOMFileSystemBase.cpp	2013-04-24 14:27:13 UTC (rev 149034)
@@ -71,6 +71,7 @@
 {
 }
 
+#if !PLATFORM(BLACKBERRY)
 // static
 bool DOMFileSystemBase::isValidType(FileSystemType type)
 {
@@ -112,6 +113,7 @@
     url.setPath(url.path() + encodeWithURLEscapeSequences(fullPath.substring(1)));
     return url;
 }
+#endif
 
 SecurityOrigin* DOMFileSystemBase::securityOrigin() const
 {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to