| 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             } |  248             } | 
|  249         } |  249         } | 
|  250  |  250  | 
|  251         if (!sentToCompositor) { |  251         if (!sentToCompositor) { | 
|  252             if (registerAndScheduleAnimation()) |  252             if (registerAndScheduleAnimation()) | 
|  253                 m_runState = RunState::RunningOnMainThread; |  253                 m_runState = RunState::RunningOnMainThread; | 
|  254         } |  254         } | 
|  255     } |  255     } | 
|  256 } |  256 } | 
|  257  |  257  | 
 |  258 void ScrollAnimator::notifyCompositorAnimationAborted(int groupId) | 
 |  259 { | 
 |  260     // An animation aborted by the compositor is treated as a finished | 
 |  261     // animation. | 
 |  262     ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); | 
 |  263 } | 
 |  264  | 
|  258 void ScrollAnimator::notifyCompositorAnimationFinished(int groupId) |  265 void ScrollAnimator::notifyCompositorAnimationFinished(int groupId) | 
|  259 { |  266 { | 
|  260     ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); |  267     ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); | 
|  261 } |  268 } | 
|  262  |  269  | 
|  263 void ScrollAnimator::cancelAnimation() |  270 void ScrollAnimator::cancelAnimation() | 
|  264 { |  271 { | 
|  265     ScrollAnimatorCompositorCoordinator::cancelAnimation(); |  272     ScrollAnimatorCompositorCoordinator::cancelAnimation(); | 
|  266 } |  273 } | 
|  267  |  274  | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
|  281     } |  288     } | 
|  282     return true; |  289     return true; | 
|  283 } |  290 } | 
|  284  |  291  | 
|  285 DEFINE_TRACE(ScrollAnimator) |  292 DEFINE_TRACE(ScrollAnimator) | 
|  286 { |  293 { | 
|  287     ScrollAnimatorBase::trace(visitor); |  294     ScrollAnimatorBase::trace(visitor); | 
|  288 } |  295 } | 
|  289  |  296  | 
|  290 } // namespace blink |  297 } // namespace blink | 
| OLD | NEW |