[SVG] SVGAnimatedTransform{,List} migration to new SVG property impl.

Source/core/svg/SVGViewSpec.cpp

 /*
  * Copyright (C) 2007, 2010 Rob Buis <buis@kde.org>
  *
  * 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
@@ skipping 11 matching lines @@
 
 #include "SVGNames.h"
 #include "bindings/v8/ExceptionMessages.h"
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/svg/SVGAnimatedTransformList.h"
 #include "core/svg/SVGParserUtilities.h"
 
 namespace WebCore {
 
-// Define custom non-animated property 'transform'.
-const SVGPropertyInfo* SVGViewSpec::transformPropertyInfo()
-{
-    static const SVGPropertyInfo* s_propertyInfo = 0;
-    if (!s_propertyInfo) {
-        s_propertyInfo = new SVGPropertyInfo(AnimatedTransformList,
-                                             PropertyIsReadOnly,
-                                             SVGNames::transformAttr,
-                                             transformIdentifier(),
-                                             0,
-                                             0);
-    }
-    return s_propertyInfo;
-}
-
 SVGViewSpec::SVGViewSpec(SVGSVGElement* contextElement)
     : m_contextElement(contextElement)
     , m_zoomAndPan(SVGZoomAndPanMagnify)
     // Note: We make |viewBox| and |preserveAspectRatio|'s contextElement the target element of SVGViewSpec.
     // This contextElement will be only used for keeping this alive from the tearoff.
     // SVGSVGElement holds a strong-ref to this SVGViewSpec, so this is kept alive as:
     // AnimatedProperty tearoff -(contextElement)-> SVGSVGElement -(RefPtr)-> SVGViewSpec.
+    , m_transform(SVGAnimatedTransformList::create(contextElement, SVGNames::transformAttr, SVGTransformList::create()))
     , m_viewBox(SVGAnimatedRect::create(contextElement, SVGNames::viewBoxAttr))
     , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(contextElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
 {
     ASSERT(m_contextElement);
     ScriptWrappable::init(this);
 
+    m_transform->setReadOnly();
     m_viewBox->setReadOnly();
     m_preserveAspectRatio->setReadOnly();
     // Note: addToPropertyMap is not needed, as SVGViewSpec do not correspond to an element.
 }
 
-const AtomicString& SVGViewSpec::transformIdentifier()
-{
-    DEFINE_STATIC_LOCAL(AtomicString, s_identifier, ("SVGViewSpecTransformAttribute", AtomicString::ConstructFromLiteral));
-    return s_identifier;
-}
-
 void SVGViewSpec::setZoomAndPan(unsigned short, ExceptionState& exceptionState)
 {
     // SVGViewSpec and all of its content is read-only.
     exceptionState.throwDOMException(NoModificationAllowedError, ExceptionMessages::readOnly());
 }
 
 String SVGViewSpec::preserveAspectRatioString() const
 {
     return m_preserveAspectRatio->baseValue()->valueAsString();
 }
 
-void SVGViewSpec::setTransformString(const String& transform)
-{
-    if (!m_contextElement)
-        return;
-
-    SVGTransformList newList;
-    newList.parse(transform);
-
-    if (SVGAnimatedProperty* wrapper = SVGAnimatedProperty::lookupWrapper<SVGElement, SVGAnimatedTransformList>(m_contextElement, transformPropertyInfo()))
-        static_cast<SVGAnimatedTransformList*>(wrapper)->detachListWrappers(newList.size());
-
-    m_transform = newList;
-}
-
 String SVGViewSpec::transformString() const
 {
-    return SVGPropertyTraits<SVGTransformList>::toString(m_transform);
+    if (!m_transform)
+        return String();
+
+    return m_transform->baseValue()->valueAsString();
 }
 
 String SVGViewSpec::viewBoxString() const
 {
     return m_viewBox->currentValue()->valueAsString();
 }
 
 SVGElement* SVGViewSpec::viewTarget() const
 {
     if (!m_contextElement)
         return 0;
     Element* element = m_contextElement->treeScope().getElementById(AtomicString(m_viewTargetString));
     if (!element || !element->isSVGElement())
         return 0;
     return toSVGElement(element);
 }
 
-SVGTransformListPropertyTearOff* SVGViewSpec::transform()
-{
-    if (!m_contextElement)
-        return 0;
-    // Return the animVal here, as its readonly by default - which is exactly what we want here.
-    return static_cast<SVGTransformListPropertyTearOff*>(static_pointer_cast<SVGAnimatedTransformList>(lookupOrCreateTransformWrapper(this))->animVal());
-}
-
-PassRefPtr<SVGAnimatedProperty> SVGViewSpec::lookupOrCreateTransformWrapper(SVGViewSpec* ownerType)
-{
-    ASSERT(ownerType);
-    ASSERT(ownerType->contextElement());
-    return SVGAnimatedProperty::lookupOrCreateWrapper<SVGElement, SVGAnimatedTransformList, SVGTransformList>(ownerType->contextElement(), transformPropertyInfo(), ownerType->m_transform);
-}
-
 void SVGViewSpec::detachContextElement()
 {
+    m_transform = 0;

[fs, 2014/02/17 14:14:31]

Any reason we can't hold on to these when the context element is detached?
(Looking at the *String() methods above, it look like they don't really handle
this, so arguably that'd go for the other two as well...)

[kouhei (in TOK), 2014/02/18 02:09:15]

These tear-offs' wrappers keep context element alive. They need to be detached
if contextElement dies.

     m_viewBox = 0;
     m_preserveAspectRatio = 0;
     m_contextElement = 0;
 }
 
 void SVGViewSpec::reset()
 {
     m_zoomAndPan = SVGZoomAndPanMagnify;
-    m_transform.clear();
+    m_transform->baseValue()->clear();
     ASSERT(m_viewBox);
     m_viewBox->baseValue()->setValue(FloatRect());
     ASSERT(m_preserveAspectRatio);
     m_preserveAspectRatio->baseValue()->setAlign(SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_XMIDYMID);
     m_preserveAspectRatio->baseValue()->setMeetOrSlice(SVGPreserveAspectRatio::SVG_MEETORSLICE_MEET);
     m_viewTargetString = emptyString();
 }
 
 static const LChar svgViewSpec[] = {'s', 'v', 'g', 'V', 'i', 'e', 'w'};
 static const LChar viewBoxSpec[] = {'v', 'i', 'e', 'w', 'B', 'o', 'x'};
@@ skipping 29 matching lines @@
                     return false;
                 ptr++;
             } else if (skipString(ptr, end, viewTargetSpec, WTF_ARRAY_LENGTH(viewTargetSpec))) {
                 if (ptr >= end || *ptr != '(')
                     return false;
                 const CharType* viewTargetStart = ++ptr;
                 while (ptr < end && *ptr != ')')
                     ptr++;
                 if (ptr >= end)
                     return false;
-                setViewTargetString(String(viewTargetStart, ptr - viewTargetStart));
+                m_viewTargetString = String(viewTargetStart, ptr - viewTargetStart);
                 ptr++;
             } else
                 return false;
         } else if (*ptr == 'z') {
             if (!skipString(ptr, end, zoomAndPanSpec, WTF_ARRAY_LENGTH(zoomAndPanSpec)))
                 return false;
             if (ptr >= end || *ptr != '(')
                 return false;
             ptr++;
             if (!parseZoomAndPan(ptr, end, m_zoomAndPan))
@@ skipping 11 matching lines @@
                 return false;
             if (ptr >= end || *ptr != ')')
                 return false;
             ptr++;
         } else if (*ptr == 't') {
             if (!skipString(ptr, end, transformSpec, WTF_ARRAY_LENGTH(transformSpec)))
                 return false;
             if (ptr >= end || *ptr != '(')
                 return false;
             ptr++;
-            parseTransformAttribute(m_transform, ptr, end, DoNotClearList);
+            m_transform->baseValue()->parse(ptr, end);

[fs, 2014/02/17 14:14:31]

This appears to drop the "DoNotClearList"-semantic previously. I don't see what
that would've been (good) for though.

[kouhei (in TOK), 2014/02/18 02:09:15]

True, added to description.
I think this is a correct behavior according to the spec:
http://www.w3.org/TR/SVG/single-page.html#linking-SVGFragmentIdentifiers

             if (ptr >= end || *ptr != ')')
                 return false;
             ptr++;
         } else
             return false;
 
         if (ptr < end && *ptr == ';')
             ptr++;
     }
 
@@ skipping 11 matching lines @@
         const LChar* ptr = spec.characters8();
         const LChar* end = ptr + spec.length();
         return parseViewSpecInternal(ptr, end);
     }
     const UChar* ptr = spec.characters16();
     const UChar* end = ptr + spec.length();
     return parseViewSpecInternal(ptr, end);
 }
 
 }