[WK2][EFL] Use eina_file_path_join at platformDefaultIconDatabasePath in WebProcessPo...
authorjh718.park@samsung.com <jh718.park@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Dec 2015 07:21:12 +0000 (07:21 +0000)
committerjh718.park@samsung.com <jh718.park@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Dec 2015 07:21:12 +0000 (07:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=152565

Reviewed by Gyuyoung Kim.

Use eina_file_path_join and EINA_PATH_SEP_S at platformDefaultIconDatabasePath
instead of operator+ and separator "/" respectively
to concatenate paths.

* UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp:
* UIProcess/efl/WebProcessPoolEfl.cpp:
(WebKit::WebProcessPool::platformDefaultIconDatabasePath):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp
Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp

index 10a2b29..c354a40 100644 (file)
@@ -1,3 +1,18 @@
+2015-12-26  Joonghun Park  <jh718.park@samsung.com>
+
+        [WK2][EFL] Use eina_file_path_join at platformDefaultIconDatabasePath in WebProcessPoolEfl
+        https://bugs.webkit.org/show_bug.cgi?id=152565
+
+        Reviewed by Gyuyoung Kim.
+
+        Use eina_file_path_join and EINA_PATH_SEP_S at platformDefaultIconDatabasePath
+        instead of operator+ and separator "/" respectively
+        to concatenate paths.
+
+        * UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp:
+        * UIProcess/efl/WebProcessPoolEfl.cpp:
+        (WebKit::WebProcessPool::platformDefaultIconDatabasePath):
+
 2015-12-25  David Kilzer  <ddkilzer@apple.com>
 
         ResourceError should store failingURL as URL instead of String to avoid reparsing and to address FIXME comments in ResourceErrorCF.cpp and ResourceErrorMac.mm
index e5cc61f..67b0646 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <Efreet.h>
 #include <WebCore/FileSystem.h>
-#include <wtf/text/StringBuilder.h>
 
 namespace API {
 
index 67791e6..10b5f2a 100644 (file)
@@ -109,7 +109,10 @@ String WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory()
 
 String WebProcessPool::platformDefaultIconDatabasePath() const
 {
-    return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/IconDatabase/" + WebCore::IconDatabase::defaultDatabaseFilename();
+    char joinedPath[PATH_MAX];
+    eina_file_path_join(joinedPath, sizeof(joinedPath), efreet_data_home_get(), "WebKitEfl" EINA_PATH_SEP_S "IconDatabase");
+
+    return WebCore::pathByAppendingComponent(joinedPath, WebCore::IconDatabase::defaultDatabaseFilename());
 }
 
 String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()