Changeset 65472 in webkit

Timestamp:

Aug 16, 2010 5:41:17 PM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-08-16 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Ariya Hidayat.

[Qt] Path::closeSubpath() should only close the last subpath if it has >1 point
​https://bugs.webkit.org/show_bug.cgi?id=44061

Spec link:
​http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-closepath

Test: fast/canvas/canvas-closePath-single-point.html

• platform/graphics/Path.h: Add a Qt-only member to track the last subpath.
• platform/graphics/qt/PathQt.cpp: (WebCore::Path::closeSubpath): Only close the last subpath if it has more than 1 point. Otherwise behave as moveTo(first point in last subpath) (WebCore::Path::Path): (WebCore::Path::operator=): (WebCore::Path::moveTo): (WebCore::Path::transform):

2010-08-16 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Ariya Hidayat.

[Qt] Path::closeSubpath() should only close the last subpath if it has >1 point
​https://bugs.webkit.org/show_bug.cgi?id=44061

Add a test to verify behavior of closePath() when path has only 1 point.

• fast/canvas/canvas-closePath-single-point-expected.txt: Added.
• fast/canvas/canvas-closePath-single-point.html: Added.
• fast/canvas/script-tests/canvas-closePath-single-point.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-closePath-single-point-expected.txt (added)
• LayoutTests/fast/canvas/canvas-closePath-single-point.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-closePath-single-point.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/Path.h (modified) (1 diff)
• WebCore/platform/graphics/qt/PathQt.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-16  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Path::closeSubpath() should only close the last subpath if it has >1 point
+        https://bugs.webkit.org/show_bug.cgi?id=44061
+
+        Add a test to verify behavior of closePath() when path has only 1 point.
+
+        * fast/canvas/canvas-closePath-single-point-expected.txt: Added.
+        * fast/canvas/canvas-closePath-single-point.html: Added.
+        * fast/canvas/script-tests/canvas-closePath-single-point.js: Added.
+
 2010-08-16  Nate Chapin  <japhet@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-16  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Path::closeSubpath() should only close the last subpath if it has >1 point
+        https://bugs.webkit.org/show_bug.cgi?id=44061
+
+        Spec link:
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-closepath
+
+        Test: fast/canvas/canvas-closePath-single-point.html
+
+        * platform/graphics/Path.h: Add a Qt-only member to track the last subpath.
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::closeSubpath): Only close the last subpath if it
+        has more than 1 point. Otherwise behave as moveTo(first point in last subpath)
+        (WebCore::Path::Path):
+        (WebCore::Path::operator=):
+        (WebCore::Path::moveTo):
+        (WebCore::Path::transform):
+
 2010-08-16  Nate Chapin  <japhet@chromium.org>
 

trunk/WebCore/platform/graphics/Path.h

@@ -157 +157 @@
     private:
         PlatformPathPtr m_path;
+
+#if PLATFORM(QT)
+        int m_lastMoveToIndex;
+#endif
     };
 

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

@@ -52 +52 @@
 
 Path::Path()
+    : m_lastMoveToIndex(0)
 {
 }
@@ -61 +62 @@
 Path::Path(const Path& other)
     : m_path(other.m_path)
+    , m_lastMoveToIndex(other.m_lastMoveToIndex)
 {
 }
@@ -67 +69 @@
 {
     m_path = other.m_path;
+    m_lastMoveToIndex = other.m_lastMoveToIndex;
     return *this;
 }
@@ -181 +184 @@
 void Path::moveTo(const FloatPoint& point)
 {
+    m_lastMoveToIndex = m_path.elementCount();
     m_path.moveTo(point);
 }
@@ -261 +265 @@
 void Path::closeSubpath()
 {
-    m_path.closeSubpath();
+    const int elementCount = m_path.elementCount();
+
+    if (!elementCount)
+        return;
+
+    QPointF lastMoveToPoint = m_path.elementAt(m_lastMoveToIndex);
+    int elementsInLastSubpath = 0;
+
+    for (int i = m_lastMoveToIndex; i < elementCount; ++i) {
+        QPainterPath::Element element = m_path.elementAt(i);
+        if (element.isLineTo() || element.isCurveTo()) {
+            // All we need to know is if there are 1 or more elements in the last subpath.
+            if (++elementsInLastSubpath == 2) {
+                m_path.lineTo(lastMoveToPoint);
+                return;
+            }
+        }
+    }
+
+    moveTo(lastMoveToPoint);
 }
 
@@ -441 +464 @@
     if (m_path.isEmpty() && m_path.elementCount()) {
         QPointF point = qTransform.map(m_path.currentPosition());
-        m_path.moveTo(point);
+        moveTo(point);
     } else 
 #endif