Changeset 87011 in webkit

Timestamp:

May 20, 2011 11:44:01 PM (13 years ago)

Author:

krit@webkit.org

Message:

2011-05-20 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Share more code in PathTraversalState
​https://bugs.webkit.org/show_bug.cgi?id=61238

Share more code between SVGPathTraversalStateBuilder and Path in PathTraversalState.

No change in functionality, so no new tests.

• platform/graphics/Path.cpp: (WebCore::pathLengthApplierFunction):
• platform/graphics/PathTraversalState.cpp: (WebCore::PathTraversalState::processSegment):
• platform/graphics/PathTraversalState.h:
• svg/SVGPathTraversalStateBuilder.cpp: (WebCore::SVGPathTraversalStateBuilder::continueConsuming):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Path.cpp (modified) (2 diffs)
• platform/graphics/PathTraversalState.cpp (modified) (1 diff)
• platform/graphics/PathTraversalState.h (modified) (1 diff)
• svg/SVGPathTraversalStateBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-20  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Share more code in PathTraversalState
+        https://bugs.webkit.org/show_bug.cgi?id=61238
+
+        Share more code between SVGPathTraversalStateBuilder and Path in PathTraversalState.
+
+        No change in functionality, so no new tests.
+
+        * platform/graphics/Path.cpp:
+        (WebCore::pathLengthApplierFunction):
+        * platform/graphics/PathTraversalState.cpp:
+        (WebCore::PathTraversalState::processSegment):
+        * platform/graphics/PathTraversalState.h:
+        * svg/SVGPathTraversalStateBuilder.cpp:
+        (WebCore::SVGPathTraversalStateBuilder::continueConsuming):
+
 2011-05-21  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/platform/graphics/Path.cpp

@@ -47 +47 @@
     if (traversalState.m_success)
         return;
-    traversalState.m_previous = traversalState.m_current;
     FloatPoint* points = element->points;
     float segmentLength = 0;
@@ -68 +67 @@
     }
     traversalState.m_totalLength += segmentLength; 
-    if ((traversalState.m_action == PathTraversalState::TraversalPointAtLength || 
-         traversalState.m_action == PathTraversalState::TraversalNormalAngleAtLength) &&
-        (traversalState.m_totalLength >= traversalState.m_desiredLength)) {
-        FloatSize change = traversalState.m_current - traversalState.m_previous;
-        float slope = atan2f(change.height(), change.width());
-
-        if (traversalState.m_action == PathTraversalState::TraversalPointAtLength) {
-            float offset = traversalState.m_desiredLength - traversalState.m_totalLength;
-            traversalState.m_current.move(offset * cosf(slope), offset * sinf(slope));
-        } else
-            traversalState.m_normalAngle = rad2deg(slope);
-
-        traversalState.m_success = true;
-    }
+    traversalState.processSegment();
 }
 

trunk/Source/WebCore/platform/graphics/PathTraversalState.cpp

@@ -204 +204 @@
 }
 
-}
-
+void PathTraversalState::processSegment()
+{
+    if (m_action == TraversalSegmentAtLength && m_totalLength >= m_desiredLength)
+        m_success = true;
+        
+    if ((m_action == TraversalPointAtLength || m_action == TraversalNormalAngleAtLength) && m_totalLength >= m_desiredLength) {
+        FloatSize change = m_current - m_previous;
+        float slope = atan2f(change.height(), change.width());
+        if (m_action == TraversalPointAtLength) {
+            float offset = m_desiredLength - m_totalLength;
+            m_current.move(offset * cosf(slope), offset * sinf(slope));
+        } else
+            m_normalAngle = rad2deg(slope);
+        m_success = true;
+    }
+    m_previous = m_current;
+}
+
+}
+

trunk/Source/WebCore/platform/graphics/PathTraversalState.h

@@ -47 +47 @@
     float quadraticBezierTo(const FloatPoint& newControl, const FloatPoint& newEnd);
     float cubicBezierTo(const FloatPoint& newControl1, const FloatPoint& newControl2, const FloatPoint& newEnd);
+    
+    void processSegment();
 
 public:

trunk/Source/WebCore/svg/SVGPathTraversalStateBuilder.cpp

@@ -67 +67 @@
 {
     ASSERT(m_traversalState);    
-    if (m_traversalState->m_action == PathTraversalState::TraversalSegmentAtLength
-        && m_traversalState->m_totalLength >= m_traversalState->m_desiredLength)
-        m_traversalState->m_success = true;
-    
-    if ((m_traversalState->m_action == PathTraversalState::TraversalPointAtLength
-         || m_traversalState->m_action == PathTraversalState::TraversalNormalAngleAtLength)
-        && m_traversalState->m_totalLength >= m_traversalState->m_desiredLength) {
-        FloatSize change = m_traversalState->m_current - m_traversalState->m_previous;
-        float slope = atan2f(change.height(), change.width());
-        if (m_traversalState->m_action == PathTraversalState::TraversalPointAtLength) {
-            float offset = m_traversalState->m_desiredLength - m_traversalState->m_totalLength;
-            m_traversalState->m_current.move(offset * cosf(slope), offset * sinf(slope));
-        } else
-            m_traversalState->m_normalAngle = rad2deg(slope);
-        m_traversalState->m_success = true;
-    }
-    m_traversalState->m_previous = m_traversalState->m_current;
-
+    m_traversalState->processSegment();
     return !m_traversalState->m_success;
 }