| Index: Source/core/svg/SVGTransformList.h
|
| diff --git a/Source/core/svg/SVGTransformList.h b/Source/core/svg/SVGTransformList.h
|
| index 4904a8826f714853e3d77a0c92ffaea65970d40f..afa23e9d0480a4e59a5f972109e182a5c9d5c6af 100644
|
| --- a/Source/core/svg/SVGTransformList.h
|
| +++ b/Source/core/svg/SVGTransformList.h
|
| @@ -1,51 +1,84 @@
|
| /*
|
| - * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
|
| - * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
|
| + * Copyright (C) 2014 Google 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:
|
| *
|
| - * 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.
|
| + * * 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
|
| + * copyright notice, this list of conditions and the following disclaimer
|
| + * in the documentation and/or other materials provided with the
|
| + * distribution.
|
| + * * Neither the name of Google Inc. nor the names of its
|
| + * contributors may be used to endorse or promote products derived from
|
| + * this software without specific prior written permission.
|
| *
|
| - * 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
|
| + * OWNER OR 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 SVGTransformList_h
|
| #define SVGTransformList_h
|
|
|
| +#include "bindings/v8/ScriptWrappable.h"
|
| #include "core/svg/SVGTransform.h"
|
| -#include "core/svg/properties/SVGPropertyTraits.h"
|
| -#include "wtf/Vector.h"
|
| +#include "core/svg/properties/NewSVGListPropertyHelper.h"
|
|
|
| namespace WebCore {
|
|
|
| -class SVGTransformList : public Vector<SVGTransform> {
|
| +class SVGTransformListTearOff;
|
| +
|
| +class SVGTransformList FINAL : public NewSVGListPropertyHelper<SVGTransformList, SVGTransform> {
|
| public:
|
| - SVGTransformList() { }
|
| + typedef SVGTransformListTearOff TearOffType;
|
| +
|
| + static PassRefPtr<SVGTransformList> create()
|
| + {
|
| + return adoptRef(new SVGTransformList());
|
| + }
|
| +
|
| + static PassRefPtr<SVGTransformList> create(SVGTransformType, const String&);
|
|
|
| - SVGTransform createSVGTransformFromMatrix(const SVGMatrix&) const;
|
| - SVGTransform consolidate();
|
| + virtual ~SVGTransformList();
|
| +
|
| + PassRefPtr<SVGTransform> createSVGTransformFromMatrix(const AffineTransform&) const;
|
| + PassRefPtr<SVGTransform> consolidate();
|
|
|
| - // Internal use only
|
| bool concatenate(AffineTransform& result) const;
|
|
|
| - String valueAsString() const;
|
| - void parse(const String&);
|
| -};
|
| + // NewSVGPropertyBase:
|
| + virtual PassRefPtr<NewSVGPropertyBase> cloneForAnimation(const String&) const OVERRIDE;
|
| + PassRefPtr<SVGTransformList> clone();
|
| +
|
| + virtual String valueAsString() const OVERRIDE;
|
| + void setValueAsString(const String&, ExceptionState&);
|
| + bool parse(const UChar*& ptr, const UChar* end);
|
| + bool parse(const LChar*& ptr, const LChar* end);
|
| +
|
| + virtual void add(PassRefPtr<NewSVGPropertyBase>, SVGElement*) OVERRIDE;
|
| + virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<NewSVGPropertyBase> fromValue, PassRefPtr<NewSVGPropertyBase> toValue, PassRefPtr<NewSVGPropertyBase> toAtEndOfDurationValue, SVGElement*) OVERRIDE;
|
| + virtual float calculateDistance(PassRefPtr<NewSVGPropertyBase> to, SVGElement*) OVERRIDE;
|
| +
|
| + static AnimatedPropertyType classType() { return AnimatedTransformList; }
|
| +
|
| +private:
|
| + SVGTransformList();
|
| +
|
| + bool adjustFromToListValues(PassRefPtr<SVGTransformList> fromList, PassRefPtr<SVGTransformList> toList, float percentage, bool isToAnimation, bool resizeAnimatedListIfNeeded);
|
|
|
| -template<>
|
| -struct SVGPropertyTraits<SVGTransformList> {
|
| - static SVGTransformList initialValue() { return SVGTransformList(); }
|
| - static String toString(const SVGTransformList& type) { return type.valueAsString(); }
|
| - typedef SVGTransform ListItemType;
|
| + template <typename CharType>
|
| + bool parseInternal(const CharType*& ptr, const CharType* end);
|
| };
|
|
|
| } // namespace WebCore
|
|
|