Refactor away SVGPathSource

third_party/WebKit/Source/core/svg/SVGPathParser.h

 /*
  * 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 13 matching lines @@
 #ifndef SVGPathParser_h
 #define SVGPathParser_h
 
 #include "core/CoreExport.h"
 #include "core/svg/SVGPathData.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class SVGPathConsumer;
-class SVGPathSource;
 
-class CORE_EXPORT SVGPathParser final {
-    WTF_MAKE_NONCOPYABLE(SVGPathParser);
-    STACK_ALLOCATED();
+class CORE_EXPORT SVGPathParser {

[f(malita), 2016/01/28 16:34:06]

Nit: class -> namespace?

[fs, 2016/01/28 19:09:37]

Sure, unless pdr minds.

+    STATIC_ONLY(SVGPathParser);
 public:
-    SVGPathParser(SVGPathSource* source, SVGPathConsumer* consumer)
-        : m_source(source)
-        , m_consumer(consumer)
-    {
-        ASSERT(m_source);
-        ASSERT(m_consumer);
-    }
-
-    bool parsePathDataFromSource(bool checkForInitialMoveTo = true)
-    {
-        ASSERT(m_source);
-        ASSERT(m_consumer);
-        if (checkForInitialMoveTo && !initialCommandIsMoveTo())
-            return false;
-        return parsePath();
-    }
-
-private:
-    bool initialCommandIsMoveTo();
-    bool parsePath();
-
-    SVGPathSource* m_source;
-    SVGPathConsumer* m_consumer;
+    template<typename SourceType, typename ConsumerType>
+    static bool parsePath(SourceType&, ConsumerType&);
 };
 
 class SVGPathNormalizer {
     STACK_ALLOCATED();
 public:
     SVGPathNormalizer(SVGPathConsumer* consumer)
         : m_consumer(consumer)
         , m_lastCommand(PathSegUnknown)
     {
         ASSERT(m_consumer);
     }
 
     void emitSegment(const PathSegmentData&);
 
 private:
     bool decomposeArcToCubic(const FloatPoint& currentPoint, const PathSegmentData&);
 
     SVGPathConsumer* m_consumer;
     FloatPoint m_controlPoint;
     FloatPoint m_currentPoint;
     FloatPoint m_subPathPoint;
     SVGPathSegType m_lastCommand;
 };
 
+template<typename SourceType, typename ConsumerType>
+bool SVGPathParser::parsePath(SourceType& source, ConsumerType& consumer)
+{
+    while (source.hasMoreData()) {
+        PathSegmentData segment = source.parseSegment();
+        if (segment.command == PathSegUnknown)
+            return false;
+
+        consumer.emitSegment(segment);
+    }
+    return true;
+}
+
 } // namespace blink
 
 #endif // SVGPathParser_h