webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 73 insertions, 73 deletions

diff --git a/Source/WebCore/svg/SVGPathParser.cpp b/Source/WebCore/svg/SVGPathParser.cpp
index 9f465eeab..9997ee968 100644
--- a/Source/WebCore/svg/SVGPathParser.cpp
+++ b/Source/WebCore/svg/SVGPathParser.cpp
@@ -2,7 +2,7 @@
  * 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) 2007, 2009, 2015 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
@@ -22,20 +22,43 @@
  */
 
 #include "config.h"
-
-#if ENABLE(SVG)
 #include "SVGPathParser.h"
 
 #include "AffineTransform.h"
+#include "SVGPathByteStreamBuilder.h"
 #include "SVGPathSource.h"
+#include "SVGPathStringBuilder.h"
 #include <wtf/MathExtras.h>
 
 static const float gOneOverThree = 1 / 3.f;
 
 namespace WebCore {
 
-SVGPathParser::SVGPathParser()
-    : m_consumer(0)
+bool SVGPathParser::parse(SVGPathSource& source, SVGPathConsumer& consumer, PathParsingMode mode, bool checkForInitialMoveTo)
+{
+    SVGPathParser parser(consumer, source, mode);
+    return parser.parsePathData(checkForInitialMoveTo);
+}
+
+bool SVGPathParser::parseToByteStream(SVGPathSource& source, SVGPathByteStream& byteStream, PathParsingMode mode, bool checkForInitialMoveTo)
+{
+    SVGPathByteStreamBuilder builder(byteStream);
+    return parse(source, builder, mode, checkForInitialMoveTo);
+}
+
+bool SVGPathParser::parseToString(SVGPathSource& source, String& result, PathParsingMode mode, bool checkForInitialMoveTo)
+{
+    SVGPathStringBuilder builder;
+    SVGPathParser parser(builder, source, mode);
+    bool ok = parser.parsePathData(checkForInitialMoveTo);
+    result = builder.result();
+    return ok;
+}
+
+SVGPathParser::SVGPathParser(SVGPathConsumer& consumer, SVGPathSource& source, PathParsingMode parsingMode)
+    : m_source(source)
+    , m_consumer(consumer)
+    , m_pathParsingMode(parsingMode)
 {
 }
 
@@ -45,13 +68,13 @@ void SVGPathParser::parseClosePathSegment()
     if (m_pathParsingMode == NormalizedParsing)
         m_currentPoint = m_subPathPoint;
     m_closePath = true;
-    m_consumer->closePath();
+    m_consumer.closePath();
 }
 
 bool SVGPathParser::parseMoveToSegment()
 {
     FloatPoint targetPoint;
-    if (!m_source->parseMoveToSegment(targetPoint))
+    if (!m_source.parseMoveToSegment(targetPoint))
         return false;
 
     if (m_pathParsingMode == NormalizedParsing) {
@@ -60,9 +83,9 @@ bool SVGPathParser::parseMoveToSegment()
         else
             m_currentPoint = targetPoint;
         m_subPathPoint = m_currentPoint;
-        m_consumer->moveTo(m_currentPoint, m_closePath, AbsoluteCoordinates);
+        m_consumer.moveTo(m_currentPoint, m_closePath, AbsoluteCoordinates);
     } else
-        m_consumer->moveTo(targetPoint, m_closePath, m_mode);
+        m_consumer.moveTo(targetPoint, m_closePath, m_mode);
     m_closePath = false;
     return true;
 }
