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

Side by Side Diff: Source/core/svg/SVGAnimatedTypeAnimator.h

Issue 298873003: SVG: SVGAnimateElement should not cache |m_animatedElements| (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove more asserts Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGAnimatedNumber.cpp ('k') | Source/core/svg/SVGStaticStringList.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
3 * Copyright (C) 2013 Samsung Electronics. All rights reserved. 3 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGPrope rtyBase*, SVGPropertyBase*, SVGPropertyBase*, SVGPropertyBase*); 53 void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGPrope rtyBase*, SVGPropertyBase*, SVGPropertyBase*, SVGPropertyBase*);
54 float calculateDistance(const String& fromString, const String& toString); 54 float calculateDistance(const String& fromString, const String& toString);
55 55
56 void calculateFromAndToValues(RefPtr<SVGPropertyBase>& from, RefPtr<SVGPrope rtyBase>& to, const String& fromString, const String& toString); 56 void calculateFromAndToValues(RefPtr<SVGPropertyBase>& from, RefPtr<SVGPrope rtyBase>& to, const String& fromString, const String& toString);
57 void calculateFromAndByValues(RefPtr<SVGPropertyBase>& from, RefPtr<SVGPrope rtyBase>& to, const String& fromString, const String& byString); 57 void calculateFromAndByValues(RefPtr<SVGPropertyBase>& from, RefPtr<SVGPrope rtyBase>& to, const String& fromString, const String& byString);
58 58
59 void setContextElement(SVGElement* contextElement) { m_contextElement = cont extElement; } 59 void setContextElement(SVGElement* contextElement) { m_contextElement = cont extElement; }
60 AnimatedPropertyType type() const { return m_type; } 60 AnimatedPropertyType type() const { return m_type; }
61 61
62 bool isAnimatingSVGDom() const { return m_animatedProperty; }
63 bool isAnimatingCSSProperty() const { return !m_animatedProperty; }
64
62 void trace(Visitor*); 65 void trace(Visitor*);
63 66
64 private: 67 private:
65 SVGAnimatedTypeAnimator(AnimatedPropertyType, SVGAnimationElement*, SVGEleme nt*); 68 SVGAnimatedTypeAnimator(AnimatedPropertyType, SVGAnimationElement*, SVGEleme nt*);
66 69
67 friend class ParsePropertyFromString; 70 friend class ParsePropertyFromString;
68 PassRefPtr<SVGPropertyBase> createPropertyForAnimation(const String&); 71 PassRefPtr<SVGPropertyBase> createPropertyForAnimation(const String&);
69 PassRefPtr<SVGPropertyBase> resetAnimation(const WillBeHeapVector<RawPtrWill BeMember<SVGElement> >&); 72 PassRefPtr<SVGPropertyBase> resetAnimation(const WillBeHeapVector<RawPtrWill BeMember<SVGElement> >&);
70 73
71 bool isAnimatingSVGDom() const { return m_animatedProperty; }
72 bool isAnimatingCSSProperty() const { return !m_animatedProperty; }
73
74 AnimatedPropertyType m_type; 74 AnimatedPropertyType m_type;
75 RawPtrWillBeMember<SVGAnimationElement> m_animationElement; 75 RawPtrWillBeMember<SVGAnimationElement> m_animationElement;
76 RawPtrWillBeMember<SVGElement> m_contextElement; 76 RawPtrWillBeMember<SVGElement> m_contextElement;
77 RefPtr<SVGAnimatedPropertyBase> m_animatedProperty; 77 RefPtr<SVGAnimatedPropertyBase> m_animatedProperty;
78 }; 78 };
79 79
80 } // namespace WebCore 80 } // namespace WebCore
81 81
82 #endif // SVGAnimatedTypeAnimator_h 82 #endif // SVGAnimatedTypeAnimator_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGAnimatedNumber.cpp ('k') | Source/core/svg/SVGStaticStringList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698