[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d92371126751d5d422c4d372b8db2be0187e02c4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 06:13:45 2010 +0000

    2010-08-25  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Add setting API for enabling local storage.
            https://bugs.webkit.org/show_bug.cgi?id=44319
    
            Add API for enabling/disabling local storage.
    
            * ewk/ewk_view.cpp:
            (_ewk_view_priv_new):
            (ewk_view_setting_local_storage_get): Added
            (ewk_view_setting_local_storage_set): Added
            * ewk/ewk_view.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66080 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index e1ce89a..bec9738 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-25  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add setting API for enabling local storage.
+        https://bugs.webkit.org/show_bug.cgi?id=44319
+
+        Add API for enabling/disabling local storage.
+
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new):
+        (ewk_view_setting_local_storage_get): Added
+        (ewk_view_setting_local_storage_set): Added
+        * ewk/ewk_view.h:
+
 2010-08-25  Jaehun Lim  <ljaehun.lim at samsung.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 4a100d7..f680c57 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -108,6 +108,7 @@ struct _Ewk_View_Private_Data {
         Eina_Bool private_browsing:1;
         Eina_Bool caret_browsing:1;
         Eina_Bool spatial_navigation:1;
+        Eina_Bool local_storage:1;
         struct {
             float w;
             float h;
@@ -595,6 +596,7 @@ static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* sd)
     priv->settings.resizable_textareas = priv->page_settings->textAreasAreResizable();
     priv->settings.private_browsing = priv->page_settings->privateBrowsingEnabled();
     priv->settings.caret_browsing = priv->page_settings->caretBrowsingEnabled();
+    priv->settings.local_storage = priv->page_settings->localStorageEnabled();
 
     // Since there's no scale separated from zooming in webkit-efl, this functionality of
     // viewport meta tag is implemented using zoom. When scale zoom is supported by webkit-efl,
@@ -2665,6 +2667,37 @@ Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object* o, Eina_Bool enab
 }
 
 /**
+ * Gets if the local storage is enabled.
+ *
+ * @param o view object to set if local storage is enabled.
+ * @return @c EINA_TRUE if local storage is enabled, @c EINA_FALSE if not.
+ */
+Eina_Bool ewk_view_setting_local_storage_get(Evas_Object* o)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+    return priv->settings.local_storage;
+}
+
+/**
+ * Sets the local storage of HTML5.
+ *
+ * @param o view object to set if local storage is enabled.
+ * @return @c EINA_TRUE on success and @c EINA_FALSE on failure
+ */
+Eina_Bool ewk_view_setting_local_storage_set(Evas_Object* o, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+    enable = !!enable;
+    if (priv->settings.local_storage != enable) {
+        priv->page_settings->setLocalStorageEnabled(enable);
+        priv->settings.local_storage = enable;
+    }
+    return EINA_TRUE;
+}
+
+/**
  * Similar to evas_object_smart_data_get(), but does type checking.
  *
  * @param o view object to query internal data.
diff --git a/WebKit/efl/ewk/ewk_view.h b/WebKit/efl/ewk/ewk_view.h
index 9d5997c..5ff4844 100644
--- a/WebKit/efl/ewk/ewk_view.h
+++ b/WebKit/efl/ewk/ewk_view.h
@@ -442,6 +442,9 @@ EAPI Eina_Bool    ewk_view_setting_font_sans_serif_set(Evas_Object *o, const cha
 EAPI Eina_Bool    ewk_view_setting_spatial_navigation_get(Evas_Object* o);
 EAPI Eina_Bool    ewk_view_setting_spatial_navigation_set(Evas_Object* o, Eina_Bool enable);
 
+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);
+
 /* to be used by subclass implementations */
 EAPI Ewk_View_Smart_Data *ewk_view_smart_data_get(const Evas_Object *o);
 

-- 
WebKit Debian packaging