Changeset 69783 in webkit

Timestamp:

Oct 14, 2010 11:36:47 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-14 Ryuan Choi <​ryuan.choi@samsung.com>

Reviewed by Eric Seidel.

[EFL] Add setting api for enabling encoding detector
​https://bugs.webkit.org/show_bug.cgi?id=45427

Add settings api for enabling encoding detector.

• ewk/ewk_view.cpp: (_ewk_view_priv_new): (ewk_view_setting_encoding_detector_set): (ewk_view_setting_encoding_detector_get):
• ewk/ewk_view.h:

Location:

trunk/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (5 diffs)
• ewk/ewk_view.h (modified) (1 diff)

trunk/WebKit/efl/ChangeLog

@@ +1 @@
+2010-10-14  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Reviewed by Eric Seidel.
+
+        [EFL] Add setting api for enabling encoding detector
+        https://bugs.webkit.org/show_bug.cgi?id=45427
+
+        Add settings api for enabling encoding detector.
+
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new):
+        (ewk_view_setting_encoding_detector_set):
+        (ewk_view_setting_encoding_detector_get):
+        * ewk/ewk_view.h:
+
 2010-10-13  Leandro Pereira  <leandro@profusion.mobi>
 

trunk/WebKit/efl/ewk/ewk_view.cpp

@@ -116 +116 @@
         Eina_Bool enable_plugins:1;
         Eina_Bool enable_frame_flattening:1;
+        Eina_Bool encoding_detector:1;
         Eina_Bool scripts_window_open:1;
         Eina_Bool resizable_textareas:1;
@@ -571 +572 @@
     priv->page_settings->setOfflineWebApplicationCacheEnabled(true);
     priv->page_settings->setUsesPageCache(true);
+    priv->page_settings->setUsesEncodingDetector(true);
 
     url = priv->page_settings->userStyleSheetLocation();
@@ -615 +617 @@
     priv->settings.offline_app_cache = true; // XXX no function to read setting; this keeps the original setting
     priv->settings.page_cache = priv->page_settings->usesPageCache();
+    priv->settings.encoding_detector = priv->page_settings->usesEncodingDetector();
 
     // Since there's no scale separated from zooming in webkit-efl, this functionality of
@@ -2527 +2530 @@
 }
 
+/**
+ * Sets the encoding detector.
+ *
+ * @param o view object to set if encoding detector is enabled.
+ * @return @c EINA_TRUE on success and @c EINA_FALSE on failure
+ */
+Eina_Bool ewk_view_setting_encoding_detector_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.encoding_detector != enable) {
+        priv->page_settings->setUsesEncodingDetector(enable);
+        priv->settings.encoding_detector = enable;
+    }
+    return EINA_TRUE;
+}
+
+/**
+ * Gets if the encoding detector is enabled.
+ *
+ * @param o view object to get if encoding detector is enabled.
+ * @return @c EINA_TRUE if encoding detector is enabled, @c EINA_FALSE if not or on errors.
+ */
+Eina_Bool ewk_view_setting_encoding_detector_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.encoding_detector;
+}
+
 const char* ewk_view_setting_cache_directory_get(const Evas_Object* o)
 {
@@ -2745 +2779 @@
  * 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.
+ * @param o view object to get if local storage is enabled.
+ * @return @c EINA_TRUE if local storage is enabled, @c EINA_FALSE if not or on errors.
  */
 Eina_Bool ewk_view_setting_local_storage_get(Evas_Object* o)

trunk/WebKit/efl/ewk/ewk_view.h

@@ -456 +456 @@
 EAPI Eina_Bool    ewk_view_setting_page_cache_set(Evas_Object* o, Eina_Bool enable);
 
+EAPI Eina_Bool    ewk_view_setting_encoding_detector_get(Evas_Object* o);
+EAPI Eina_Bool    ewk_view_setting_encoding_detector_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);