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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 43b9883616e9ccf655781e3ad2c61bed9ee02bcb
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 12:26:27 2010 +0000

    2010-11-16  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            Viewport meta tag: Fix geometry computation
    
            Available width and height should also be divided by the device pixel ratio.
    
            * dom/ViewportArguments.cpp:
            (WebCore::computeViewportAttributes):
            * platform/network/qt/DnsPrefetchHelper.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3f29830..d3fc4fe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-16  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Viewport meta tag: Fix geometry computation
+
+        Available width and height should also be divided by the device pixel ratio.
+
+        * dom/ViewportArguments.cpp:
+        (WebCore::computeViewportAttributes):
+        * platform/network/qt/DnsPrefetchHelper.cpp:
+
 2010-11-12  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/dom/ViewportArguments.cpp b/WebCore/dom/ViewportArguments.cpp
index d2e6684..c3d1fc4 100644
--- a/WebCore/dom/ViewportArguments.cpp
+++ b/WebCore/dom/ViewportArguments.cpp
@@ -78,6 +78,8 @@ ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktop
 
     // Resolve non-'auto' width and height to pixel values.
     if (deviceDPI != 1.0) {
+        availableWidth /= result.devicePixelRatio;
+        availableHeight /= result.devicePixelRatio;
         deviceWidth /= result.devicePixelRatio;
         deviceHeight /= result.devicePixelRatio;
 

-- 
WebKit Debian packaging