@@ -70,7 +93,7 @@ bool SVGPathParser::parseMoveToSegment()
 bool SVGPathParser::parseLineToSegment()
 {
     FloatPoint targetPoint;
-    if (!m_source->parseLineToSegment(targetPoint))
+    if (!m_source.parseLineToSegment(targetPoint))
         return false;
 
     if (m_pathParsingMode == NormalizedParsing) {
@@ -78,16 +101,16 @@ bool SVGPathParser::parseLineToSegment()
             m_currentPoint += targetPoint;
         else
             m_currentPoint = targetPoint;
-        m_consumer->lineTo(m_currentPoint, AbsoluteCoordinates);
+        m_consumer.lineTo(m_currentPoint, AbsoluteCoordinates);
     } else
-        m_consumer->lineTo(targetPoint, m_mode);
+        m_consumer.lineTo(targetPoint, m_mode);
     return true;
 }
 
 bool SVGPathParser::parseLineToHorizontalSegment()
 {
     float toX;
-    if (!m_source->parseLineToHorizontalSegment(toX))
+    if (!m_source.parseLineToHorizontalSegment(toX))
         return false;
 
     if (m_pathParsingMode == NormalizedParsing) {
@@ -95,16 +118,16 @@ bool SVGPathParser::parseLineToHorizontalSegment()
             m_currentPoint.move(toX, 0);
         else
             m_currentPoint.setX(toX);
-        m_consumer->lineTo(m_currentPoint, AbsoluteCoordinates);
+        m_consumer.lineTo(m_currentPoint, AbsoluteCoordinates);
     } else
-        m_consumer->lineToHorizontal(toX, m_mode);
+        m_consumer.lineToHorizontal(toX, m_mode);
     return true;
 }
 
 bool SVGPathParser::parseLineToVerticalSegment()
 {
     float toY;
-    if (!m_source->parseLineToVerticalSegment(toY))
+    if (!m_source.parseLineToVerticalSegment(toY))
         return false;
 
     if (m_pathParsingMode == NormalizedParsing) {
@@ -112,9 +135,9 @@ bool SVGPathParser::parseLineToVerticalSegment()
             m_currentPoint.move(0, toY);
         else
             m_currentPoint.setY(toY);
-        m_consumer->lineTo(m_currentPoint, AbsoluteCoordinates);
+        m_consumer.lineTo(m_currentPoint, AbsoluteCoordinates);
     } else
-        m_consumer->lineToVertical(toY, m_mode);
+        m_consumer.lineToVertical(toY, m_mode);
     return true;
 }
 
@@ -123,7 +146,7 @@ bool SVGPathParser::parseCurveToCubicSegment()
     FloatPoint point1;
     FloatPoint point2;
     FloatPoint targetPoint;
-    if (!m_source->parseCurveToCubicSegment(point1, point2, targetPoint))
+    if (!m_source.parseCurveToCubicSegment(point1, point2, targetPoint))
         return false;
 
     if (m_pathParsingMode == NormalizedParsing) {
@@ -132,12 +155,12 @@ bool SVGPathParser::parseCurveToCubicSegment()
             point2 += m_currentPoint;
             targetPoint += m_currentPoint;
         }
-        m_consumer->curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
+        m_consumer.curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
 
         m_controlPoint = point2;
         m_currentPoint = targetPoint;
     } else
-        m_consumer->curveToCubic(point1, point2, targetPoint, m_mode);
+        m_consumer.curveToCubic(point1, point2, targetPoint, m_mode);
     return true;
 }
 
