Changeset 38435 in webkit

Timestamp:

Nov 15, 2008 3:24:04 PM (15 years ago)

Author:

krit@webkit.org

Message:

2008-11-15 Dirk Schulze <​krit@webkit.org>

Reviewed by Geoffrey Garen.

r38426 caused a wrong drawing of a LayoutTest. Use another
way to set the color to pass this test again.

• svg/graphics/SVGPaintServerSolid.cpp: (WebCore::SVGPaintServerSolid::setup):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/graphics/SVGPaintServerSolid.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-15  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Geoffrey Garen.
+
+        r38426 caused a wrong drawing of a LayoutTest. Use another
+        way to set the color to pass this test again.
+
+        * svg/graphics/SVGPaintServerSolid.cpp:
+        (WebCore::SVGPaintServerSolid::setup):
+
 2008-11-15  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/svg/graphics/SVGPaintServerSolid.cpp

@@ -67 +67 @@
 
     if ((type & ApplyToFillTargetType) && (!style || svgStyle->hasFill())) {
-        RGBA32 rgba = color().rgb();
-        ASSERT(!color().hasAlpha());
-        if (style)
-            rgba = colorWithOverrideAlpha(rgba, svgStyle->fillOpacity());
-
+        context->setAlpha(svgStyle->fillOpacity());
+        context->setFillColor(color().rgb());
         context->setFillRule(svgStyle->fillRule());
-        context->setFillColor(rgba);
 
         if (isPaintingText)
@@ -80 +76 @@
 
     if ((type & ApplyToStrokeTargetType) && (!style || svgStyle->hasStroke())) {
-        RGBA32 rgba = color().rgb();
-        ASSERT(!color().hasAlpha());
-        if (style)
-            rgba = colorWithOverrideAlpha(rgba, svgStyle->strokeOpacity());
-
-        context->setStrokeColor(rgba);
+        context->setAlpha(svgStyle->strokeOpacity());
+        context->setStrokeColor(color().rgb());
 
         if (style)