Don't handle out-of-range parameters for arcs in UnalteredParsing mode

Source/core/svg/SVGPathParser.cpp

 /*
  * Copyright (C) 2002, 2003 The Karbon Developers
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 228 matching lines @@
 {
     float rx;
     float ry;
     float angle;
     bool largeArc;
     bool sweep;
     FloatPoint targetPoint;
     if (!m_source->parseArcToSegment(rx, ry, angle, largeArc, sweep, targetPoint))
         return false;
 
+    if (m_pathParsingMode == UnalteredParsing) {
+        m_consumer->arcTo(rx, ry, angle, largeArc, sweep, targetPoint, m_mode);
+        return true;
+    }
+

[kouhei (in TOK), 2015/03/17 01:57:46]

Nit: Might want to add ASSERT(m_pathParsingMode == NormalizedParsing)? Skip this
if you think it is obvious.

[fs, 2015/03/17 09:28:28]

With the follow-ups I have this is going to be more than obvious (code-paths
will diverge at a higher level), so I'll punt on this assert.

     // If rx = 0 or ry = 0 then this arc is treated as a straight line segment (a "lineto") joining the endpoints.
     // http://www.w3.org/TR/SVG/implnote.html#ArcOutOfRangeParameters
     // If the current point and target point for the arc are identical, it should be treated as a zero length
     // path. This ensures continuity in animations.
     rx = fabsf(rx);
     ry = fabsf(ry);
     bool arcIsZeroLength = false;
-    if (m_pathParsingMode == NormalizedParsing) {
+    if (m_mode == RelativeCoordinates)
+        arcIsZeroLength = targetPoint == FloatPoint::zero();
+    else
+        arcIsZeroLength = targetPoint == m_currentPoint;
+    if (!rx || !ry || arcIsZeroLength) {
         if (m_mode == RelativeCoordinates)
-            arcIsZeroLength = targetPoint == FloatPoint::zero();
+            m_currentPoint += targetPoint;
         else
-            arcIsZeroLength = targetPoint == m_currentPoint;
-    }
-    if (!rx || !ry || arcIsZeroLength) {
-        if (m_pathParsingMode == NormalizedParsing) {
-            if (m_mode == RelativeCoordinates)
-                m_currentPoint += targetPoint;
-            else
-                m_currentPoint = targetPoint;
-            m_consumer->lineTo(m_currentPoint, AbsoluteCoordinates);
-        } else
-            m_consumer->lineTo(targetPoint, m_mode);
+            m_currentPoint = targetPoint;
+        m_consumer->lineTo(m_currentPoint, AbsoluteCoordinates);
         return true;
     }
 
-    if (m_pathParsingMode == NormalizedParsing) {
-        FloatPoint point1 = m_currentPoint;
-        if (m_mode == RelativeCoordinates)
-            targetPoint += m_currentPoint;
-        m_currentPoint = targetPoint;
-        return decomposeArcToCubic(angle, rx, ry, point1, targetPoint, largeArc, sweep);
-    }
-    m_consumer->arcTo(rx, ry, angle, largeArc, sweep, targetPoint, m_mode);
-    return true;
+    FloatPoint point1 = m_currentPoint;
+    if (m_mode == RelativeCoordinates)
+        targetPoint += m_currentPoint;
+    m_currentPoint = targetPoint;
+    return decomposeArcToCubic(angle, rx, ry, point1, targetPoint, largeArc, sweep);
 }
 
 bool SVGPathParser::parsePathDataFromSource(PathParsingMode pathParsingMode, bool checkForInitialMoveTo)
 {
     ASSERT(m_source);
     ASSERT(m_consumer);
 
     m_pathParsingMode = pathParsingMode;
 
     m_controlPoint = FloatPoint();
@@ skipping 184 matching lines @@
         point2 = targetPoint;
         point2.move(t * sinEndTheta, -t * cosEndTheta);
 
         m_consumer->curveToCubic(pointTransform.mapPoint(point1), pointTransform.mapPoint(point2),
                                  pointTransform.mapPoint(targetPoint), AbsoluteCoordinates);
     }
     return true;
 }
 
 }