2006-10-05 Nikolas Zimmermann <zimmermann@kde.org>

[WebKit-https.git] / WebCore / kcanvas / device / qt / KRenderingPaintServerSolidQt.cpp

diff --git a/WebCore/kcanvas/device/qt/KRenderingPaintServerSolidQt.cpp b/WebCore/kcanvas/device/qt/KRenderingPaintServerSolidQt.cpp
index 3a2ef49140c45e3bfc29a8b250a76a3c0920c6b1..343c49d6127feb4e7c5b089650c81824c3627e63 100644 (file)
--- a/WebCore/kcanvas/device/qt/KRenderingPaintServerSolidQt.cpp
+++ b/WebCore/kcanvas/device/qt/KRenderingPaintServerSolidQt.cpp
@@ -64,7 +64,7 @@ bool KRenderingPaintServerSolidQt::setup(KRenderingDeviceContext* context, const
 
     QColor c = color();
 
 
     QColor c = color();
 

-    if ((type & APPLY_TO_FILL) && KSVGPainterFactory::isFilled(renderStyle)) {
+    if ((type & APPLY_TO_FILL) && renderStyle->svgStyle()->hasFill()) {

         KRenderingFillPainter fillPainter = KSVGPainterFactory::fillPainter(renderStyle, object);
         c.setAlphaF(fillPainter.opacity());
 
         KRenderingFillPainter fillPainter = KSVGPainterFactory::fillPainter(renderStyle, object);
         c.setAlphaF(fillPainter.opacity());
 


@@ -75,7 +75,7 @@ bool KRenderingPaintServerSolidQt::setup(KRenderingDeviceContext* context, const
         /* if(isPaintingText()) ... */
     }
 
         /* if(isPaintingText()) ... */
     }
 

-    if((type & APPLY_TO_STROKE) && KSVGPainterFactory::isStroked(renderStyle)) {
+    if((type & APPLY_TO_STROKE) && renderStyle->svgStyle()->hasStroke()) {

         KRenderingStrokePainter strokePainter = KSVGPainterFactory::strokePainter(renderStyle, object);
         c.setAlphaF(strokePainter.opacity());
 
         KRenderingStrokePainter strokePainter = KSVGPainterFactory::strokePainter(renderStyle, object);
         c.setAlphaF(strokePainter.opacity());
 


@@ -98,10 +98,10 @@ void KRenderingPaintServerSolidQt::renderPath(KRenderingDeviceContext* context,
     RenderStyle* renderStyle = path->style();
     KRenderingDeviceContextQt* qtContext = static_cast<KRenderingDeviceContextQt*>(context);
 
     RenderStyle* renderStyle = path->style();
     KRenderingDeviceContextQt* qtContext = static_cast<KRenderingDeviceContextQt*>(context);
 

-    if ((type & APPLY_TO_FILL) && KSVGPainterFactory::isFilled(renderStyle))
+    if ((type & APPLY_TO_FILL) && renderStyle->svgStyle()->hasFill())

         qtContext->fillPath();
 
         qtContext->fillPath();
 

-    if ((type & APPLY_TO_STROKE) && KSVGPainterFactory::isStroked(renderStyle))
+    if ((type & APPLY_TO_STROKE) && renderStyle->svgStyle()->hasStroke())

         qtContext->strokePath();
 }
 
         qtContext->strokePath();
 }