| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 if (fillMode != Timing::FillModeAuto) | 44 if (fillMode != Timing::FillModeAuto) |
| 45 return fillMode; | 45 return fillMode; |
| 46 if (isAnimation) | 46 if (isAnimation) |
| 47 return Timing::FillModeNone; | 47 return Timing::FillModeNone; |
| 48 return Timing::FillModeBoth; | 48 return Timing::FillModeBoth; |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace | 51 } // namespace |
| 52 | 52 |
| 53 TimedItem::TimedItem(const Timing& timing, PassOwnPtr<EventDelegate> eventDelega
te) | 53 TimedItem::TimedItem(const Timing& timing, PassOwnPtr<EventDelegate> eventDelega
te) |
| 54 : m_parent(0) | 54 : m_parent(nullptr) |
| 55 , m_startTime(0) | 55 , m_startTime(0) |
| 56 , m_player(0) | 56 , m_player(nullptr) |
| 57 , m_timing(timing) | 57 , m_timing(timing) |
| 58 , m_eventDelegate(eventDelegate) | 58 , m_eventDelegate(eventDelegate) |
| 59 , m_calculated() | 59 , m_calculated() |
| 60 , m_needsUpdate(true) | 60 , m_needsUpdate(true) |
| 61 , m_lastUpdateTime(nullValue()) | 61 , m_lastUpdateTime(nullValue()) |
| 62 { | 62 { |
| 63 m_timing.assertValid(); | 63 m_timing.assertValid(); |
| 64 } | 64 } |
| 65 | 65 |
| 66 double TimedItem::iterationDuration() const | 66 double TimedItem::iterationDuration() const |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 const TimedItem::CalculatedTiming& TimedItem::ensureCalculated() const | 174 const TimedItem::CalculatedTiming& TimedItem::ensureCalculated() const |
| 175 { | 175 { |
| 176 if (!m_player) | 176 if (!m_player) |
| 177 return m_calculated; | 177 return m_calculated; |
| 178 if (m_player->outdated()) | 178 if (m_player->outdated()) |
| 179 m_player->update(TimingUpdateOnDemand); | 179 m_player->update(TimingUpdateOnDemand); |
| 180 ASSERT(!m_player->outdated()); | 180 ASSERT(!m_player->outdated()); |
| 181 return m_calculated; | 181 return m_calculated; |
| 182 } | 182 } |
| 183 | 183 |
| 184 PassRefPtr<TimedItemTiming> TimedItem::timing() | 184 PassRefPtrWillBeRawPtr<TimedItemTiming> TimedItem::timing() |
| 185 { | 185 { |
| 186 return TimedItemTiming::create(this); | 186 return TimedItemTiming::create(this); |
| 187 } | 187 } |
| 188 | 188 |
| 189 void TimedItem::trace(Visitor* visitor) |
| 190 { |
| 191 visitor->trace(m_parent); |
| 192 visitor->trace(m_player); |
| 193 } |
| 194 |
| 189 } // namespace WebCore | 195 } // namespace WebCore |
| OLD | NEW |