Reviewed by ap.

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

diff --git a/WebCore/kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp b/WebCore/kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp
index 23e8e102c7254ecbbbf2b8f2d4e3b90bb41fa5f5..3e3a7282c59046b7dafb1aba992058d893e142f6 100644 (file)
--- a/WebCore/kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp
+++ b/WebCore/kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp
@@ -26,7 +26,7 @@
 #include <QPointF>
 
 #include "RenderStyle.h"
 #include <QPointF>
 
 #include "RenderStyle.h"

-#include "KCanvasMatrix.h"
+#include "AffineTransform.h"

 #include "KRenderingDeviceQt.h"
 #include "KCanvasRenderingStyle.h"
 #include "KRenderingFillPainter.h"
 #include "KRenderingDeviceQt.h"
 #include "KCanvasRenderingStyle.h"
 #include "KRenderingFillPainter.h"


@@ -95,13 +95,12 @@ bool KRenderingPaintServerLinearGradientQt::setup(KRenderingDeviceContext* conte
     qtContext->painter().setBrush(Qt::NoBrush);
 
     QLinearGradient gradient(QPointF(x1, y1), QPointF(x2, y2));
     qtContext->painter().setBrush(Qt::NoBrush);
 
     QLinearGradient gradient(QPointF(x1, y1), QPointF(x2, y2));

-    if (spreadMethod() == SPREADMETHOD_REPEAT) {
+    if (spreadMethod() == SPREADMETHOD_REPEAT)

         gradient.setSpread(QGradient::RepeatSpread);
         gradient.setSpread(QGradient::RepeatSpread);

-    } else if (spreadMethod() == SPREADMETHOD_REFLECT) {
+    else if (spreadMethod() == SPREADMETHOD_REFLECT)

         gradient.setSpread(QGradient::ReflectSpread);
         gradient.setSpread(QGradient::ReflectSpread);

-    } else {
+    else

         gradient.setSpread(QGradient::PadSpread);
         gradient.setSpread(QGradient::PadSpread);

-    }

 
     double opacity = 1.0;
 
 
     double opacity = 1.0;
 


@@ -164,7 +163,7 @@ bool KRenderingPaintServerRadialGradientQt::setup(KRenderingDeviceContext* conte
 
     qtContext->painter().setPen(Qt::NoPen);
     qtContext->painter().setBrush(Qt::NoBrush);
 
     qtContext->painter().setPen(Qt::NoPen);
     qtContext->painter().setBrush(Qt::NoBrush);

-    QMatrix mat = qtContext->ctm().matrix();
+    QMatrix mat = qtContext->ctm();

 
     double cx, fx, cy, fy, r;
     if (boundingBoxMode()) {
 
     double cx, fx, cy, fy, r;
     if (boundingBoxMode()) {


@@ -207,20 +206,19 @@ bool KRenderingPaintServerRadialGradientQt::setup(KRenderingDeviceContext* conte
     }
 
     QRadialGradient gradient(QPointF(cx, cy), gradientRadius(), QPointF(fx + cx, fy + cy));
     }
 
     QRadialGradient gradient(QPointF(cx, cy), gradientRadius(), QPointF(fx + cx, fy + cy));

-    if (spreadMethod() == SPREADMETHOD_REPEAT) {
+    if (spreadMethod() == SPREADMETHOD_REPEAT)

         gradient.setSpread(QGradient::RepeatSpread);
         gradient.setSpread(QGradient::RepeatSpread);

-    } else if (spreadMethod() == SPREADMETHOD_REFLECT) {
+    else if (spreadMethod() == SPREADMETHOD_REFLECT)

         gradient.setSpread(QGradient::ReflectSpread);
         gradient.setSpread(QGradient::ReflectSpread);

-    } else {
+    else

         gradient.setSpread(QGradient::PadSpread);
         gradient.setSpread(QGradient::PadSpread);

-    }

 
     double opacity = 1.0;
 
     // TODO: Gradient transform + opacity fixes! 
 
 
     double opacity = 1.0;
 
     // TODO: Gradient transform + opacity fixes! 
 

-    // KCanvasMatrix gradientTrans = gradientTransform();
-    // gradientTrans.qmatrix().map(cx, cy, &cx, &cy);
+    // AffineTransform gradientTrans = gradientTransform();
+    // gradientTrans.map(cx, cy, &cx, &cy);

     // qtContext->painter().setMatrix(mat);
 
     if ((type & APPLY_TO_FILL) && KSVGPainterFactory::isFilled(renderStyle)) {
     // qtContext->painter().setMatrix(mat);
 
     if ((type & APPLY_TO_FILL) && KSVGPainterFactory::isFilled(renderStyle)) {