[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kenneth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a6fac293cc0342bf1142dcf08d043095c2324b60
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 10:00:10 2010 +0000

    2010-08-06  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Add support for the Android viewport meta tag extensions.
            http://webkit.org/b/43567
    
            * Api/qwebpage.h:
            * WebCoreSupport/ChromeClientQt.cpp:
            (WebCore::ChromeClientQt::didReceiveViewportArguments):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64825 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index f0d2438..14f3b8b 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -217,6 +217,7 @@ public:
         inline qreal initialScaleFactor() const { return m_initialScaleFactor; };
         inline qreal minimumScaleFactor() const { return m_minimumScaleFactor; };
         inline qreal maximumScaleFactor() const { return m_maximumScaleFactor; };
+        inline int targetDensityDpi() const { return m_targetDensityDpi; };
         inline bool isUserScalable() const { return m_isUserScalable; };
         inline bool isValid() const { return m_isValid; };
         inline QSize size() const { return m_size; };
@@ -226,6 +227,7 @@ public:
         qreal m_initialScaleFactor;
         qreal m_minimumScaleFactor;
         qreal m_maximumScaleFactor;
+        int m_targetDensityDpi;
         bool m_isUserScalable;
         bool m_isValid;
         QSize m_size;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3dcf39f..a2c34c9 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-06  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Add support for the Android viewport meta tag extensions.
+        http://webkit.org/b/43567
+
+        * Api/qwebpage.h:
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::didReceiveViewportArguments):
+
 2010-08-05  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index a0bac72..e9e8812 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -620,6 +620,7 @@ void ChromeClientQt::didReceiveViewportArguments(Frame* frame, const ViewportArg
     hints.m_initialScaleFactor = arguments.initialScale;
     hints.m_minimumScaleFactor = arguments.minimumScale;
     hints.m_maximumScaleFactor = arguments.maximumScale;
+    hints.m_targetDensityDpi = arguments.targetDensityDpi;
     hints.m_isUserScalable = isUserScalable;
 
     emit m_webPage->viewportChangeRequested(hints);

-- 
WebKit Debian packaging