From: sachiel <sachiel@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Wed, 12 Oct 2011 18:00:09 +0000 (+0000)
Subject: Fix building against new EWebkit API
X-Git-Tag: REL_F_I9500_20120323_1~17^2~1640
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d00742367994f67cddfa58b93f9f964c7a610bb4;p=framework%2Fuifw%2Felementary.git

Fix building against new EWebkit API


git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64021 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index a33538f..b8f2a8a 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -13668,28 +13668,6 @@ extern "C" {
     */
    EAPI Elm_Web_Zoom_Mode            elm_web_zoom_mode_get(const Evas_Object *obj);
    /**
-    * Gets whether text-only zoom is set
-    *
-    * @param obj The web object
-    *
-    * @return EINA_TRUE if zoom is set to affect only text, EINA_FALSE
-    * otherwise
-    *
-    * @see elm_web_zoom_text_only_set()
-    */
-   EAPI Eina_Bool                    elm_web_zoom_text_only_get(const Evas_Object *obj);
-   /**
-    * Enables or disables zoom to affect only text
-    *
-    * If set, then the zoom level set to the page will only be applied on text,
-    * leaving other objects, such as images, at their original size.
-    *
-    * @param obj The web object
-    * @param setting EINA_TRUE to use text-only zoom, EINA_FALSE to have zoom
-    * affect the entire page
-    */
-   EAPI void                         elm_web_zoom_text_only_set(Evas_Object *obj, Eina_Bool setting);
-   /**
     * Shows the given region in the web object
     *
     * @param obj The web object
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index e392624..762572e 100644
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -1599,7 +1599,7 @@ elm_web_zoom_set(Evas_Object *obj, double zoom)
         Evas_Coord fw, fh, pw, ph;
         if (!ewk_frame_contents_size_get(frame, &fw, &fh))
           return;
-        z = ewk_frame_zoom_get(frame);
+        z = ewk_frame_page_zoom_get(frame);
         fw /= z;
         fh /= z;
         if ((fw > 0) && (fh > 0))
@@ -1624,7 +1624,7 @@ elm_web_zoom_set(Evas_Object *obj, double zoom)
         Evas_Coord fw, fh, pw, ph;
         if (!ewk_frame_contents_size_get(frame, &fw, &fh))
           return;
-        z = ewk_frame_zoom_get(frame);
+        z = ewk_frame_page_zoom_get(frame);
         fw /= z;
         fh /= z;
         if ((fw > 0) && (fh > 0))
@@ -1698,32 +1698,6 @@ elm_web_zoom_mode_get(const Evas_Object *obj)
 #endif
 }
 
-EAPI Eina_Bool
-elm_web_zoom_text_only_get(const Evas_Object *obj)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
-#ifdef HAVE_ELEMENTARY_WEB
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return EINA_FALSE;
-   return ewk_view_zoom_text_only_get(wd->ewk_view);
-#else
-   return EINA_FALSE;
-#endif
-}
-
-EAPI void
-elm_web_zoom_text_only_set(Evas_Object *obj, Eina_Bool setting)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-#ifdef HAVE_ELEMENTARY_WEB
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   ewk_view_zoom_text_only_set(wd->ewk_view, setting);
-#else
-   (void)setting;
-#endif
-}
-
 EAPI void
 elm_web_region_show(Evas_Object *obj, int x, int y, int w __UNUSED__, int h __UNUSED__)
 {
@@ -1734,7 +1708,7 @@ elm_web_region_show(Evas_Object *obj, int x, int y, int w __UNUSED__, int h __UN
    int fw, fh, zw, zh, rx, ry;
    float zoom;
    ewk_frame_contents_size_get(frame, &fw, &fh);
-   zoom = ewk_frame_zoom_get(frame);
+   zoom = ewk_frame_page_zoom_get(frame);
    zw = fw / zoom;
    zh = fh / zoom;
    rx = (x * fw) / zw;
@@ -1762,7 +1736,7 @@ elm_web_region_bring_in(Evas_Object *obj, int x, int y, int w __UNUSED__, int h
    float zoom;
    ewk_frame_contents_size_get(frame, &fw, &fh);
    ewk_frame_scroll_pos_get(frame, &sx, &sy);
-   zoom = ewk_frame_zoom_get(frame);
+   zoom = ewk_frame_page_zoom_get(frame);
    zw = fw / zoom;
    zh = fh / zoom;
    rx = (x * fw) / zw;