Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 243 deletions

diff --git a/WebCore/svg/SVGPathStringSource.cpp b/WebCore/svg/SVGPathStringSource.cpp
deleted file mode 100644
index 5154ee6..0000000
--- a/WebCore/svg/SVGPathStringSource.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * 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
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#if ENABLE(SVG)
-#include "SVGPathStringSource.h"
-
-#include "SVGParserUtilities.h"
-
-namespace WebCore {
-
-SVGPathStringSource::SVGPathStringSource(const String& string)
-    : m_string(string)
-    , m_current(string.characters())
-    , m_end(m_current + string.length())
-{
-    ASSERT(!string.isEmpty());
-}
-
-bool SVGPathStringSource::hasMoreData() const
-{
-    return m_current < m_end;
-}
-
-bool SVGPathStringSource::moveToNextToken()
-{
-    return skipOptionalSpaces(m_current, m_end);
-}
-
-bool SVGPathStringSource::parseSVGSegmentType(SVGPathSegType& pathSegType)
-{
-    switch (*(m_current++)) {
-    case 'Z':
-    case 'z':
-        pathSegType = PathSegClosePath;
-        break;
-    case 'M':
-        pathSegType = PathSegMoveToAbs;
-        break;
-    case 'm':
-        pathSegType = PathSegMoveToRel;
-        break;
-    case 'L':
-        pathSegType = PathSegLineToAbs;
-        break;
-    case 'l':
-        pathSegType = PathSegLineToRel;
-        break;
-    case 'C':
-        pathSegType = PathSegCurveToCubicAbs;
-        break;
-    case 'c':
-        pathSegType = PathSegCurveToCubicRel;
-        break;
-    case 'Q':
-        pathSegType = PathSegCurveToQuadraticAbs;
-        break;
-    case 'q':
-        pathSegType = PathSegCurveToQuadraticRel;
-        break;
-    case 'A':
-        pathSegType = PathSegArcAbs;
-        break;
-    case 'a':
-        pathSegType = PathSegArcRel;
-        break;
-    case 'H':
-        pathSegType = PathSegLineToHorizontalAbs;
-        break;
-    case 'h':
-        pathSegType = PathSegLineToHorizontalRel;
-        break;
-    case 'V':
-        pathSegType = PathSegLineToVerticalAbs;
-        break;
-    case 'v':
-        pathSegType = PathSegLineToVerticalRel;
-        break;
-    case 'S':
-        pathSegType = PathSegCurveToCubicSmoothAbs;
-        break;
-    case 's':
-        pathSegType = PathSegCurveToCubicSmoothRel;
-        break;
-    case 'T':
-        pathSegType = PathSegCurveToQuadraticSmoothAbs;
-        break;
-    case 't':
-        pathSegType = PathSegCurveToQuadraticSmoothRel;
-        break;
-    default:
-        pathSegType = PathSegUnknown;
-    }
-    return true;
-}
-
-SVGPathSegType SVGPathStringSource::nextCommand(SVGPathSegType previousCommand)
-{
-    // Check for remaining coordinates in the current command.
-    if ((*m_current == '+' || *m_current == '-' || *m_current == '.' || (*m_current >= '0' && *m_current <= '9'))
-        && previousCommand != PathSegClosePath) {
-        if (previousCommand == PathSegMoveToAbs)
-            return PathSegLineToAbs;
-        if (previousCommand == PathSegMoveToRel)
-            return PathSegLineToRel;
-        return previousCommand;
-    }
-    SVGPathSegType nextCommand;
-    parseSVGSegmentType(nextCommand);
-    return nextCommand;
-}
-
-bool SVGPathStringSource::parseMoveToSegment(FloatPoint& targetPoint)
-{
-    float toX;
-    float toY;
-    if (!parseNumber(m_current, m_end, toX) || !parseNumber(m_current, m_end, toY))
-        return false;
-    targetPoint = FloatPoint(toX, toY);
-    return true;
-}
-
-bool SVGPathStringSource::parseLineToSegment(FloatPoint& targetPoint)
-{
-    float toX;
-    float toY;
-    if (!parseNumber(m_current, m_end, toX) || !parseNumber(m_current, m_end, toY))
-        return false;
-    targetPoint = FloatPoint(toX, toY);
-    return true;
-}
-
-bool SVGPathStringSource::parseLineToHorizontalSegment(float& x)
-{
-    return parseNumber(m_current, m_end, x);
-}
-
-bool SVGPathStringSource::parseLineToVerticalSegment(float& y)
-{
-    return parseNumber(m_current, m_end, y);
-}
-
-bool SVGPathStringSource::parseCurveToCubicSegment(FloatPoint& point1, FloatPoint& point2, FloatPoint& targetPoint)
-{
-    float x1;
-    float y1;
-    float x2;
-    float y2;
-    float toX;
-    float toY;
-    if (!parseNumber(m_current, m_end, x1)
-        || !parseNumber(m_current, m_end, y1)
-        || !parseNumber(m_current, m_end, x2)
-        || !parseNumber(m_current, m_end, y2)
-        || !parseNumber(m_current, m_end, toX)
-        || !parseNumber(m_current, m_end, toY))
-        return false;
-    point1 = FloatPoint(x1, y1);
-    point2 = FloatPoint(x2, y2);
-    targetPoint = FloatPoint(toX, toY);
-    return true;
-}
-
-bool SVGPathStringSource::parseCurveToCubicSmoothSegment(FloatPoint& point1, FloatPoint& targetPoint)
-{
-    float x1;
-    float y1;
-    float toX;
-    float toY;
-    if (!parseNumber(m_current, m_end, x1)
-        || !parseNumber(m_current, m_end, y1)
-        || !parseNumber(m_current, m_end, toX)
-        || !parseNumber(m_current, m_end, toY))
-        return false;
-    point1 = FloatPoint(x1, y1);
-    targetPoint = FloatPoint(toX, toY);
-    return true;
-}
-
-bool SVGPathStringSource::parseCurveToQuadraticSegment(FloatPoint& point2, FloatPoint& targetPoint)
-{
-    float x2;
-    float y2;
-    float toX;
-    float toY;
-    if (!parseNumber(m_current, m_end, x2)
-        || !parseNumber(m_current, m_end, y2)
-        || !parseNumber(m_current, m_end, toX)
-        || !parseNumber(m_current, m_end, toY))
-        return false;
-    point2 = FloatPoint(x2, y2);
-    targetPoint = FloatPoint(toX, toY);
-    return true;
-}
-
-bool SVGPathStringSource::parseCurveToQuadraticSmoothSegment(FloatPoint& targetPoint)
-{
-    float toX;
-    float toY;
-    if (!parseNumber(m_current, m_end, toX)
-        || !parseNumber(m_current, m_end, toY))
-        return false;
-    targetPoint = FloatPoint(toX, toY);
-    return true;
-}
-
-bool SVGPathStringSource::parseArcToSegment(float& rx, float& ry, float& angle, bool& largeArc, bool& sweep, FloatPoint& targetPoint)
-{
-    float toX;
-    float toY;
-    if (!parseNumber(m_current, m_end, rx)
-        || !parseNumber(m_current, m_end, ry)
-        || !parseNumber(m_current, m_end, angle)
-        || !parseArcFlag(m_current, m_end, largeArc)
-        || !parseArcFlag(m_current, m_end, sweep)
-        || !parseNumber(m_current, m_end, toX)
-        || !parseNumber(m_current, m_end, toY))
-        return false;
-    targetPoint = FloatPoint(toX, toY);
-    return true;
-}
-
-
-}
-
-#endif // ENABLE(SVG)