[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit e82189598c2aa5d51f91c3d524a6b1d36e2c69ab
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 14:31:55 2004 +0000

            Reviewed by Trey.
    
            - fixed <rdar://problem/3743138> opaque colors come out of getComputedStyle as "rgba", transparent ones as "rgb"
    
            * khtml/css/css_valueimpl.cpp: (CSSPrimitiveValueImpl::cssText): Use "rgb" rather than
            "rgba" when alpha is 0xFF, not when alpha is 0.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7132 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d443d7b..2b0db3b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-07-27  Darin Adler  <darin at apple.com>
+
+        Reviewed by Trey.
+
+        - fixed <rdar://problem/3743138> opaque colors come out of getComputedStyle as "rgba", transparent ones as "rgb"
+
+        * khtml/css/css_valueimpl.cpp: (CSSPrimitiveValueImpl::cssText): Use "rgb" rather than
+        "rgba" when alpha is 0xFF, not when alpha is 0.
+
 2004-07-27  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/css/css_valueimpl.cpp b/WebCore/khtml/css/css_valueimpl.cpp
index a8ca4a2..a853687 100644
--- a/WebCore/khtml/css/css_valueimpl.cpp
+++ b/WebCore/khtml/css/css_valueimpl.cpp
@@ -778,14 +778,14 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const
 	case CSSPrimitiveValue::CSS_RGBCOLOR:
     {
         QColor color(m_value.rgbcolor);
-        if (qAlpha(m_value.rgbcolor))
+        if (qAlpha(m_value.rgbcolor) < 0xFF)
             text = "rgba(";
         else
             text = "rgb(";
         text += QString::number(color.red()) + ", ";
         text += QString::number(color.green()) + ", ";
         text += QString::number(color.blue());
-        if (qAlpha(m_value.rgbcolor))
+        if (qAlpha(m_value.rgbcolor) < 0xFF)
             text += ", " + QString::number((float)qAlpha(m_value.rgbcolor) / 0xFF);
 	    text += ")";
 	    break;

-- 
WebKit Debian packaging