[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 333fbedb9293e88eb99ab65951e42d355be9aa95
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 03:37:14 2010 +0000

    2010-09-14  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Zoom factor for checkboxes and radios.
            https://bugs.webkit.org/show_bug.cgi?id=45776
    
            RenderThemeQt does not consider RenderStyle::effectiveZoom when calculating sizes of
            checkboxes and radios.
    
            Even with this change the used QStyle must support different sizes for radios and checkboxes.
            QWindowStyle and QMacStyle, for example, do not.
    
            * platform/qt/RenderThemeQt.cpp:
            (WebCore::RenderThemeQt::computeSizeBasedOnStyle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67531 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eb68040..62be6a6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-14  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Zoom factor for checkboxes and radios.
+        https://bugs.webkit.org/show_bug.cgi?id=45776
+
+        RenderThemeQt does not consider RenderStyle::effectiveZoom when calculating sizes of
+        checkboxes and radios.
+
+        Even with this change the used QStyle must support different sizes for radios and checkboxes.
+        QWindowStyle and QMacStyle, for example, do not.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::computeSizeBasedOnStyle):
+
 2010-09-14  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 870f0eb..4a461ac 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -380,6 +380,7 @@ void RenderThemeQt::computeSizeBasedOnStyle(RenderStyle* renderStyle) const
         QStyleOption styleOption;
         styleOption.state |= QStyle::State_Small;
         int checkBoxWidth = style->pixelMetric(QStyle::PM_IndicatorWidth, &styleOption);
+        checkBoxWidth *= renderStyle->effectiveZoom();
         size = QSize(checkBoxWidth, checkBoxWidth);
         break;
     }
@@ -387,6 +388,7 @@ void RenderThemeQt::computeSizeBasedOnStyle(RenderStyle* renderStyle) const
         QStyleOption styleOption;
         styleOption.state |= QStyle::State_Small;
         int radioWidth = style->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &styleOption);
+        radioWidth *= renderStyle->effectiveZoom();
         size = QSize(radioWidth, radioWidth);
         break;
     }

-- 
WebKit Debian packaging