[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ariya at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 104b1039f8481fa3917e35ccc86e7ee9dc123781
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 24 16:20:26 2010 +0000

    2010-02-24  Ariya Hidayat  <ariya.hidayat at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Faster cut-off for rectangle fill without shadow.
            https://bugs.webkit.org/show_bug.cgi?id=35337
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55193 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 67bc041..3dd41ce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-24  Ariya Hidayat  <ariya.hidayat at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Faster cut-off for rectangle fill without shadow.
+        https://bugs.webkit.org/show_bug.cgi?id=35337
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+
 2010-02-24  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by nobody, build fix.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 4204cbb..d1c55db 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -616,7 +616,8 @@ void GraphicsContext::fillRect(const FloatRect& rect)
     QPainter* p = m_data->p();
 
     if (m_common->state.fillPattern || m_common->state.fillGradient || fillColor().alpha()) {
-        drawBorderlessRectShadow(this, p, rect);
+        if (m_common->state.shadowColor.isValid())
+            drawBorderlessRectShadow(this, p, rect);
         if (m_common->state.fillPattern) {
             AffineTransform affine;
             p->fillRect(rect, QBrush(m_common->state.fillPattern->createPlatformPattern(affine)));
@@ -638,7 +639,8 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& c, ColorSpace
 
     m_data->solidColor.setColor(c);
     QPainter* p = m_data->p();
-    drawBorderlessRectShadow(this, p, rect);
+    if (m_common->state.shadowColor.isValid())
+        drawBorderlessRectShadow(this, p, rect);
     p->fillRect(rect, m_data->solidColor);
 }
 

-- 
WebKit Debian packaging