[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:47:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7fffac3034abe5be5b4ffae44a7d7f8675e387e3
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 27 02:43:19 2010 +0000
2010-09-26 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Reviewed by Antonio Gomes.
[EFL] Add setting API to set a local storage database path.
https://bugs.webkit.org/show_bug.cgi?id=45446
Add a setting API to set local storage database path.
* ewk/ewk_view.cpp:
(_ewk_view_priv_new):
(_ewk_view_priv_del):
(ewk_view_setting_local_storage_database_path_get): Added.
(ewk_view_setting_local_storage_database_path_set): Added.
* ewk/ewk_view.h:
2010-09-26 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Reviewed by Antonio Gomes.
[EFL] Add setting API to set a local storage database path.
https://bugs.webkit.org/show_bug.cgi?id=45446
Add a setting API to set local storage database path.
* EWebLauncher/main.c:
(on_key_down):
(browserCreate):
(main):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68363 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index ccf0422..4f63bcc 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-26 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Add setting API to set a local storage database path.
+ https://bugs.webkit.org/show_bug.cgi?id=45446
+
+ Add a setting API to set local storage database path.
+
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new):
+ (_ewk_view_priv_del):
+ (ewk_view_setting_local_storage_database_path_get): Added.
+ (ewk_view_setting_local_storage_database_path_set): Added.
+ * ewk/ewk_view.h:
+
2010-09-23 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Csaba Osztrogonác.
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index acddcd2..19efbfa 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -91,6 +91,7 @@ struct _Ewk_View_Private_Data {
const char* encoding_custom;
const char* cache_directory;
const char* theme;
+ const char* local_storage_database_path;
int font_minimum_size;
int font_minimum_logical_size;
int font_default_size;
@@ -579,6 +580,9 @@ static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* sd)
priv->settings.cache_directory = eina_stringshare_add
(WebCore::cacheStorage().cacheDirectory().utf8().data());
+ s = priv->page_settings->localStorageDatabasePath();
+ priv->settings.local_storage_database_path = eina_stringshare_add(s.string().utf8().data());
+
priv->settings.font_minimum_size = priv->page_settings->minimumFontSize();
priv->settings.font_minimum_logical_size = priv->page_settings->minimumLogicalFontSize();
priv->settings.font_default_size = priv->page_settings->defaultFontSize();
@@ -662,6 +666,7 @@ static void _ewk_view_priv_del(Ewk_View_Private_Data* priv)
eina_stringshare_del(priv->settings.font_fantasy);
eina_stringshare_del(priv->settings.font_serif);
eina_stringshare_del(priv->settings.font_sans_serif);
+ eina_stringshare_del(priv->settings.local_storage_database_path);
if (priv->animated_zoom.animator)
ecore_animator_del(priv->animated_zoom.animator);
@@ -2784,6 +2789,36 @@ Eina_Bool ewk_view_setting_page_cache_set(Evas_Object* o, Eina_Bool enable)
return EINA_TRUE;
}
+/*
+ * Gets the local storage database path.
+ *
+ * @param o view object to get the local storage database path.
+ * @return the local storage database path.
+ */
+const char* ewk_view_setting_local_storage_database_path_get(const Evas_Object* o)
+{
+ EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+ EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
+ return priv->settings.local_storage_database_path;
+}
+
+/**
+ * Sets the local storage database path.
+ *
+ * @param o view object to set the local storage database path.
+ * @return @c EINA_TRUE on success and @c EINA_FALSE on failure
+ */
+Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object* o, const char* path)
+{
+ EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+ EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+ if (eina_stringshare_replace(&priv->settings.local_storage_database_path, path)) {
+ WTF::AtomicString s = WTF::String::fromUTF8(path);
+ priv->page_settings->setLocalStorageDatabasePath(s);
+ }
+ return EINA_TRUE;
+}
+
/**
* Similar to evas_object_smart_data_get(), but does type checking.
*
diff --git a/WebKit/efl/ewk/ewk_view.h b/WebKit/efl/ewk/ewk_view.h
index 102f455..26bf97c 100644
--- a/WebKit/efl/ewk/ewk_view.h
+++ b/WebKit/efl/ewk/ewk_view.h
@@ -449,6 +449,8 @@ EAPI Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object* o, Eina_B
EAPI Eina_Bool ewk_view_setting_local_storage_get(Evas_Object* o);
EAPI Eina_Bool ewk_view_setting_local_storage_set(Evas_Object* o, Eina_Bool enable);
+EAPI const char *ewk_view_setting_local_storage_database_path_get(const Evas_Object *o);
+EAPI Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object *o, const char *path);
EAPI Eina_Bool ewk_view_setting_page_cache_get(Evas_Object* o);
EAPI Eina_Bool ewk_view_setting_page_cache_set(Evas_Object* o, Eina_Bool enable);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ecd772f..f77d15d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-26 Gyuyoung Kim <gyuyoung.kim at samsung.com>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] Add setting API to set a local storage database path.
+ https://bugs.webkit.org/show_bug.cgi?id=45446
+
+ Add a setting API to set local storage database path.
+
+ * EWebLauncher/main.c:
+ (on_key_down):
+ (browserCreate):
+ (main):
+
2010-09-26 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKitTools/EWebLauncher/main.c b/WebKitTools/EWebLauncher/main.c
index 7bdfc72..8965c42 100644
--- a/WebKitTools/EWebLauncher/main.c
+++ b/WebKitTools/EWebLauncher/main.c
@@ -147,7 +147,7 @@ typedef struct _ELauncher {
static void browserDestroy(Ecore_Evas *ee);
static void closeWindow(Ecore_Evas *ee);
-static int browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen);
+static int browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen, const char *databasePath);
static void
print_history(Eina_List *list)
@@ -562,7 +562,7 @@ on_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
info("Create new window (F9) was pressed.\n");
Eina_Rectangle geometry = {0, 0, 0, 0};
browserCreate("http://www.google.com",
- app->theme, app->userAgent, geometry, NULL, 0);
+ app->theme, app->userAgent, geometry, NULL, 0, NULL);
} else if (!strcmp(ev->key, "F10")) {
Evas_Coord x, y, w, h;
Evas_Object *frame = ewk_view_frame_main_get(obj);
@@ -617,7 +617,7 @@ quit(Eina_Bool success, const char *msg)
}
static int
-browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen)
+browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen, const char *databasePath)
{
if ((geometry.w <= 0) && (geometry.h <= 0)) {
geometry.w = DEFAULT_WIDTH;
@@ -660,6 +660,8 @@ browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Re
ewk_view_theme_set(app->browser, theme);
if (userAgent)
ewk_view_setting_user_agent_set(app->browser, userAgent);
+ ewk_view_setting_local_storage_database_path_set(app->browser, databasePath);
+
evas_object_name_set(app->browser, "browser");
evas_object_smart_callback_add(app->browser, "title,changed", on_title_changed, app);
@@ -840,7 +842,7 @@ main(int argc, char *argv[])
if (proxyUri)
ewk_settings_proxy_uri_set(proxyUri);
- browserCreate(url, themePath, userAgent, geometry, engine, isFullscreen);
+ browserCreate(url, themePath, userAgent, geometry, engine, isFullscreen, path);
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, &windows);
ecore_main_loop_begin();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list