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

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

Issue 1989033003: Move clearAnimatedType() up the stack (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp ('k') | no next file » | 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) 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 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 dispatchRepeatEvents(repeat); 1186 dispatchRepeatEvents(repeat);
1187 1187
1188 updateAnimation(percent, repeat, resultElement); 1188 updateAnimation(percent, repeat, resultElement);
1189 m_lastPercent = percent; 1189 m_lastPercent = percent;
1190 m_lastRepeat = repeat; 1190 m_lastRepeat = repeat;
1191 } 1191 }
1192 1192
1193 if ((oldActiveState == Active && m_activeState != Active) || restartedInterv al == DidRestartInterval) { 1193 if ((oldActiveState == Active && m_activeState != Active) || restartedInterv al == DidRestartInterval) {
1194 smilEndEventSender().dispatchEventSoon(this); 1194 smilEndEventSender().dispatchEventSoon(this);
1195 endedActiveInterval(); 1195 endedActiveInterval();
1196 if (!animationIsContributing && this == resultElement)
1197 clearAnimatedType();
1198 } 1196 }
1199 1197
1200 // Triggering all the pending events if the animation timeline is changed. 1198 // Triggering all the pending events if the animation timeline is changed.
1201 if (seekToTime) { 1199 if (seekToTime) {
1202 if (m_activeState == Inactive) 1200 if (m_activeState == Inactive)
1203 smilBeginEventSender().dispatchEventSoon(this); 1201 smilBeginEventSender().dispatchEventSoon(this);
1204 1202
1205 if (repeat) { 1203 if (repeat) {
1206 for (unsigned repeatEventCount = 1; repeatEventCount < repeat; repea tEventCount++) 1204 for (unsigned repeatEventCount = 1; repeatEventCount < repeat; repea tEventCount++)
1207 dispatchRepeatEvents(repeatEventCount); 1205 dispatchRepeatEvents(repeatEventCount);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 { 1357 {
1360 visitor->trace(m_targetElement); 1358 visitor->trace(m_targetElement);
1361 visitor->trace(m_timeContainer); 1359 visitor->trace(m_timeContainer);
1362 visitor->trace(m_conditions); 1360 visitor->trace(m_conditions);
1363 visitor->trace(m_syncBaseDependents); 1361 visitor->trace(m_syncBaseDependents);
1364 SVGElement::trace(visitor); 1362 SVGElement::trace(visitor);
1365 SVGTests::trace(visitor); 1363 SVGTests::trace(visitor);
1366 } 1364 }
1367 1365
1368 } // namespace blink 1366 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698