OLD | NEW |
---|---|
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 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1137 | 1137 |
1138 bool SVGSMILElement::progress(SMILTime elapsed, SVGSMILElement* resultElement, b ool seekToTime) | 1138 bool SVGSMILElement::progress(SMILTime elapsed, SVGSMILElement* resultElement, b ool seekToTime) |
1139 { | 1139 { |
1140 ASSERT(resultElement); | 1140 ASSERT(resultElement); |
1141 ASSERT(m_timeContainer); | 1141 ASSERT(m_timeContainer); |
1142 ASSERT(m_isWaitingForFirstInterval || m_interval.begin.isFinite()); | 1142 ASSERT(m_isWaitingForFirstInterval || m_interval.begin.isFinite()); |
1143 | 1143 |
1144 if (!m_syncBaseConditionsConnected) | 1144 if (!m_syncBaseConditionsConnected) |
1145 connectSyncBaseConditions(); | 1145 connectSyncBaseConditions(); |
1146 | 1146 |
1147 if (!m_interval.begin.isFinite()) { | 1147 if (!m_interval.begin.isFinite() || !isValid()) { |
fs
2014/07/28 13:21:24
It feels like this could be made to contribute to
kouhei (in TOK)
2014/07/28 13:27:42
Acknowledged.
| |
1148 ASSERT(m_activeState == Inactive); | 1148 ASSERT(m_activeState == Inactive); |
1149 m_nextProgressTime = SMILTime::unresolved(); | 1149 m_nextProgressTime = SMILTime::unresolved(); |
1150 return false; | 1150 return false; |
1151 } | 1151 } |
1152 | 1152 |
1153 if (elapsed < m_interval.begin) { | 1153 if (elapsed < m_interval.begin) { |
1154 ASSERT(m_activeState != Active); | 1154 ASSERT(m_activeState != Active); |
1155 bool isFrozen = (m_activeState == Frozen); | 1155 bool isFrozen = (m_activeState == Frozen); |
1156 if (isFrozen) { | 1156 if (isFrozen) { |
1157 if (this == resultElement) | 1157 if (this == resultElement) |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1346 #if ENABLE(OILPAN) | 1346 #if ENABLE(OILPAN) |
1347 visitor->trace(m_targetElement); | 1347 visitor->trace(m_targetElement); |
1348 visitor->trace(m_timeContainer); | 1348 visitor->trace(m_timeContainer); |
1349 visitor->trace(m_conditions); | 1349 visitor->trace(m_conditions); |
1350 visitor->trace(m_syncBaseDependents); | 1350 visitor->trace(m_syncBaseDependents); |
1351 #endif | 1351 #endif |
1352 SVGElement::trace(visitor); | 1352 SVGElement::trace(visitor); |
1353 } | 1353 } |
1354 | 1354 |
1355 } | 1355 } |
OLD | NEW |