projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
svg
/
SVGAnimationElement.cpp
diff --git
a/src/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp
b/src/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp
index
02f4cf7
..
e2a27a7
100644
(file)
--- a/
src/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp
+++ b/
src/third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp
@@
-37,11
+37,10
@@
#include "platform/FloatConversion.h"
#include "wtf/MathExtras.h"
#include "platform/FloatConversion.h"
#include "wtf/MathExtras.h"
-namespace
WebCore
{
+namespace
blink
{
SVGAnimationElement::SVGAnimationElement(const QualifiedName& tagName, Document& document)
: SVGSMILElement(tagName, document)
SVGAnimationElement::SVGAnimationElement(const QualifiedName& tagName, Document& document)
: SVGSMILElement(tagName, document)
- , SVGTests(this)
, m_fromPropertyValueType(RegularPropertyValue)
, m_toPropertyValueType(RegularPropertyValue)
, m_animationValid(false)
, m_fromPropertyValueType(RegularPropertyValue)
, m_toPropertyValueType(RegularPropertyValue)
, m_animationValid(false)
@@
-142,7
+141,6
@@
bool SVGAnimationElement::isSupportedAttribute(const QualifiedName& attrName)
{
DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
if (supportedAttributes.isEmpty()) {
{
DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
if (supportedAttributes.isEmpty()) {
- SVGTests::addSupportedAttributes(supportedAttributes);
supportedAttributes.add(SVGNames::valuesAttr);
supportedAttributes.add(SVGNames::keyTimesAttr);
supportedAttributes.add(SVGNames::keyPointsAttr);
supportedAttributes.add(SVGNames::valuesAttr);
supportedAttributes.add(SVGNames::keyTimesAttr);
supportedAttributes.add(SVGNames::keyPointsAttr);
@@
-209,9
+207,6
@@
void SVGAnimationElement::parseAttribute(const QualifiedName& name, const Atomic
return;
}
return;
}
- if (SVGTests::parseAttribute(name, value))
- return;
-
ASSERT_NOT_REACHED();
}
ASSERT_NOT_REACHED();
}
@@
-551,6
+546,9
@@
void SVGAnimationElement::startedActiveInterval()
{
m_animationValid = false;
{
m_animationValid = false;
+ if (!isValid())
+ return;
+
if (!hasValidAttributeType())
return;
if (!hasValidAttributeType())
return;