[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 457c887d3785fcdab654306e264276650919b7a7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 2 00:24:10 2010 +0000

    2010-10-01  Ragner Magalhaes  <ragner.magalhaes at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Segmentation fault during zoom out
            https://bugs.webkit.org/show_bug.cgi?id=46984
    
            * platform/qt/QtMobileWebStyle.cpp:
            (QtMobileWebStyle::drawChecker): Adjust checkerSize to be greater than or equals to middle.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68959 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f98d359..b862496 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-01  Ragner Magalhaes  <ragner.magalhaes at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Segmentation fault during zoom out
+        https://bugs.webkit.org/show_bug.cgi?id=46984
+
+        * platform/qt/QtMobileWebStyle.cpp:
+        (QtMobileWebStyle::drawChecker): Adjust checkerSize to be greater than or equals to middle.
+
 2010-10-01  Anders Carlsson  <andersca at apple.com>
 
         Another Qt build fix attempt.
diff --git a/WebCore/platform/qt/QtMobileWebStyle.cpp b/WebCore/platform/qt/QtMobileWebStyle.cpp
index 0748320..240faa5 100644
--- a/WebCore/platform/qt/QtMobileWebStyle.cpp
+++ b/WebCore/platform/qt/QtMobileWebStyle.cpp
@@ -47,7 +47,7 @@ static inline void drawRectangularControlBackground(QPainter* painter, const QPe
 void QtMobileWebStyle::drawChecker(QPainter* painter, int size, QColor color) const
 {
     int border = qMin(qMax(1, int(0.2 * size)), 6);
-    int checkerSize = size - 2 * border;
+    int checkerSize = qMax(size - 2 * border, 3);
     int width = checkerSize / 3;
     int middle = qMax(3 * checkerSize / 7, 3);
     int x = ((size - checkerSize) >> 1);

-- 
WebKit Debian packaging