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

Side by Side Diff: Source/core/svg/SVGAnimationElement.cpp

Issue 137443006: Remove support for <animateColor>. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: test adjustments 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 ASSERT(valuesCount >= 1); 496 ASSERT(valuesCount >= 1);
497 497
498 if (percent == 1 || valuesCount == 1) { 498 if (percent == 1 || valuesCount == 1) {
499 from = m_values[valuesCount - 1]; 499 from = m_values[valuesCount - 1];
500 to = m_values[valuesCount - 1]; 500 to = m_values[valuesCount - 1];
501 effectivePercent = 1; 501 effectivePercent = 1;
502 return; 502 return;
503 } 503 }
504 504
505 CalcMode calcMode = this->calcMode(); 505 CalcMode calcMode = this->calcMode();
506 if (hasTagName(SVGNames::animateTag) || hasTagName(SVGNames::animateColorTag )) { 506 if (hasTagName(SVGNames::animateTag)) {
507 AnimatedPropertyType attributeType = toSVGAnimateElement(this)->determin eAnimatedPropertyType(targetElement()); 507 AnimatedPropertyType attributeType = toSVGAnimateElement(this)->determin eAnimatedPropertyType(targetElement());
508 // Fall back to discrete animations for Strings. 508 // Fall back to discrete animations for Strings.
509 if (attributeType == AnimatedBoolean 509 if (attributeType == AnimatedBoolean
510 || attributeType == AnimatedEnumeration 510 || attributeType == AnimatedEnumeration
511 || attributeType == AnimatedPreserveAspectRatio 511 || attributeType == AnimatedPreserveAspectRatio
512 || attributeType == AnimatedString) 512 || attributeType == AnimatedString)
513 calcMode = CalcModeDiscrete; 513 calcMode = CalcModeDiscrete;
514 } 514 }
515 if (!m_keyPoints.isEmpty() && calcMode != CalcModePaced) 515 if (!m_keyPoints.isEmpty() && calcMode != CalcModePaced)
516 return currentValuesFromKeyPoints(percent, effectivePercent, from, to); 516 return currentValuesFromKeyPoints(percent, effectivePercent, from, to);
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 SVGSMILElement::setAttributeName(attributeName); 692 SVGSMILElement::setAttributeName(attributeName);
693 checkInvalidCSSAttributeType(targetElement()); 693 checkInvalidCSSAttributeType(targetElement());
694 } 694 }
695 695
696 void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target) 696 void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target)
697 { 697 {
698 m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attribut eType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeNa me()); 698 m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attribut eType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeNa me());
699 } 699 }
700 700
701 } 701 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698