| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 return 0; | 258 return 0; |
| 259 case PhaseAfter: | 259 case PhaseAfter: |
| 260 ASSERT(localTime >= afterTime); | 260 ASSERT(localTime >= afterTime); |
| 261 // If this KeyframeEffect is still in effect then it will need to update | 261 // If this KeyframeEffect is still in effect then it will need to update |
| 262 // when its parent goes out of effect. We have no way of knowing when | 262 // when its parent goes out of effect. We have no way of knowing when |
| 263 // that will be, however, so the parent will need to supply it. | 263 // that will be, however, so the parent will need to supply it. |
| 264 return forwards | 264 return forwards |
| 265 ? std::numeric_limits<double>::infinity() | 265 ? std::numeric_limits<double>::infinity() |
| 266 : localTime - afterTime; | 266 : localTime - afterTime; |
| 267 default: | 267 default: |
| 268 ASSERT_NOT_REACHED(); | 268 NOTREACHED(); |
| 269 return std::numeric_limits<double>::infinity(); | 269 return std::numeric_limits<double>::infinity(); |
| 270 } | 270 } |
| 271 } | 271 } |
| 272 | 272 |
| 273 void KeyframeEffect::notifySampledEffectRemovedFromAnimationStack() | 273 void KeyframeEffect::notifySampledEffectRemovedFromAnimationStack() |
| 274 { | 274 { |
| 275 m_sampledEffect = nullptr; | 275 m_sampledEffect = nullptr; |
| 276 } | 276 } |
| 277 | 277 |
| 278 bool KeyframeEffect::isCandidateForAnimationOnCompositor(double animationPlaybac
kRate) const | 278 bool KeyframeEffect::isCandidateForAnimationOnCompositor(double animationPlaybac
kRate) const |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 | 363 |
| 364 DEFINE_TRACE(KeyframeEffect) | 364 DEFINE_TRACE(KeyframeEffect) |
| 365 { | 365 { |
| 366 visitor->trace(m_target); | 366 visitor->trace(m_target); |
| 367 visitor->trace(m_model); | 367 visitor->trace(m_model); |
| 368 visitor->trace(m_sampledEffect); | 368 visitor->trace(m_sampledEffect); |
| 369 AnimationEffect::trace(visitor); | 369 AnimationEffect::trace(visitor); |
| 370 } | 370 } |
| 371 | 371 |
| 372 } // namespace blink | 372 } // namespace blink |
| OLD | NEW |