Changeset 60933 in webkit

Timestamp:

Jun 9, 2010 8:47:50 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-09 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Failed at ​http://philip.html5.org/tests/canvas/suite/tests/2d.path.arcTo.transformation.html
​https://bugs.webkit.org/show_bug.cgi?id=38598

Remove canvas/philip/tests/2d.path.arcTo.scale.html, canvas/philip/tests/2d.path.arcTo.transformation.html
and canvas/philip/tests/2d.path.transformation.changing.html from Skipped.

• platform/qt/Skipped:

2010-06-09 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Failed at ​http://philip.html5.org/tests/canvas/suite/tests/2d.path.arcTo.transformation.html
​https://bugs.webkit.org/show_bug.cgi?id=38598

In path transform function handle path only have moveElement case.

• platform/graphics/qt/PathQt.cpp: (WebCore::Path::transform):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/PathQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-09  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Failed at http://philip.html5.org/tests/canvas/suite/tests/2d.path.arcTo.transformation.html
+        https://bugs.webkit.org/show_bug.cgi?id=38598
+
+        Remove canvas/philip/tests/2d.path.arcTo.scale.html, canvas/philip/tests/2d.path.arcTo.transformation.html
+        and canvas/philip/tests/2d.path.transformation.changing.html from Skipped.
+
+        * platform/qt/Skipped:
+
 2010-06-09  Adam Barth  <abarth@webkit.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5320 +5320 @@
 canvas/philip/tests/2d.path.arcTo.collinear.2.html
 canvas/philip/tests/2d.path.arcTo.collinear.3.html
-canvas/philip/tests/2d.path.arcTo.scale.html
-canvas/philip/tests/2d.path.arcTo.transformation.html
 canvas/philip/tests/2d.path.bezierCurveTo.ensuresubpath.2.html
 canvas/philip/tests/2d.path.quadraticCurveTo.ensuresubpath.2.html
@@ -5331 +5329 @@
 canvas/philip/tests/2d.path.stroke.prune.arc.html
 canvas/philip/tests/2d.path.stroke.scale2.html
-canvas/philip/tests/2d.path.transformation.changing.html
 canvas/philip/tests/2d.pattern.basic.type.html
 canvas/philip/tests/2d.pattern.image.broken.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-09  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Failed at http://philip.html5.org/tests/canvas/suite/tests/2d.path.arcTo.transformation.html
+        https://bugs.webkit.org/show_bug.cgi?id=38598
+
+        In path transform function handle path only have moveElement case.
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::transform):
+
 2010-06-09  Anton Muhin  <antonm@chromium.org>
 

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

@@ -439 +439 @@
 void Path::transform(const AffineTransform& transform)
 {
-    m_path = QTransform(transform).map(m_path);
+    QTransform qTransform(transform);
+#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
+    // Workaround for http://bugreports.qt.nokia.com/browse/QTBUG-11264
+    // QTransform.map doesn't handle the MoveTo element because of the isEmpty issue
+    if (m_path.isEmpty() && m_path.elementCount()) {
+        QPointF point = qTransform.map(m_path.currentPosition());
+        m_path.moveTo(point);
+    } else 
+#endif
+        m_path = qTransform.map(m_path);
 }