[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 a47b1db96a2f10607f49d6180c8acf19a5334f66
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 17:26:42 2010 +0000

    2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Fixing viewport meta tag user-scalable handling
            https://bugs.webkit.org/show_bug.cgi?id=47330
    
            user-scalable attribute was not considered in viewport meta tag handling.
    
            * dom/ViewportArguments.cpp:
            (WebCore::findConfigurationForViewportData):
            * dom/ViewportArguments.h:
    2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Fixing viewport meta tag user-scalable handling
            https://bugs.webkit.org/show_bug.cgi?id=47330
    
            user-scalable attribute was not considered in viewport meta tag handling.
    
            * Api/qwebpage.cpp:
            (QWebPage::viewportConfigurationForSize):
    2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Fixing viewport meta tag user-scalable handling
            https://bugs.webkit.org/show_bug.cgi?id=47330
    
            user-scalable attribute was not considered in viewport meta tag handling.
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPage::viewportConfigurationForSize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69316 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 85c7bdf..8acb50e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fixing viewport meta tag user-scalable handling
+        https://bugs.webkit.org/show_bug.cgi?id=47330
+
+        user-scalable attribute was not considered in viewport meta tag handling.
+
+        * dom/ViewportArguments.cpp:
+        (WebCore::findConfigurationForViewportData):
+        * dom/ViewportArguments.h:
+
 2010-10-05  Diego Gonzalez  <diegohcg at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/dom/ViewportArguments.cpp b/WebCore/dom/ViewportArguments.cpp
index 74ff19d..d2e6684 100644
--- a/WebCore/dom/ViewportArguments.cpp
+++ b/WebCore/dom/ViewportArguments.cpp
@@ -157,6 +157,11 @@ ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktop
     // Update minimum scale factor, to never allow zooming out more than viewport
     result.minimumScale = max(result.minimumScale, max(availableWidth / width, availableHeight / height));
 
+    result.userScalable = args.userScalable;
+    // Make maximum and minimum scale equal to the initial scale if user is not allowed to zoom in/out.
+    if (!args.userScalable)
+        result.maximumScale = result.minimumScale = result.initialScale;
+
     return result;
 }
 
diff --git a/WebCore/dom/ViewportArguments.h b/WebCore/dom/ViewportArguments.h
index de1745b..a31e009 100644
--- a/WebCore/dom/ViewportArguments.h
+++ b/WebCore/dom/ViewportArguments.h
@@ -50,6 +50,8 @@ struct ViewportAttributes {
     float initialScale;
     float minimumScale;
     float maximumScale;
+
+    bool userScalable;
 };
 
 struct ViewportArguments {
@@ -83,7 +85,7 @@ struct ViewportArguments {
     float height;
     float targetDensityDpi;
 
-    float userScalable;
+    bool userScalable;
 
     bool operator==(const ViewportArguments& other) const
     {
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index b63d257..e9699d7 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2258,6 +2258,7 @@ QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(const QSi
     result.m_minimumScaleFactor = conf.minimumScale;
     result.m_maximumScaleFactor = conf.maximumScale;
     result.m_devicePixelRatio = conf.devicePixelRatio;
+    result.m_isUserScalable = conf.userScalable;
 
     return result;
 }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 712ae75..6d33f3e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fixing viewport meta tag user-scalable handling
+        https://bugs.webkit.org/show_bug.cgi?id=47330
+
+        user-scalable attribute was not considered in viewport meta tag handling.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::viewportConfigurationForSize):
+
 2010-10-05  Diego Gonzalez  <diegohcg at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5d5a852..2e2594c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fixing viewport meta tag user-scalable handling
+        https://bugs.webkit.org/show_bug.cgi?id=47330
+
+        user-scalable attribute was not considered in viewport meta tag handling.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::viewportConfigurationForSize):
+
 2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>, Andras Becsi  <abecsi at webkit.org>, Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 1595c63..411883b 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -349,6 +349,7 @@ QWKPage::ViewportConfiguration QWKPage::viewportConfigurationForSize(QSize avail
     result.m_minimumScaleFactor = conf.minimumScale;
     result.m_maximumScaleFactor = conf.maximumScale;
     result.m_devicePixelRatio = conf.devicePixelRatio;
+    result.m_isUserScalable = conf.userScalable;
 
     return result;
 }

-- 
WebKit Debian packaging