Refactor away SVGPathSource

third_party/WebKit/Source/core/animation/InterpolatedSVGPathSource.h

Index: third_party/WebKit/Source/core/animation/InterpolatedSVGPathSource.h
diff --git a/third_party/WebKit/Source/core/animation/InterpolatedSVGPathSource.h b/third_party/WebKit/Source/core/animation/InterpolatedSVGPathSource.h
index 62523418ded7eca863c5f5998695a2bb3822bdf6..3cbceb8c24034523884d9313d5720d67c555c996 100644
--- a/third_party/WebKit/Source/core/animation/InterpolatedSVGPathSource.h
+++ b/third_party/WebKit/Source/core/animation/InterpolatedSVGPathSource.h
@@ -6,12 +6,14 @@
 #define InterpolatedSVGPathSource_h
 
 #include "core/animation/SVGPathSegInterpolationFunctions.h"
-#include "core/svg/SVGPathSource.h"
+#include "core/svg/SVGPathData.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
-class InterpolatedSVGPathSource : public SVGPathSource {
+class InterpolatedSVGPathSource {
+    WTF_MAKE_NONCOPYABLE(InterpolatedSVGPathSource);
+    STACK_ALLOCATED();
 public:
     InterpolatedSVGPathSource(const InterpolableList& listValue, const Vector<SVGPathSegType>& pathSegTypes)
         : m_currentIndex(0)
@@ -21,11 +23,10 @@ public:
         ASSERT(m_interpolablePathSegs.length() == m_pathSegTypes.size());
     }
 
-private:
-    bool hasMoreData() const override;
-    SVGPathSegType peekSegmentType() override;
-    PathSegmentData parseSegment() override;
+    bool hasMoreData() const;
+    PathSegmentData parseSegment();
 
+private:
     PathCoordinates m_currentCoordinates;
     size_t m_currentIndex;
     const InterpolableList& m_interpolablePathSegs;
@@ -37,12 +38,6 @@ bool InterpolatedSVGPathSource::hasMoreData() const
     return m_currentIndex < m_interpolablePathSegs.length();
 }
 
-SVGPathSegType InterpolatedSVGPathSource::peekSegmentType()
-{
-    ASSERT(hasMoreData());
-    return m_pathSegTypes.at(m_currentIndex);
-}
-
 PathSegmentData InterpolatedSVGPathSource::parseSegment()
 {
     PathSegmentData segment = SVGPathSegInterpolationFunctions::consumeInterpolablePathSeg(*m_interpolablePathSegs.get(m_currentIndex), m_pathSegTypes.at(m_currentIndex), m_currentCoordinates);