@@ -145,7 +168,7 @@ bool SVGPathParser::parseCurveToCubicSmoothSegment()
 {
     FloatPoint point2;
     FloatPoint targetPoint;
-    if (!m_source->parseCurveToCubicSmoothSegment(point2, targetPoint))
+    if (!m_source.parseCurveToCubicSmoothSegment(point2, targetPoint))
         return false;
 
     if (m_lastCommand != PathSegCurveToCubicAbs
@@ -156,19 +179,19 @@ bool SVGPathParser::parseCurveToCubicSmoothSegment()
 
     if (m_pathParsingMode == NormalizedParsing) {
         FloatPoint point1 = m_currentPoint;
-        point1.scale(2, 2);
+        point1.scale(2);
         point1.move(-m_controlPoint.x(), -m_controlPoint.y());
         if (m_mode == RelativeCoordinates) {
             point2 += m_currentPoint;
             targetPoint += m_currentPoint;
         }
 
-        m_consumer->curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
+        m_consumer.curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
 
         m_controlPoint = point2;
         m_currentPoint = targetPoint;
     } else
-        m_consumer->curveToCubicSmooth(point2, targetPoint, m_mode);
+        m_consumer.curveToCubicSmooth(point2, targetPoint, m_mode);
     return true;
 }
 
@@ -176,7 +199,7 @@ bool SVGPathParser::parseCurveToQuadraticSegment()
 {
     FloatPoint point1;
     FloatPoint targetPoint;
-    if (!m_source->parseCurveToQuadraticSegment(point1, targetPoint))
+    if (!m_source.parseCurveToQuadraticSegment(point1, targetPoint))
         return false;
 
     if (m_pathParsingMode == NormalizedParsing) {
@@ -189,23 +212,23 @@ bool SVGPathParser::parseCurveToQuadraticSegment()
             point2.move(3 * m_currentPoint.x(), 3 * m_currentPoint.y());
             targetPoint += m_currentPoint;
         }
-        point1.scale(gOneOverThree, gOneOverThree);
-        point2.scale(gOneOverThree, gOneOverThree);
+        point1.scale(gOneOverThree);
+        point2.scale(gOneOverThree);
 
-        m_consumer->curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
+        m_consumer.curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
 
         if (m_mode == RelativeCoordinates)
             m_controlPoint += m_currentPoint;
         m_currentPoint = targetPoint;
     } else
-        m_consumer->curveToQuadratic(point1, targetPoint, m_mode);
+        m_consumer.curveToQuadratic(point1, targetPoint, m_mode);
     return true;
 }
 
 bool SVGPathParser::parseCurveToQuadraticSmoothSegment()
 {
     FloatPoint targetPoint;
-    if (!m_source->parseCurveToQuadraticSmoothSegment(targetPoint))
+    if (!m_source.parseCurveToQuadraticSmoothSegment(targetPoint))
         return false;
 
     if (m_lastCommand != PathSegCurveToQuadraticAbs
@@ -216,7 +239,7 @@ bool SVGPathParser::parseCurveToQuadraticSmoothSegment()
 
     if (m_pathParsingMode == NormalizedParsing) {
         FloatPoint cubicPoint = m_currentPoint;
-        cubicPoint.scale(2, 2);
+        cubicPoint.scale(2);
         cubicPoint.move(-m_controlPoint.x(), -m_controlPoint.y());
         FloatPoint point1(m_currentPoint.x() + 2 * cubicPoint.x(), m_currentPoint.y() + 2 * cubicPoint.y());
         FloatPoint point2(targetPoint.x() + 2 * cubicPoint.x(), targetPoint.y() + 2 * cubicPoint.y());
@@ -224,15 +247,15 @@ bool SVGPathParser::parseCurveToQuadraticSmoothSegment()
             point2 += m_currentPoint;
             targetPoint += m_currentPoint;
         }
-        point1.scale(gOneOverThree, gOneOverThree);
-        point2.scale(gOneOverThree, gOneOverThree);
+        point1.scale(gOneOverThree);
+        point2.scale(gOneOverThree);
 
-        m_consumer->curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
+        m_consumer.curveToCubic(point1, point2, targetPoint, AbsoluteCoordinates);
 
         m_controlPoint = cubicPoint;
         m_currentPoint = targetPoint;
     } else
-        m_consumer->curveToQuadraticSmooth(targetPoint, m_mode);
+        m_consumer.curveToQuadraticSmooth(targetPoint, m_mode);
     return true;
 }
 
@@ -244,7 +267,7 @@ bool SVGPathParser::parseArcToSegment()
     bool largeArc;
     bool sweep;
     FloatPoint targetPoint;
-    if (!m_source->parseArcToSegment(rx, ry, angle, largeArc, sweep, targetPoint))
+    if (!m_source.parseArcToSegment(rx, ry, angle, largeArc, sweep, targetPoint))
         return false;
 
     // If rx = 0 or ry = 0 then this arc is treated as a straight line segment (a "lineto") joining the endpoints.
@@ -266,9 +289,9 @@ bool SVGPathParser::parseArcToSegment()
                 m_currentPoint += targetPoint;
             else
                 m_currentPoint = targetPoint;
-            m_consumer->lineTo(m_currentPoint, AbsoluteCoordinates);
+            m_consumer.lineTo(m_currentPoint, AbsoluteCoordinates);
         } else
-            m_consumer->lineTo(targetPoint, m_mode);
+            m_consumer.lineTo(targetPoint, m_mode);
         return true;
     }
 
@@ -279,29 +302,18 @@ bool SVGPathParser::parseArcToSegment()
         m_currentPoint = targetPoint;
         return decomposeArcToCubic(angle, rx, ry, point1, targetPoint, largeArc, sweep);
     }
