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

Side by Side Diff: Source/core/svg/animation/SVGSMILElement.cpp

Issue 1119723002: SVG animate should respect attribute 'restart=never'. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed unwanted lines Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 1123
1124 if (!m_syncBaseConditionsConnected) 1124 if (!m_syncBaseConditionsConnected)
1125 connectSyncBaseConditions(); 1125 connectSyncBaseConditions();
1126 1126
1127 if (!m_interval.begin.isFinite()) { 1127 if (!m_interval.begin.isFinite()) {
1128 ASSERT(m_activeState == Inactive); 1128 ASSERT(m_activeState == Inactive);
1129 m_nextProgressTime = SMILTime::unresolved(); 1129 m_nextProgressTime = SMILTime::unresolved();
1130 return false; 1130 return false;
1131 } 1131 }
1132 1132
1133 if (!m_isWaitingForFirstInterval && m_activeState != Active && this->restart () == RestartNever) {
1134 m_nextProgressTime = SMILTime::unresolved();
fs 2015/04/30 13:24:43 This seems a bit "early" to handle this? Not entir
Shanmuga Pandi 2015/04/30 13:42:57 Basically, I am trying to ignore the restart of an
fs 2015/04/30 13:53:42 Yes, I got that bit. =)
Shanmuga Pandi 2015/04/30 14:03:00 Sorry. Could you give some live example or jsfiddl
fs 2015/04/30 14:05:07 I think your testcase would should exactly that. I
1135 return false;
1136 }
1137
1133 if (elapsed < m_interval.begin) { 1138 if (elapsed < m_interval.begin) {
1134 ASSERT(m_activeState != Active); 1139 ASSERT(m_activeState != Active);
1135 bool isFrozen = (m_activeState == Frozen); 1140 bool isFrozen = (m_activeState == Frozen);
1136 if (isFrozen) { 1141 if (isFrozen) {
1137 if (this == resultElement) 1142 if (this == resultElement)
1138 resetAnimatedType(); 1143 resetAnimatedType();
1139 updateAnimation(m_lastPercent, m_lastRepeat, resultElement); 1144 updateAnimation(m_lastPercent, m_lastRepeat, resultElement);
1140 } 1145 }
1141 m_nextProgressTime = m_interval.begin; 1146 m_nextProgressTime = m_interval.begin;
1142 // If the animation is frozen, it's still contributing. 1147 // If the animation is frozen, it's still contributing.
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 visitor->trace(m_targetElement); 1358 visitor->trace(m_targetElement);
1354 visitor->trace(m_timeContainer); 1359 visitor->trace(m_timeContainer);
1355 visitor->trace(m_conditions); 1360 visitor->trace(m_conditions);
1356 visitor->trace(m_syncBaseDependents); 1361 visitor->trace(m_syncBaseDependents);
1357 #endif 1362 #endif
1358 SVGElement::trace(visitor); 1363 SVGElement::trace(visitor);
1359 SVGTests::trace(visitor); 1364 SVGTests::trace(visitor);
1360 } 1365 }
1361 1366
1362 } // namespace blink 1367 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698