| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011, Google Inc. All rights reserved. | 2 * Copyright (c) 2011, 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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 // to be sent to the compositor, or an animation that needs to | 248 // to be sent to the compositor, or an animation that needs to |
| 249 // be updated (a new scroll event before the previous animation | 249 // be updated (a new scroll event before the previous animation |
| 250 // is finished). In either case, the start time is when the | 250 // is finished). In either case, the start time is when the |
| 251 // first animation was initiated. This re-targets the animation | 251 // first animation was initiated. This re-targets the animation |
| 252 // using the current time on main thread. | 252 // using the current time on main thread. |
| 253 animation->setStartTime(m_startTime); | 253 animation->setStartTime(m_startTime); |
| 254 | 254 |
| 255 int animationId = animation->id(); | 255 int animationId = animation->id(); |
| 256 int animationGroupId = animation->group(); | 256 int animationGroupId = animation->group(); |
| 257 | 257 |
| 258 bool sentToCompositor = addAnimation(animation.release()); | 258 bool sentToCompositor = addAnimation(std::move(animation)); |
| 259 if (sentToCompositor) { | 259 if (sentToCompositor) { |
| 260 m_runState = RunState::RunningOnCompositor; | 260 m_runState = RunState::RunningOnCompositor; |
| 261 m_compositorAnimationId = animationId; | 261 m_compositorAnimationId = animationId; |
| 262 m_compositorAnimationGroupId = animationGroupId; | 262 m_compositorAnimationGroupId = animationGroupId; |
| 263 } | 263 } |
| 264 | 264 |
| 265 return sentToCompositor; | 265 return sentToCompositor; |
| 266 } | 266 } |
| 267 | 267 |
| 268 void ScrollAnimator::updateCompositorAnimations() | 268 void ScrollAnimator::updateCompositorAnimations() |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 } | 426 } |
| 427 return true; | 427 return true; |
| 428 } | 428 } |
| 429 | 429 |
| 430 DEFINE_TRACE(ScrollAnimator) | 430 DEFINE_TRACE(ScrollAnimator) |
| 431 { | 431 { |
| 432 ScrollAnimatorBase::trace(visitor); | 432 ScrollAnimatorBase::trace(visitor); |
| 433 } | 433 } |
| 434 | 434 |
| 435 } // namespace blink | 435 } // namespace blink |
| OLD | NEW |