Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1408)

Unified Diff: Source/core/svg/SVGPoint.h

Issue 132233016: [SVG] SVGAnimatedPointList migration to new SVG property impl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: set NeedsRebaseline Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/svg/SVGPathUtilities.cpp ('k') | Source/core/svg/SVGPoint.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGPoint.h
diff --git a/Source/core/svg/SVGPoint.h b/Source/core/svg/SVGPoint.h
index c258a0f3ad82b1fb865353f85e0ce203f282df54..ba482267983dd52b22060a9ebdba813fafac21b7 100644
--- a/Source/core/svg/SVGPoint.h
+++ b/Source/core/svg/SVGPoint.h
@@ -1,36 +1,99 @@
/*
- * Copyright (C) 2013 Samsung Electronics. All rights reserved.
+ * 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:
- * 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.
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * 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.
+ * * 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.
+ *
+ * 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 SVGPoint_h
#define SVGPoint_h
-#include "platform/geometry/FloatRect.h"
+#include "core/svg/properties/NewSVGProperty.h"
+#include "platform/geometry/FloatPoint.h"
namespace WebCore {
-typedef FloatPoint SVGPoint;
+class AffineTransform;
+class SVGPointTearOff;
+
+class SVGPoint : public NewSVGPropertyBase {
+public:
+ typedef SVGPointTearOff TearOffType;
+
+ static PassRefPtr<SVGPoint> create()
+ {
+ return adoptRef(new SVGPoint());
+ }
+
+ static PassRefPtr<SVGPoint> create(const FloatPoint& point)
+ {
+ return adoptRef(new SVGPoint(point));
+ }
+
+ PassRefPtr<SVGPoint> clone() const;
+ virtual PassRefPtr<NewSVGPropertyBase> cloneForAnimation(const String&) const OVERRIDE;
+
+ const FloatPoint& value() const { return m_value; }
+ void setValue(const FloatPoint& value) { m_value = value; }
+
+ float x() const { return m_value.x(); }
+ float y() const { return m_value.y(); }
+ void setX(float f) { m_value.setX(f); }
+ void setY(float f) { m_value.setY(f); }
+
+ FloatPoint matrixTransform(const AffineTransform&) const;
+
+ bool operator==(const SVGPoint&) const;
+ bool operator!=(const SVGPoint& other) const { return !operator==(other); }
+
+ virtual String valueAsString() const OVERRIDE;
+ void setValueAsString(const String&, ExceptionState&);
+
+ virtual void add(PassRefPtr<NewSVGPropertyBase>, SVGElement*) OVERRIDE;
+ virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<NewSVGPropertyBase> from, PassRefPtr<NewSVGPropertyBase> to, PassRefPtr<NewSVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement) OVERRIDE;
+ virtual float calculateDistance(PassRefPtr<NewSVGPropertyBase> to, SVGElement* contextElement) OVERRIDE;
+
+ static AnimatedPropertyType classType() { return AnimatedPoint; }
+
+private:
+ SVGPoint();
+ explicit SVGPoint(const FloatPoint&);
+
+ template<typename CharType>
+ void parse(const CharType*& ptr, const CharType* end, ExceptionState&);
+
+ FloatPoint m_value;
+};
+
+inline PassRefPtr<SVGPoint> toSVGPoint(PassRefPtr<NewSVGPropertyBase> passBase)
+{
+ RefPtr<NewSVGPropertyBase> base = passBase;
+ ASSERT(base->type() == SVGPoint::classType());
+ return static_pointer_cast<SVGPoint>(base.release());
+}
} // namespace WebCore
« no previous file with comments | « Source/core/svg/SVGPathUtilities.cpp ('k') | Source/core/svg/SVGPoint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698