[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 4260900e2642e46ce93f1accb7fa092227eef72e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 21:45:03 2010 +0000

    2010-07-20  Lucas De Marchi  <lucas.demarchi at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63775 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ce0c379..d4d2431 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2010-07-20  Lucas De Marchi  <lucas.demarchi at 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 at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/efl/EWebLauncher/main.c b/WebKit/efl/EWebLauncher/main.c
index 362eefd..6980a58 100644
--- a/WebKit/efl/EWebLauncher/main.c
+++ b/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
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 6ce8eda..1707a7d 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/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) {

-- 
WebKit Debian packaging