2010-07-20 Lucas De Marchi <lucas.demarchi@profusion.mobi>

        Reviewed by Kenneth Rohde Christiansen.

        Fix zoom in/out on EFL after r62666. The patch for adding viewport
        missed the initialization of zoom_range.user_scalable. In case browser
        doesn't care about the viewport and does not listen to the signal,
        user_scalable will be always false, thus inhibiting zoom in/out.
        https://bugs.webkit.org/show_bug.cgi?id=42656

        * efl/EWebLauncher/main.c:
        (on_viewport_changed): when listening to signal about viewport meta tag,
        it's not sufficient to receive the parameters. One needs also to enforce
        these parameters in WebKit.
        * efl/ewk/ewk_view.cpp:
        (_ewk_view_priv_new): initialize user_scalable parameter to allow
        browser zooming in and out.

Canonical link: https://commits.webkit.org/54613@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63775 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog

@@ -1,3 +1,21 @@
+2010-07-20  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix zoom in/out on EFL after r62666. The patch for adding viewport
+        missed the initialization of zoom_range.user_scalable. In case browser
+        doesn't care about the viewport and does not listen to the signal,
+        user_scalable will be always false, thus inhibiting zoom in/out.
+        https://bugs.webkit.org/show_bug.cgi?id=42656
+
+        * efl/EWebLauncher/main.c:
+        (on_viewport_changed): when listening to signal about viewport meta tag,
+        it's not sufficient to receive the parameters. One needs also to enforce
+        these parameters in WebKit.
+        * efl/ewk/ewk_view.cpp:
+        (_ewk_view_priv_new): initialize user_scalable parameter to allow
+        browser zooming in and out.
+
 2010-07-16  Zhe Su  <suzhe@chromium.org>
 
         Reviewed by Darin Adler.

WebKit/efl/EWebLauncher/main.c

@@ -413,6 +413,7 @@ on_viewport_changed(void* user_data, Evas_Object* webview, void* event_info)
     app->viewport.minScale = minScale;
     app->viewport.maxScale = maxScale;
     app->viewport.userScalable = (Eina_Bool)userScalable;
+    viewport_set();
 }
 
 static void

WebKit/efl/ewk/ewk_view.cpp

@@ -595,6 +595,7 @@ static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* sd)
     // this functionality will be modified by the scale zoom patch.
     priv->settings.zoom_range.min_scale = ZOOM_MIN;
     priv->settings.zoom_range.max_scale = ZOOM_MAX;
+    priv->settings.zoom_range.user_scalable = EINA_TRUE;
 
     priv->main_frame = _ewk_view_core_frame_new(sd, priv, 0).get();
     if (!priv->main_frame) {