Refactor away SVGPathSource

third_party/WebKit/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
  * 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 "core/svg/SVGPathParser.h"
 
 #include "core/svg/SVGPathConsumer.h"
-#include "core/svg/SVGPathSource.h"
 #include "platform/transforms/AffineTransform.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
-bool SVGPathParser::initialCommandIsMoveTo()
-{
-    // If the path is empty it is still valid, so return true.
-    if (!m_source->hasMoreData())
-        return true;
-
-    SVGPathSegType command = m_source->peekSegmentType();
-    // Path must start with moveTo.
-    return command == PathSegMoveToAbs || command == PathSegMoveToRel;
-}
-
-bool SVGPathParser::parsePath()
-{
-    while (m_source->hasMoreData()) {
-        PathSegmentData segment = m_source->parseSegment();
-        if (segment.command == PathSegUnknown)
-            return false;
-
-        m_consumer->emitSegment(segment);
-    }
-    return true;
-}
-
 static FloatPoint reflectedPoint(const FloatPoint& reflectIn, const FloatPoint& pointToReflect)
 {
     return FloatPoint(2 * reflectIn.x() - pointToReflect.x(), 2 * reflectIn.y() - pointToReflect.y());
 }
 
 // Blend the points with a ratio (1/3):(2/3).
 static FloatPoint blendPoints(const FloatPoint& p1, const FloatPoint& p2)
 {
     const float oneOverThree = 1 / 3.f;
     return FloatPoint((p1.x() + 2 * p2.x()) * oneOverThree, (p1.y() + 2 * p2.y()) * oneOverThree);
@@ skipping 225 matching lines @@
         cubicSegment.point1 = pointTransform.mapPoint(point1);
         cubicSegment.point2 = pointTransform.mapPoint(point2);
         cubicSegment.targetPoint = pointTransform.mapPoint(targetPoint);
 
         m_consumer->emitSegment(cubicSegment);
     }
     return true;
 }
 
 } // namespace blink