Diff
Modified: trunk/ChangeLog (123730 => 123731)
--- trunk/ChangeLog 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/ChangeLog 2012-07-26 12:01:37 UTC (rev 123731)
@@ -1,3 +1,14 @@
+2012-07-26 Zoltan Nyul <zoltan.n...@intel.com>
+
+ [EFL] EFL port should use XDG paths
+ https://bugs.webkit.org/show_bug.cgi?id=91719
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Efreet library added.
+
+ * Source/cmake/FindEFL.cmake:
+
2012-07-26 Kaustubh Atrawalkar <kaust...@motorola.com>
[DRT] LTC:: pageNumberForElementById() could be moved to Internals.
Modified: trunk/Source/WebKit/ChangeLog (123730 => 123731)
--- trunk/Source/WebKit/ChangeLog 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/WebKit/ChangeLog 2012-07-26 12:01:37 UTC (rev 123731)
@@ -1,3 +1,14 @@
+2012-07-26 Zoltan Nyul <zoltan.n...@intel.com>
+
+ [EFL] EFL port should use XDG paths
+ https://bugs.webkit.org/show_bug.cgi?id=91719
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add efreet library to get the xdg paths.
+
+ * PlatformEfl.cmake:
+
2012-07-25 Kihong Kwon <kihong.k...@samsung.com>
[EFL] Add File Chooser API
Modified: trunk/Source/WebKit/PlatformEfl.cmake (123730 => 123731)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-07-26 12:01:37 UTC (rev 123731)
@@ -2,6 +2,7 @@
${ECORE_X_LDFLAGS}
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
+ ${EFREET_LDFLAGS}
${EVAS_LDFLAGS}
)
@@ -18,6 +19,7 @@
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
${EFLDEPS_INCLUDE_DIRS}
+ ${EFREET_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${EUKIT_INCLUDE_DIRS}
${EDBUS_INCLUDE_DIRS}
@@ -159,6 +161,7 @@
${CAIRO_LIBRARIES}
${ECORE_X_LIBRARIES}
${EFLDEPS_LIBRARIES}
+ ${EFREET_LIBRARIES}
${EUKIT_LIBRARIES}
${EDBUS_LIBRARIES}
${FREETYPE_LIBRARIES}
Modified: trunk/Source/WebKit/efl/ChangeLog (123730 => 123731)
--- trunk/Source/WebKit/efl/ChangeLog 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-07-26 12:01:37 UTC (rev 123731)
@@ -1,3 +1,16 @@
+2012-07-26 Zoltan Nyul <zoltan.n...@intel.com>
+
+ [EFL] EFL port should use XDG paths
+ https://bugs.webkit.org/show_bug.cgi?id=91719
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Using xdg paths instead of home/.webkit directory for application
+ cache, web-database and local-storage.
+
+ * ewk/ewk_main.cpp:
+ (_ewk_init_body):
+
2012-07-26 Kaustubh Atrawalkar <kaust...@motorola.com>
[DRT] LTC:: pageNumberForElementById() could be moved to Internals
Modified: trunk/Source/WebKit/efl/ewk/ewk_main.cpp (123730 => 123731)
--- trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-07-26 12:01:37 UTC (rev 123731)
@@ -39,6 +39,7 @@
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Edje.h>
+#include <Efreet.h>
#include <Eina.h>
#include <Evas.h>
#include <glib-object.h>
@@ -159,23 +160,17 @@
ewk_settings_page_cache_capacity_set(3);
WebCore::PageGroup::setShouldTrackVisitedLinks(true);
- String home = WebCore::homeDirectoryPath();
- struct stat state;
- // check home directory first
- if (stat(home.utf8().data(), &state) == -1) {
- // Exit now - otherwise you may have some crash later
- int errnowas = errno;
- CRITICAL("Can't access HOME dir (or /tmp) - no place to save databases: %s", strerror(errnowas));
- return false;
- }
+ String localStorageDirectory = String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/LocalStorage";
+ String webDatabaseDirectory = String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl/Databases";
+ String applicationCacheDirectory = String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl/Applications";
- WTF::String webkitDirectory = home + "/.webkit";
- if (WebCore::makeAllDirectories(webkitDirectory))
- ewk_settings_web_database_path_set(webkitDirectory.utf8().data());
+ ewk_settings_local_storage_path_set(localStorageDirectory.utf8().data());
+ ewk_settings_web_database_path_set(webDatabaseDirectory.utf8().data());
+ ewk_settings_application_cache_path_set(applicationCacheDirectory.utf8().data());
ewk_network_tls_certificate_check_set(false);
- WebCore::StorageTracker::initializeTracker(webkitDirectory.utf8().data(), trackerClient());
+ WebCore::StorageTracker::initializeTracker(localStorageDirectory.utf8().data(), trackerClient());
SoupSession* session = WebCore::ResourceHandle::defaultSession();
SoupSessionFeature* auth_dialog = static_cast<SoupSessionFeature*>(g_object_new(EWK_TYPE_SOUP_AUTH_DIALOG, 0));
Modified: trunk/Source/WebKit2/ChangeLog (123730 => 123731)
--- trunk/Source/WebKit2/ChangeLog 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-26 12:01:37 UTC (rev 123731)
@@ -1,3 +1,18 @@
+2012-07-26 Zoltan Nyul <zoltan.n...@intel.com>
+
+ [EFL] EFL port should use XDG paths
+ https://bugs.webkit.org/show_bug.cgi?id=91719
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Setting xdg paths for application cache, web-database and local-storage.
+
+ * PlatformEfl.cmake:
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::applicationCacheDirectory):
+ (WebKit::WebContext::platformDefaultDatabaseDirectory):
+ (WebKit::WebContext::platformDefaultLocalStorageDirectory):
+
2012-07-26 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
[EFL] [WK2] Memory leak in ewk_view_resource_load_client.cpp
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (123730 => 123731)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-07-26 12:01:37 UTC (rev 123731)
@@ -3,6 +3,7 @@
${ECORE_X_LDFLAGS}
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
+ ${EFREET_LDFLAGS}
${EVAS_LDFLAGS}
${LIBSOUP24_LDFLAGS}
)
@@ -124,6 +125,7 @@
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
${EFLDEPS_INCLUDE_DIRS}
+ ${EFREET_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIRS}
@@ -137,6 +139,7 @@
${CAIRO_LIBRARIES}
${ECORE_X_LIBRARIES}
${EFLDEPS_LIBRARIES}
+ ${EFREET_LIBRARIES}
${Freetype_LIBRARIES}
${LIBXML2_LIBRARIES}
${SQLITE_LIBRARIES}
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (123730 => 123731)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2012-07-26 12:01:37 UTC (rev 123731)
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebContext.h"
+#include <Efreet.h>
#include <WebCore/ApplicationCacheStorage.h>
#include <WebCore/NotImplemented.h>
@@ -33,7 +34,7 @@
String WebContext::applicationCacheDirectory()
{
- return WebCore::cacheStorage().cacheDirectory();
+ return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl/Applications";
}
void WebContext::platformInitializeWebProcess(WebProcessCreationParameters&)
@@ -48,8 +49,7 @@
String WebContext::platformDefaultDatabaseDirectory() const
{
- notImplemented();
- return "";
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/Databases";
}
String WebContext::platformDefaultIconDatabasePath() const
@@ -60,8 +60,7 @@
String WebContext::platformDefaultLocalStorageDirectory() const
{
- notImplemented();
- return "";
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/LocalStorage";
}
} // namespace WebKit
Modified: trunk/Source/cmake/FindEFL.cmake (123730 => 123731)
--- trunk/Source/cmake/FindEFL.cmake 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Source/cmake/FindEFL.cmake 2012-07-26 12:01:37 UTC (rev 123731)
@@ -13,12 +13,14 @@
eukit>=1.1.0
edbus>=1.1.0
ecore-input>=1.0.0
- eeze>=1.2.99)
+ eeze>=1.2.99
+ efreet>=1.0.0)
PKG_CHECK_MODULES (EINA REQUIRED eina>=1.2.0)
PKG_CHECK_MODULES (ECORE_X ecore-x>=1.0.0)
PKG_CHECK_MODULES (EVAS REQUIRED evas>=1.0.0)
PKG_CHECK_MODULES (EUKIT REQUIRED eukit>=1.1.0)
PKG_CHECK_MODULES (EDBUS REQUIRED edbus>=1.1.0)
+PKG_CHECK_MODULES (EFREET REQUIRED efreet>=1.0.0)
FIND_PROGRAM (EDJE_CC_EXECUTABLE edje_cc)
IF (NOT EDJE_CC_EXECUTABLE)
Modified: trunk/Tools/ChangeLog (123730 => 123731)
--- trunk/Tools/ChangeLog 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Tools/ChangeLog 2012-07-26 12:01:37 UTC (rev 123731)
@@ -1,3 +1,21 @@
+2012-07-26 Zoltan Nyul <zoltan.n...@intel.com>
+
+ [EFL] EFL port should use XDG paths
+ https://bugs.webkit.org/show_bug.cgi?id=91719
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ The appcache/localstorage/webdatabase path should be set in the
+ ewk_main.cpp instead of the DumpRenderTree, and the XDG_DATA_HOME and
+ XDG_CACHE_HOME should be set to different directory for each processes
+ for the layout-tests.
+
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::initialize):
+ * Scripts/webkitpy/layout_tests/port/efl.py:
+ (EflPort.setup_environ_for_server):
+ * efl/jhbuild.modules:
+
2012-07-26 Balazs Kelemen <kbal...@webkit.org>
[NRWT] should have a way to restrict pixel tests for individual directories
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (123730 => 123731)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-07-26 12:01:37 UTC (rev 123731)
@@ -207,17 +207,6 @@
m_mainFrame = ewk_view_frame_main_get(m_mainView);
- char* drtTemp = getenv("DUMPRENDERTREE_TEMP");
- if (drtTemp) {
- char path[2048];
- eina_str_join(path, sizeof(path), '/', drtTemp, "LocalStorage");
- ewk_settings_local_storage_path_set(path);
- eina_str_join(path, sizeof(path), '/', drtTemp, "Databases");
- ewk_settings_web_database_path_set(path);
- eina_str_join(path, sizeof(path), '/', drtTemp, "Applications");
- ewk_settings_application_cache_path_set(path);
- }
-
return true;
}
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py (123730 => 123731)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2012-07-26 12:01:37 UTC (rev 123731)
@@ -59,6 +59,9 @@
env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib')
if self.webprocess_cmd_prefix:
env['WEB_PROCESS_CMD_PREFIX'] = self.webprocess_cmd_prefix
+
+ env['XDG_CACHE_HOME'] = str(self._filesystem.mkdtemp(prefix='%s-Efl-CacheDir-' % self.driver_name()))
+ env['XDG_DATA_HOME'] = str(self._filesystem.mkdtemp(prefix='%s-Efl-DataDir-' % self.driver_name()))
return env
def default_timeout_ms(self):
Modified: trunk/Tools/efl/jhbuild.modules (123730 => 123731)
--- trunk/Tools/efl/jhbuild.modules 2012-07-26 11:52:40 UTC (rev 123730)
+++ trunk/Tools/efl/jhbuild.modules 2012-07-26 12:01:37 UTC (rev 123731)
@@ -15,6 +15,7 @@
<dep package="edje"/>
<dep package="e_dbus"/>
<dep package="eeze"/>
+ <dep package="efreet"/>
</dependencies>
</metamodule>
@@ -231,4 +232,15 @@
</dependencies>
</autotools>
+ <autotools id="efreet">
+ <branch module="efreet"
+ repo="enlightenment.org"
+ revision="73027"/>
+ <dependencies>
+ <deb package="ecore"/>
+ <deb package="eina"/>
+ <deb package="eet"/>
+ </dependencies>
+ </autotools>
+
</moduleset>
