Changeset 66979 in webkit

Timestamp:

Sep 8, 2010 7:07:01 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-08 Jan E Hanssen <​jhanssen@sencha.com>

Reviewed by Dirk Schulze.

Add a test for getting a point beyond the length of the path
​https://bugs.webkit.org/show_bug.cgi?id=43837

• svg/dom/path-pointAtLength-expected.txt:
• svg/dom/script-tests/path-pointAtLength.js:

2010-09-08 Jan E Hanssen <​jhanssen@sencha.com>

Reviewed by Dirk Schulze.

[Qt] PathQt should use the QPainterPath functionality for calculations
​https://bugs.webkit.org/show_bug.cgi?id=43837

Change PathQt to use the built-in functionality of QPainterPath for
calculating length(), pointAtLength() and normalAngleAtLength().

• platform/graphics/Path.cpp:
• platform/graphics/qt/PathQt.cpp: (WebCore::Path::length): (WebCore::Path::pointAtLength): (WebCore::Path::normalAngleAtLength):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/dom/path-pointAtLength-expected.txt (modified) (1 diff)
• LayoutTests/svg/dom/script-tests/path-pointAtLength.js (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/Path.cpp (modified) (1 diff)
• WebCore/platform/graphics/qt/PathQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-08  Jan E Hanssen  <jhanssen@sencha.com>
+
+        Reviewed by Dirk Schulze.
+
+        Add a test for getting a point beyond the length of the path
+        https://bugs.webkit.org/show_bug.cgi?id=43837
+
+        * svg/dom/path-pointAtLength-expected.txt:
+        * svg/dom/script-tests/path-pointAtLength.js:
+
 2010-09-08  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/LayoutTests/svg/dom/path-pointAtLength-expected.txt

@@ -7 +7 @@
 PASS pointAtLengthOfPath('M0,20 L400,20 L640,20 z') is '(580, 20)'
 PASS pointAtLengthOfPath('M0,20 L400,20 z M 320,20 L640,20') is '(100, 20)'
+PASS pointAtLengthOfPath('M0,20 L20,40') is '(20, 40)'
 PASS successfullyParsed is true
 

trunk/LayoutTests/svg/dom/script-tests/path-pointAtLength.js

@@ -13 +13 @@
 shouldBe("pointAtLengthOfPath('M0,20 L400,20 L640,20 z')", "'(580, 20)'");
 shouldBe("pointAtLengthOfPath('M0,20 L400,20 z M 320,20 L640,20')", "'(100, 20)'");
+shouldBe("pointAtLengthOfPath('M0,20 L20,40')", "'(20, 40)'");
 
 var successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-08  Jan E Hanssen  <jhanssen@sencha.com>
+
+        Reviewed by Dirk Schulze.
+
+        [Qt] PathQt should use the QPainterPath functionality for calculations
+        https://bugs.webkit.org/show_bug.cgi?id=43837
+
+        Change PathQt to use the built-in functionality of QPainterPath for
+        calculating length(), pointAtLength() and normalAngleAtLength().
+
+        * platform/graphics/Path.cpp:
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::length):
+        (WebCore::Path::pointAtLength):
+        (WebCore::Path::normalAngleAtLength):
+
 2010-09-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/WebCore/platform/graphics/Path.cpp

@@ -40 +40 @@
 namespace WebCore {
 
-#if !PLATFORM(OPENVG)
+#if !PLATFORM(OPENVG) && !PLATFORM(QT)
 static void pathLengthApplierFunction(void* info, const PathElement* element)
 {

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

@@ -475 +475 @@
 }
 
+float Path::length()
+{
+    return m_path.length();
+}
+
+FloatPoint Path::pointAtLength(float length, bool& ok)
+{
+    ok = (length >= 0 && length <= m_path.length());
+
+    qreal percent = m_path.percentAtLength(length);
+    QPointF point = m_path.pointAtPercent(percent);
+
+    return point;
+}
+
+float Path::normalAngleAtLength(float length, bool& ok)
+{
+    ok = (length >= 0 && length <= m_path.length());
+
+    qreal percent = m_path.percentAtLength(length);
+    qreal angle = m_path.angleAtPercent(percent);
+
+    return angle;
+}
+
 }