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

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

Issue 11340016: Merge 132724 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 1 month 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 | « Source/WebCore/svg/animation/SMILTime.h ('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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 return m_cachedMin = (result.isUnresolved() || result < 0) ? 0 : result; 706 return m_cachedMin = (result.isUnresolved() || result < 0) ? 0 : result;
707 } 707 }
708 708
709 SMILTime SVGSMILElement::simpleDuration() const 709 SMILTime SVGSMILElement::simpleDuration() const
710 { 710 {
711 return min(dur(), SMILTime::indefinite()); 711 return min(dur(), SMILTime::indefinite());
712 } 712 }
713 713
714 void SVGSMILElement::addBeginTime(SMILTime eventTime, SMILTime beginTime, SMILTi meWithOrigin::Origin origin) 714 void SVGSMILElement::addBeginTime(SMILTime eventTime, SMILTime beginTime, SMILTi meWithOrigin::Origin origin)
715 { 715 {
716 ASSERT(!isnan(beginTime.value()));
716 m_beginTimes.append(SMILTimeWithOrigin(beginTime, origin)); 717 m_beginTimes.append(SMILTimeWithOrigin(beginTime, origin));
717 sortTimeList(m_beginTimes); 718 sortTimeList(m_beginTimes);
718 beginListChanged(eventTime); 719 beginListChanged(eventTime);
719 } 720 }
720 721
721 void SVGSMILElement::addEndTime(SMILTime eventTime, SMILTime endTime, SMILTimeWi thOrigin::Origin origin) 722 void SVGSMILElement::addEndTime(SMILTime eventTime, SMILTime endTime, SMILTimeWi thOrigin::Origin origin)
722 { 723 {
724 ASSERT(!isnan(endTime.value()));
723 m_endTimes.append(SMILTimeWithOrigin(endTime, origin)); 725 m_endTimes.append(SMILTimeWithOrigin(endTime, origin));
724 sortTimeList(m_endTimes); 726 sortTimeList(m_endTimes);
725 endListChanged(eventTime); 727 endListChanged(eventTime);
726 } 728 }
727 729
728 inline SMILTime extractTimeFromVector(const SMILTimeWithOrigin* position) 730 inline SMILTime extractTimeFromVector(const SMILTimeWithOrigin* position)
729 { 731 {
730 return position->time(); 732 return position->time();
731 } 733 }
732 734
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 1191
1190 void SVGSMILElement::endedActiveInterval() 1192 void SVGSMILElement::endedActiveInterval()
1191 { 1193 {
1192 clearTimesWithDynamicOrigins(m_beginTimes); 1194 clearTimesWithDynamicOrigins(m_beginTimes);
1193 clearTimesWithDynamicOrigins(m_endTimes); 1195 clearTimesWithDynamicOrigins(m_endTimes);
1194 } 1196 }
1195 1197
1196 } 1198 }
1197 1199
1198 #endif 1200 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/svg/animation/SMILTime.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698