[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

andreas.kling at nokia.com andreas.kling at nokia.com
Sun Feb 20 23:39:27 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 2191bafc3908838feb05bfe898a9cb9115d031c6
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 23 14:33:36 2011 +0000

    2011-01-23  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Don't scale absolute geometry specified by viewport meta tag.
    
            * dom/ViewportArguments.cpp:
            (WebCore::computeViewportAttributes):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d7af540..d721157 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-23  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Don't scale absolute geometry specified by viewport meta tag.
+
+        * dom/ViewportArguments.cpp:
+        (WebCore::computeViewportAttributes):
+
 2011-01-23  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Unreviewed build fix.
diff --git a/Source/WebCore/dom/ViewportArguments.cpp b/Source/WebCore/dom/ViewportArguments.cpp
index d3026e7..5ac1a26 100644
--- a/Source/WebCore/dom/ViewportArguments.cpp
+++ b/Source/WebCore/dom/ViewportArguments.cpp
@@ -98,11 +98,6 @@ ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktop
         availableHeight /= result.devicePixelRatio;
         deviceWidth /= result.devicePixelRatio;
         deviceHeight /= result.devicePixelRatio;
-
-        if (args.width != ViewportArguments::ValueAuto)
-            args.width /= result.devicePixelRatio;
-        if (args.height != ViewportArguments::ValueAuto)
-            args.height /= result.devicePixelRatio;
     }
 
     // Clamp values to range defined by spec and resolve minimum-scale and maximum-scale values

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list