[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[ariya at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4dda6820fd799a604613a0b0bde4fd0433c92d8b
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 17:43:17 2010 +0000

    2010-02-04  Ariya Hidayat  <ariya.hidayat at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Unnecessary QBrush construction for doing a solid fill
            https://bugs.webkit.org/show_bug.cgi?id=34559
    
            Use the similar trick like r37421, i.e. use the special brush for
            solid color to avoid creating QBrush again and again.
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::setPlatformFillColor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54347 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d466275..c6618e2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-04  Ariya Hidayat  <ariya.hidayat at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Unnecessary QBrush construction for doing a solid fill
+        https://bugs.webkit.org/show_bug.cgi?id=34559
+
+        Use the similar trick like r37421, i.e. use the special brush for
+        solid color to avoid creating QBrush again and again.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::setPlatformFillColor):
+
 2010-02-04  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 9046449..938d7b2 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1270,7 +1270,8 @@ void GraphicsContext::setPlatformFillColor(const Color& color, ColorSpace colorS
 {
     if (paintingDisabled())
         return;
-    m_data->p()->setBrush(QBrush(color));
+    m_data->solidColor.setColor(color);
+    m_data->p()->setBrush(m_data->solidColor);
 }
 
 void GraphicsContext::setPlatformShouldAntialias(bool enable)

-- 
WebKit Debian packaging