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

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: Rebased and aligned with code review 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 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 return false; 936 return false;
937 } 937 }
938 938
939 SMILTime SVGSMILElement::nextProgressTime() const 939 SMILTime SVGSMILElement::nextProgressTime() const
940 { 940 {
941 return m_nextProgressTime; 941 return m_nextProgressTime;
942 } 942 }
943 943
944 void SVGSMILElement::beginListChanged(SMILTime eventTime) 944 void SVGSMILElement::beginListChanged(SMILTime eventTime)
945 { 945 {
946 if (m_isWaitingForFirstInterval) 946 if (m_isWaitingForFirstInterval) {
947 resolveFirstInterval(); 947 resolveFirstInterval();
948 else { 948 } else if (this->restart() != RestartNever) {
fs 2015/05/08 10:28:31 I still think this should be checked later, but I'
949 SMILTime newBegin = findInstanceTime(Begin, eventTime, true); 949 SMILTime newBegin = findInstanceTime(Begin, eventTime, true);
950 if (newBegin.isFinite() && (m_interval.end <= eventTime || newBegin < m_ interval.begin)) { 950 if (newBegin.isFinite() && (m_interval.end <= eventTime || newBegin < m_ interval.begin)) {
951 // Begin time changed, re-resolve the interval. 951 // Begin time changed, re-resolve the interval.
952 SMILTime oldBegin = m_interval.begin; 952 SMILTime oldBegin = m_interval.begin;
953 m_interval.end = eventTime; 953 m_interval.end = eventTime;
954 m_interval = resolveInterval(NextInterval); 954 m_interval = resolveInterval(NextInterval);
955 ASSERT(!m_interval.begin.isUnresolved()); 955 ASSERT(!m_interval.begin.isUnresolved());
956 if (m_interval.begin != oldBegin) { 956 if (m_interval.begin != oldBegin) {
957 if (m_activeState == Active && m_interval.begin > eventTime) { 957 if (m_activeState == Active && m_interval.begin > eventTime) {
958 m_activeState = determineActiveState(eventTime); 958 m_activeState = determineActiveState(eventTime);
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 visitor->trace(m_targetElement); 1353 visitor->trace(m_targetElement);
1354 visitor->trace(m_timeContainer); 1354 visitor->trace(m_timeContainer);
1355 visitor->trace(m_conditions); 1355 visitor->trace(m_conditions);
1356 visitor->trace(m_syncBaseDependents); 1356 visitor->trace(m_syncBaseDependents);
1357 #endif 1357 #endif
1358 SVGElement::trace(visitor); 1358 SVGElement::trace(visitor);
1359 SVGTests::trace(visitor); 1359 SVGTests::trace(visitor);
1360 } 1360 }
1361 1361
1362 } // namespace blink 1362 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698