Refactor away SVGPathSource

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

Index: third_party/WebKit/Source/core/svg/SVGPathStringSource.h
diff --git a/third_party/WebKit/Source/core/svg/SVGPathStringSource.h b/third_party/WebKit/Source/core/svg/SVGPathStringSource.h
index 5b55fd4cf5a8c116f33410438fb4d43b0cebe271..3bffe538f08faaaaf38e25188f35e3cc5abebb30 100644
--- a/third_party/WebKit/Source/core/svg/SVGPathStringSource.h
+++ b/third_party/WebKit/Source/core/svg/SVGPathStringSource.h
@@ -23,22 +23,28 @@
 
 #include "core/CoreExport.h"
 #include "core/svg/SVGParsingError.h"
-#include "core/svg/SVGPathSource.h"
+#include "core/svg/SVGPathData.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-class CORE_EXPORT SVGPathStringSource final : public SVGPathSource {
+class CORE_EXPORT SVGPathStringSource {
+    WTF_MAKE_NONCOPYABLE(SVGPathStringSource);
+    STACK_ALLOCATED();
 public:
     explicit SVGPathStringSource(const String&);
 
+    bool hasMoreData() const
+    {
+        if (m_is8BitSource)
+            return m_current.m_character8 < m_end.m_character8;
+        return m_current.m_character16 < m_end.m_character16;
+    }
+    PathSegmentData parseSegment();
+
     SVGParsingError parseError() const { return m_error; }
 
 private:
-    bool hasMoreData() const override;
-    SVGPathSegType peekSegmentType() override;
-    PathSegmentData parseSegment() override;
-
     void eatWhitespace();
     float parseNumberWithError();
     bool parseArcFlagWithError();