Changeset 38785 in webkit

Timestamp:

Nov 26, 2008 7:07:30 AM (15 years ago)

Author:

krit@webkit.org

Message:

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

Reviewed by Simon Hausmann.

Transformations to the context shouldn't transform the currentPath.
Fixed this on Qt.

[QT] GraphicsContext's currenPath can be transformed
​https://bugs.webkit.org/show_bug.cgi?id=22163

• platform/graphics/GraphicsContextPrivate.h:
• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::restorePlatformState): (WebCore::GraphicsContext::fillPath): (WebCore::GraphicsContext::strokePath): (WebCore::GraphicsContext::fillRect): (WebCore::GraphicsContext::translate): (WebCore::GraphicsContext::rotate): (WebCore::GraphicsContext::scale): (WebCore::GraphicsContext::concatCTM):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContextPrivate.h (modified) (2 diffs)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (8 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-26  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Transformations to the context shouldn't transform the currentPath.
+        Fixed this on Qt.
+
+        [QT] GraphicsContext's currenPath can be transformed
+        https://bugs.webkit.org/show_bug.cgi?id=22163
+
+        * platform/graphics/GraphicsContextPrivate.h:
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::restorePlatformState):
+        (WebCore::GraphicsContext::fillPath):
+        (WebCore::GraphicsContext::strokePath):
+        (WebCore::GraphicsContext::fillRect):
+        (WebCore::GraphicsContext::translate):
+        (WebCore::GraphicsContext::rotate):
+        (WebCore::GraphicsContext::scale):
+        (WebCore::GraphicsContext::concatCTM):
+
 2008-11-26  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/WebCore/platform/graphics/GraphicsContextPrivate.h

@@ -27 +27 @@
 #define GraphicsContextPrivate_h
 
+#include "AffineTransform.h"
 #include "Font.h"
 #include "Gradient.h"
@@ -71 +72 @@
 #if PLATFORM(CAIRO)
         float globalAlpha;
+#elif PLATFORM(QT)
+        AffineTransform pathTransform;
 #endif
         ColorSpace strokeColorSpace;

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -294 +294 @@
 {
     m_data->p()->restore();
+
+    if (!m_data->currentPath.isEmpty() && m_common->state.pathTransform.isInvertible()) {
+        QMatrix matrix = m_common->state.pathTransform;
+        m_data->currentPath = m_data->currentPath * matrix;
+    }
 }
 
@@ -545 +550 @@
         break;
     }
+    m_data->currentPath = QPainterPath();
 }
 
@@ -577 +583 @@
     }
     }
+    m_data->currentPath = QPainterPath();
 }
 
@@ -600 +607 @@
         break;
     }
+    m_data->currentPath = QPainterPath();
 }
 
@@ -921 +929 @@
 
     m_data->p()->translate(x, y);
+
+    if (!m_data->currentPath.isEmpty()) {
+        QMatrix matrix;
+        m_data->currentPath = m_data->currentPath * matrix.translate(-x, -y);
+        m_common->state.pathTransform.translate(x, y);
+    }
 }
 
@@ -937 +951 @@
 
     m_data->p()->rotate(180/M_PI*radians);
+
+    if (!m_data->currentPath.isEmpty()) {
+        QMatrix matrix;
+        m_data->currentPath = m_data->currentPath * matrix.rotate(-180/M_PI*radians);
+        m_common->state.pathTransform.rotate(radians);
+    }
 }
 
@@ -945 +965 @@
 
     m_data->p()->scale(s.width(), s.height());
+
+    if (!m_data->currentPath.isEmpty()) {
+        QMatrix matrix;
+        m_data->currentPath = m_data->currentPath * matrix.scale(1 / s.width(), 1 / s.height());
+        m_common->state.pathTransform.scale(s.width(), s.height());
+    }
 }
 
@@ -1008 +1034 @@
 
     m_data->p()->setMatrix(transform, true);
+
+    // Transformations to the context shouldn't transform the currentPath. 
+    // We have to undo every change made to the context from the currentPath to avoid wrong drawings.
+    if (!m_data->currentPath.isEmpty() && transform.isInvertible()) {
+        QMatrix matrix = transform.inverse();
+        m_data->currentPath = m_data->currentPath * matrix;
+        m_common->state.pathTransform.multiply(transform);
+    }
 }