1 files changed, 40 insertions, 42 deletions

diff --git a/Source/WebCore/svg/SVGStringList.h b/Source/WebCore/svg/SVGStringList.h
index 5463cc22a..7fe7f00fc 100644
--- a/Source/WebCore/svg/SVGStringList.h
+++ b/Source/WebCore/svg/SVGStringList.h
@@ -1,60 +1,58 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
+ * Copyright (C) 2016 Apple Inc. 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * 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.
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 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 SVGStringList_h
-#define SVGStringList_h
+#pragma once
 
-#if ENABLE(SVG)
-#include "QualifiedName.h"
-#include "SVGPropertyTraits.h"
-#include <wtf/Vector.h>
+#include "SVGAnimatedListPropertyTearOff.h"
+#include "SVGListPropertyTearOff.h"
+#include "SVGStringListValues.h"
 
 namespace WebCore {
 
-class SVGElement;
-
-class SVGStringList : public Vector<String> {
+class SVGStringList final : public SVGStaticListPropertyTearOff<SVGStringListValues> {
 public:
-    SVGStringList(const QualifiedName& attributeName)
-        : m_attributeName(attributeName)
+    using AnimatedListPropertyTearOff = SVGAnimatedListPropertyTearOff<SVGStringListValues>;
+    using ListWrapperCache = AnimatedListPropertyTearOff::ListWrapperCache;
+
+    static Ref<SVGStringList> create(SVGElement& contextElement, SVGStringListValues& values)
     {
+        return adoptRef(*new SVGStringList(&contextElement, values));
     }
 
-    void reset(const String&);
-    void parse(const String&, UChar delimiter = ',');
-
-    // Only used by SVGStringListPropertyTearOff.
-    void commitChange(SVGElement* contextElement);
-
-    String valueAsString() const;
+    static Ref<SVGStringList> create(AnimatedListPropertyTearOff&, SVGPropertyRole, SVGStringListValues& values, ListWrapperCache&)
+    {
+        // FIXME: Find a way to remove this. It's only needed to keep Windows compiling.
+        ASSERT_NOT_REACHED();
+        return adoptRef(*new SVGStringList(nullptr, values));
+    }
 
 private:
-    const QualifiedName& m_attributeName;
-};
-
-template<>
-struct SVGPropertyTraits<SVGStringList> {
-    typedef String ListItemType;
+    SVGStringList(SVGElement* contextElement, SVGStringListValues& values)
+        : SVGStaticListPropertyTearOff<SVGStringListValues>(contextElement, values)
+    {
+    }
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif