Remove globalSVGPath* from SVGPathUtilities.cpp

Source/core/svg/SVGPathSegList.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * 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.
@@ skipping 64 matching lines @@
     svgPathSegList->setValueAsString(value, IGNORE_EXCEPTION);
     return svgPathSegList;
 }
 
 const SVGPathByteStream* SVGPathSegList::byteStream() const
 {
     if (!m_byteStream) {
         m_byteStream = SVGPathByteStream::create();
 
         if (!Base::isEmpty()) {
-            SVGPathByteStreamBuilder builder;
-            builder.setCurrentByteStream(m_byteStream.get());
-
+            SVGPathByteStreamBuilder builder(*m_byteStream);
             SVGPathSegListSource source(begin(), end());
-
-            SVGPathParser parser;
-            parser.setCurrentConsumer(&builder);
-            parser.setCurrentSource(&source);
+            SVGPathParser parser(&source, &builder);
             parser.parsePathDataFromSource(UnalteredParsing);
         }
     }
 
     return m_byteStream.get();
 }
 
 void SVGPathSegList::updateListFromByteStream()
 {
     if (m_listSyncedToByteStream)
         return;
 
     Base::clear();
 
     if (m_byteStream && !m_byteStream->isEmpty()) {
-        SVGPathSegListBuilder builder;
-        builder.setCurrentSVGPathElement(m_contextElement);
-        builder.setCurrentSVGPathSegList(this);
-
-        SVGPathByteStreamSource source(m_byteStream.get());
-
-        SVGPathParser parser;
-        parser.setCurrentConsumer(&builder);
-        parser.setCurrentSource(&source);
+        SVGPathSegListBuilder builder(m_contextElement, this);
+        SVGPathByteStreamSource source(*m_byteStream);
+        SVGPathParser parser(&source, &builder);
         parser.parsePathDataFromSource(UnalteredParsing);
     }
 
     m_listSyncedToByteStream = true;
 }
 
 void SVGPathSegList::invalidateList()
 {
     m_listSyncedToByteStream = false;
     Base::clear();
 }
 
 PassRefPtrWillBeRawPtr<SVGPathSeg> SVGPathSegList::appendItem(PassRefPtrWillBeRawPtr<SVGPathSeg> passItem)
 {
     updateListFromByteStream();
     RefPtrWillBeRawPtr<SVGPathSeg> item = Base::appendItem(passItem);
 
     if (m_byteStream) {
-        SVGPathByteStreamBuilder builder;
-        builder.setCurrentByteStream(m_byteStream.get());
-
+        SVGPathByteStreamBuilder builder(*m_byteStream);
         SVGPathSegListSource source(lastAppended(), end());
-
-        SVGPathParser parser;
-        parser.setCurrentConsumer(&builder);
-        parser.setCurrentSource(&source);
+        SVGPathParser parser(&source, &builder);
         parser.parsePathDataFromSource(UnalteredParsing, false);
     }
 
     return item.release();
 }
 
 String SVGPathSegList::valueAsString() const
 {
     String string;
-    buildStringFromByteStream(byteStream(), string, UnalteredParsing);
+    buildStringFromByteStream(*byteStream(), string, UnalteredParsing);
     return string;
 }
 
 void SVGPathSegList::setValueAsString(const String& string, ExceptionState& exceptionState)
 {
     invalidateList();
     if (!m_byteStream)
         m_byteStream = SVGPathByteStream::create();
-    if (!buildSVGPathByteStreamFromString(string, m_byteStream.get(), UnalteredParsing))
+    if (!buildSVGPathByteStreamFromString(string, *m_byteStream, UnalteredParsing))
         exceptionState.throwDOMException(SyntaxError, "Problem parsing path \"" + string + "\"");
 }
 
 void SVGPathSegList::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
 {
     RefPtrWillBeRawPtr<SVGPathSegList> otherList = toSVGPathSegList(other);
     if (length() != otherList->length())
         return;
 
-    byteStream(); // create |m_byteStream| if not exist.
-    addToSVGPathByteStream(m_byteStream.get(), otherList->byteStream());
+    byteStream(); // create |m_byteStream| if it does not exist.
+    addToSVGPathByteStream(*m_byteStream, *otherList->byteStream());
     invalidateList();
 }
 
 void SVGPathSegList::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> fromValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement*)
 {
     invalidateList();
 
     ASSERT(animationElement);
     bool isToAnimation = animationElement->animationMode() == ToAnimation;
 
@@ skipping 23 matching lines @@
             }
         } else {
             m_byteStream = toStream->copy();
             return;
         }
     }
 
     OwnPtr<SVGPathByteStream> lastAnimatedStream = m_byteStream.release();
 
     m_byteStream = SVGPathByteStream::create();
-    SVGPathByteStreamBuilder builder;
-    builder.setCurrentByteStream(m_byteStream.get());
+    SVGPathByteStreamBuilder builder(*m_byteStream);
 
-    SVGPathByteStreamSource fromSource(fromStream);
-    SVGPathByteStreamSource toSource(toStream);
+    SVGPathByteStreamSource fromSource(*fromStream);
+    SVGPathByteStreamSource toSource(*toStream);
 
-    SVGPathBlender blender;
-    blender.blendAnimatedPath(percentage, &fromSource, &toSource, &builder);
+    SVGPathBlender blender(&fromSource, &toSource, &builder);
+    blender.blendAnimatedPath(percentage);
 
     // Handle additive='sum'.
     if (!fromStream->size() || (animationElement->isAdditive() && !isToAnimation))
-        addToSVGPathByteStream(m_byteStream.get(), lastAnimatedStream.get());
+        addToSVGPathByteStream(*m_byteStream, *lastAnimatedStream);
 
     // Handle accumulate='sum'.
     if (animationElement->isAccumulated() && repeatCount) {
         const SVGPathByteStream* toAtEndOfDurationStream = toAtEndOfDuration->byteStream();
-        addToSVGPathByteStream(m_byteStream.get(), toAtEndOfDurationStream, repeatCount);
+        addToSVGPathByteStream(*m_byteStream, *toAtEndOfDurationStream, repeatCount);
     }
 }
 
 float SVGPathSegList::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement*)
 {
     // FIXME: Support paced animations.
     return -1;
 }
 
 }