[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4efc05e041c1b5a9deddfd7f94abe39d798bc593
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 14:06:50 2009 +0000

    Do not create valid QColor's for invalid WebCore::Color's.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-07
    Reviewed by Simon Hausmann.
    
    * platform/graphics/qt/ColorQt.cpp:
    (WebCore::Color::operator QColor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7a7bb2d..408ae7e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-07  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Do not create valid QColor's for invalid WebCore::Color's.
+
+        * platform/graphics/qt/ColorQt.cpp:
+        (WebCore::Color::operator QColor):
+
 2009-10-07  Janne Koskinen  <janne.p.koskinen at digia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/platform/graphics/qt/ColorQt.cpp b/WebCore/platform/graphics/qt/ColorQt.cpp
index 5d16740..151766a 100644
--- a/WebCore/platform/graphics/qt/ColorQt.cpp
+++ b/WebCore/platform/graphics/qt/ColorQt.cpp
@@ -40,7 +40,10 @@ Color::Color(const QColor& c)
 
 Color::operator QColor() const
 {
-    return QColor(red(), green(), blue(), alpha());
+    if (m_valid)
+        return QColor(red(), green(), blue(), alpha());
+    else
+        return QColor();
 }
 
 }

-- 
WebKit Debian packaging