-    m_consumer->arcTo(rx, ry, angle, largeArc, sweep, targetPoint, m_mode);
+    m_consumer.arcTo(rx, ry, angle, largeArc, sweep, targetPoint, m_mode);
     return true;
 }
 
-bool SVGPathParser::parsePathDataFromSource(PathParsingMode pathParsingMode, bool checkForInitialMoveTo)
+bool SVGPathParser::parsePathData(bool checkForInitialMoveTo)
 {
-    ASSERT(m_source);
-    ASSERT(m_consumer);
-
-    m_pathParsingMode = pathParsingMode;
-
-    m_controlPoint = FloatPoint();
-    m_currentPoint = FloatPoint();
-    m_subPathPoint = FloatPoint();
-    m_closePath = true;
-
     // Skip any leading spaces.
-    if (!m_source->moveToNextToken())
+    if (!m_source.moveToNextToken())
         return true;
 
     SVGPathSegType command;
-    m_source->parseSVGSegmentType(command);
-    m_lastCommand = PathSegUnknown;
+    m_source.parseSVGSegmentType(command);
 
     // Path must start with moveto.
     if (checkForInitialMoveTo && command != PathSegMoveToAbs && command != PathSegMoveToRel)
@@ -309,7 +321,7 @@ bool SVGPathParser::parsePathDataFromSource(PathParsingMode pathParsingMode, boo
 
     while (true) {
         // Skip spaces between command and first coordinate.
-        m_source->moveToNextToken();
+        m_source.moveToNextToken();
         m_mode = AbsoluteCoordinates;
         switch (command) {
         case PathSegMoveToRel:
@@ -381,15 +393,15 @@ bool SVGPathParser::parsePathDataFromSource(PathParsingMode pathParsingMode, boo
         default:
             return false;
         }
-        if (!m_consumer->continueConsuming())
+        if (!m_consumer.continueConsuming())
             return true;
 
         m_lastCommand = command;
 
-        if (!m_source->hasMoreData())
+        if (!m_source.hasMoreData())
             return true;
 
-        command = m_source->nextCommand(command);
+        command = m_source.nextCommand(command);
 
         if (m_lastCommand != PathSegCurveToCubicAbs
             && m_lastCommand != PathSegCurveToCubicRel
@@ -401,22 +413,12 @@ bool SVGPathParser::parsePathDataFromSource(PathParsingMode pathParsingMode, boo
             && m_lastCommand != PathSegCurveToQuadraticSmoothRel)
             m_controlPoint = m_currentPoint;
 
-        m_consumer->incrementPathSegmentCount();
+        m_consumer.incrementPathSegmentCount();
     }
 
     return false;
 }
 
-void SVGPathParser::cleanup()
-{
-    ASSERT(m_source);
-    ASSERT(m_consumer);
-
-    m_consumer->cleanup();
-    m_source = 0;
-    m_consumer = 0;
-}
-
 // This works by converting the SVG arc to "simple" beziers.
 // Partly adapted from Niko's code in kdelibs/kdecore/svgicons.
 // See also SVG implementation notes: http://www.w3.org/TR/SVG/implnote.html#ArcConversionEndpointToCenter
@@ -459,7 +461,7 @@ bool SVGPathParser::decomposeArcToCubic(float angle, float rx, float ry, FloatPo
 
     delta.scale(scaleFactor);
     FloatPoint centerPoint = point1 + point2;
-    centerPoint.scale(0.5f, 0.5f);
+    centerPoint.scale(0.5f);
     centerPoint.move(-delta.height(), delta.width());
 
     float theta1 = FloatPoint(point1 - centerPoint).slopeAngleRadians();
@@ -497,12 +499,10 @@ bool SVGPathParser::decomposeArcToCubic(float angle, float rx, float ry, FloatPo
         point2 = targetPoint;
         point2.move(t * sinEndTheta, -t * cosEndTheta);
 
-        m_consumer->curveToCubic(pointTransform.mapPoint(point1), pointTransform.mapPoint(point2),
+        m_consumer.curveToCubic(pointTransform.mapPoint(point1), pointTransform.mapPoint(point2),
                                  pointTransform.mapPoint(targetPoint), AbsoluteCoordinates);
     }
     return true;
 }
 
 }
-
-#endif // ENABLE(SVG)