SVG: Promote d to a property

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

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SVGPath_h
 #define SVGPath_h
 
+#include "core/css/CSSPathValue.h"
 #include "core/svg/SVGPathByteStream.h"
 #include "core/svg/properties/SVGProperty.h"
 
 namespace blink {
 
 class ExceptionState;
 class Path;
 
 class SVGPath : public SVGPropertyBase {
 public:
     typedef void TearOffType;
 
     static PassRefPtrWillBeRawPtr<SVGPath> create()
     {
         return adoptRefWillBeNoop(new SVGPath());
     }
-    static PassRefPtrWillBeRawPtr<SVGPath> create(PassOwnPtr<SVGPathByteStream> pathByteStream)
+    static PassRefPtrWillBeRawPtr<SVGPath> create(PassRefPtrWillBeRawPtr<CSSPathValue> pathValue)
     {
-        return adoptRefWillBeNoop(new SVGPath(pathByteStream));
+        return adoptRefWillBeNoop(new SVGPath(pathValue));
     }
 
     ~SVGPath() override;
 
-    const Path& path() const;
-
-    const SVGPathByteStream& byteStream() const;
+    const SVGPathByteStream& byteStream() const { return m_pathValue->byteStream(); }
+    CSSPathValue* pathValue() const { return m_pathValue.get(); }
 
     // SVGPropertyBase:
     PassRefPtrWillBeRawPtr<SVGPath> clone() const;
     PassRefPtrWillBeRawPtr<SVGPropertyBase> cloneForAnimation(const String&) const override;
     String valueAsString() const override;
     void setValueAsString(const String&, ExceptionState&);
 
     void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) override;
     void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> fromValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement*) override;
     float calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement*) override;
 
     static AnimatedPropertyType classType() { return AnimatedPath; }
 
+    DECLARE_TRACE();

[fs, 2015/12/14 11:51:40]

DECLARE_VIRTUAL_TRACE I think, but I'm not 100% sure, because I think these are
not traced via their base-class... but maybe they are sometimes, better safe
than sorry I guess.

[Eric Willigers, 2015/12/14 22:18:23]

Done.

+
 private:
     SVGPath();
-    explicit SVGPath(PassOwnPtr<SVGPathByteStream>);
+    explicit SVGPath(PassRefPtrWillBeRawPtr<CSSPathValue>);
 
-    SVGPathByteStream& ensureByteStream();
-    void byteStreamChanged();
-    void setValueAsByteStream(PassOwnPtr<SVGPathByteStream>);
-
-    OwnPtr<SVGPathByteStream> m_byteStream;
-    mutable OwnPtr<Path> m_cachedPath;
+    RefPtrWillBeMember<CSSPathValue> m_pathValue;
 };
 
 DEFINE_SVG_PROPERTY_TYPE_CASTS(SVGPath);
 
 } // namespace blink
 
 #endif