Reviewed by ap.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
        WebKit should have Qt platform support (Part II)

        Adapt the KCanvas Qt device to Rob's KCanvasMatrix removal.
        Use AffineTransform everywhere instead.

        * kcanvas/device/qt/KRenderingDeviceQt.cpp:
        (WebCore::KRenderingDeviceContextQt::KRenderingDeviceContextQt):
        (WebCore::KRenderingDeviceContextQt::concatCTM):
        (WebCore::KRenderingDeviceContextQt::ctm):
        * kcanvas/device/qt/KRenderingDeviceQt.h:
        * kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp:
        (WebCore::KRenderingPaintServerLinearGradientQt::setup):
        (WebCore::KRenderingPaintServerRadialGradientQt::setup):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7dc478362b6ffb0aab465083a6e06e05a864f76c..4a07607f9862e22107be89e0eb0f45620d1af143 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2006-08-24  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by ap.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
+        WebKit should have Qt platform support (Part II)
+
+        Adapt the KCanvas Qt device to Rob's KCanvasMatrix removal.
+        Use AffineTransform everywhere instead.
+
+        * kcanvas/device/qt/KRenderingDeviceQt.cpp:
+        (WebCore::KRenderingDeviceContextQt::KRenderingDeviceContextQt):
+        (WebCore::KRenderingDeviceContextQt::concatCTM):
+        (WebCore::KRenderingDeviceContextQt::ctm):
+        * kcanvas/device/qt/KRenderingDeviceQt.h:
+        * kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp:
+        (WebCore::KRenderingPaintServerLinearGradientQt::setup):
+        (WebCore::KRenderingPaintServerRadialGradientQt::setup):
+
 2006-08-24  Rob Buis  <buis@kde.org>
 
         Reviewed by Darin.

diff --git a/WebCore/kcanvas/device/qt/KRenderingDeviceQt.cpp b/WebCore/kcanvas/device/qt/KRenderingDeviceQt.cpp
index 6a526842a4a7f04f591bad0aca71e4d611cd9e44..539430d93aeaa04edf71e0af46034c31b74258a5 100644 (file)
--- a/WebCore/kcanvas/device/qt/KRenderingDeviceQt.cpp
+++ b/WebCore/kcanvas/device/qt/KRenderingDeviceQt.cpp
@@ -24,10 +24,10 @@
 
 #include "IntRect.h"
 #include "RenderPathQt.h"
-#include "KCanvasMatrix.h"
 #include "KCanvasPathQt.h"
-#include "KCanvasClipperQt.h"
+#include "AffineTransform.h"
 #include "GraphicsContext.h"
+#include "KCanvasClipperQt.h"
 #include "KRenderingDeviceQt.h"
 #include "KRenderingPaintServerSolidQt.h"
 #include "KRenderingPaintServerGradientQt.h"
@@ -37,7 +37,7 @@ namespace WebCore {
 
 KRenderingDeviceContextQt::KRenderingDeviceContextQt(QPainter* painter)
     : m_painter(painter)
-      , m_path()
+    , m_path()
 {
     Q_ASSERT(m_painter != 0);
 }
@@ -46,16 +46,16 @@ KRenderingDeviceContextQt::~KRenderingDeviceContextQt()
 {
 }
 
-KCanvasMatrix KRenderingDeviceContextQt::concatCTM(const KCanvasMatrix& worldMatrix)
+AffineTransform KRenderingDeviceContextQt::concatCTM(const AffineTransform& worldMatrix)
 {
-    KCanvasMatrix ret = ctm();
-    m_painter->setMatrix(worldMatrix.matrix(), true);
+    AffineTransform ret = ctm();
+    m_painter->setMatrix(worldMatrix, true);
     return ret;
 }
 
-KCanvasMatrix KRenderingDeviceContextQt::ctm() const
+AffineTransform KRenderingDeviceContextQt::ctm() const
 {
-    return KCanvasMatrix(m_painter->matrix());
+    return AffineTransform(m_painter->matrix());
 }
 
 IntRect KRenderingDeviceContextQt::mapFromVisual(const IntRect& rect)

diff --git a/WebCore/kcanvas/device/qt/KRenderingDeviceQt.h b/WebCore/kcanvas/device/qt/KRenderingDeviceQt.h
index fcfe3b093200356bfaedca7e633532dbc71d32dd..c64598f404797255d9db8092e1651ad7120dd4fc 100644 (file)
--- a/WebCore/kcanvas/device/qt/KRenderingDeviceQt.h
+++ b/WebCore/kcanvas/device/qt/KRenderingDeviceQt.h
@@ -36,8 +36,8 @@ public:
     KRenderingDeviceContextQt(QPainter*);
     virtual ~KRenderingDeviceContextQt();
 
-    virtual KCanvasMatrix concatCTM(const KCanvasMatrix&);
-    virtual KCanvasMatrix ctm() const;
+    virtual AffineTransform concatCTM(const AffineTransform&);
+    virtual AffineTransform ctm() const;
 
     virtual IntRect mapFromVisual(const IntRect&);
     virtual IntRect mapToVisual(const IntRect&);

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 "KCanvasMatrix.h"
+#include "AffineTransform.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));
-    if (spreadMethod() == SPREADMETHOD_REPEAT) {
+    if (spreadMethod() == SPREADMETHOD_REPEAT)
         gradient.setSpread(QGradient::RepeatSpread);
-    } else if (spreadMethod() == SPREADMETHOD_REFLECT) {
+    else if (spreadMethod() == SPREADMETHOD_REFLECT)
         gradient.setSpread(QGradient::ReflectSpread);
-    } else {
+    else
         gradient.setSpread(QGradient::PadSpread);
-    }
 
     double opacity = 1.0;
 
@@ -164,7 +163,7 @@ bool KRenderingPaintServerRadialGradientQt::setup(KRenderingDeviceContext* conte
 
     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()) {
@@ -207,20 +206,19 @@ bool KRenderingPaintServerRadialGradientQt::setup(KRenderingDeviceContext* conte
     }
 
     QRadialGradient gradient(QPointF(cx, cy), gradientRadius(), QPointF(fx + cx, fy + cy));
-    if (spreadMethod() == SPREADMETHOD_REPEAT) {
+    if (spreadMethod() == SPREADMETHOD_REPEAT)
         gradient.setSpread(QGradient::RepeatSpread);
-    } else if (spreadMethod() == SPREADMETHOD_REFLECT) {
+    else if (spreadMethod() == SPREADMETHOD_REFLECT)
         gradient.setSpread(QGradient::ReflectSpread);
-    } else {
+    else
         gradient.setSpread(QGradient::PadSpread);
-    }
 
     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)) {