Remove globalSVGPath* from SVGPathUtilities.cpp

Source/core/svg/SVGPathBlender.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010, 2011. 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"
 #include "core/svg/SVGPathBlender.h"
 
 #include "core/svg/SVGPathSeg.h"
 #include "core/svg/SVGPathSource.h"
 #include "platform/animation/AnimationUtilities.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
-SVGPathBlender::SVGPathBlender()
-    : m_fromSource(nullptr)
-    , m_toSource(nullptr)
-    , m_consumer(nullptr)
+SVGPathBlender::SVGPathBlender(SVGPathSource* fromSource, SVGPathSource* toSource, SVGPathConsumer* consumer)
+    : m_fromSource(fromSource)
+    , m_toSource(toSource)
+    , m_consumer(consumer)
     , m_progress(0)
     , m_addTypesCount(0)
     , m_isInFirstHalfOfAnimation(false)
 {
+    ASSERT(m_fromSource);
+    ASSERT(m_toSource);
+    ASSERT(m_consumer);
 }
 
 void SVGPathBlender::trace(Visitor* visitor)
 {
     visitor->trace(m_fromSource);
     visitor->trace(m_toSource);
     visitor->trace(m_consumer);
 }
 
 // Helper functions
@@ skipping 248 matching lines @@
 
     unsigned short from = fromType;
     unsigned short to = toType;
     if (fromMode == toMode)
         return from == to;
     if (fromMode == AbsoluteCoordinates)
         return from == to - 1;
     return to == from - 1;
 }
 
-bool SVGPathBlender::addAnimatedPath(SVGPathSource* fromSource, SVGPathSource* toSource, SVGPathConsumer* consumer, unsigned repeatCount)
+bool SVGPathBlender::addAnimatedPath(unsigned repeatCount)
 {
     TemporaryChange<unsigned> change(m_addTypesCount, repeatCount);
-    return blendAnimatedPath(0, fromSource, toSource, consumer);
+    return blendAnimatedPath(0);
 }
 
-bool SVGPathBlender::blendAnimatedPath(float progress, SVGPathSource* fromSource, SVGPathSource* toSource, SVGPathConsumer* consumer)
+bool SVGPathBlender::blendAnimatedPath(float progress)
 {
-    ASSERT(fromSource);
-    ASSERT(toSource);
-    ASSERT(consumer);
-    m_fromSource = fromSource;
-    m_toSource = toSource;
-    m_consumer = consumer;
     m_isInFirstHalfOfAnimation = progress < 0.5f;
     m_progress = progress;
 
     bool fromSourceHadData = m_fromSource->hasMoreData();
     while (m_toSource->hasMoreData()) {
         SVGPathSegType fromCommand;
         SVGPathSegType toCommand;
         if ((fromSourceHadData && !m_fromSource->parseSVGSegmentType(fromCommand)) || !m_toSource->parseSVGSegmentType(toCommand))
             return false;
 
@@ skipping 62 matching lines @@
             continue;
         if (m_fromSource->hasMoreData() != m_toSource->hasMoreData())
             return false;
         if (!m_fromSource->hasMoreData() || !m_toSource->hasMoreData())
             return true;
     }
 
     return true;
 }
 
-void SVGPathBlender::cleanup()
-{
-    ASSERT(m_toSource);
-    ASSERT(m_fromSource);
-    ASSERT(m_consumer);
-
-    m_consumer->cleanup();
-    m_toSource = nullptr;
-    m_fromSource = nullptr;
-    m_consumer = nullptr;
-    m_fromCurrentPoint = FloatPoint();
-    m_toCurrentPoint = FloatPoint();
 }
-
-}