| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  52  |  52  | 
|  53     ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularit
    y, float step, float delta) override; |  53     ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularit
    y, float step, float delta) override; | 
|  54     void scrollToOffsetWithoutAnimation(const FloatPoint&) override; |  54     void scrollToOffsetWithoutAnimation(const FloatPoint&) override; | 
|  55  |  55  | 
|  56     // ScrollAnimatorCompositorCoordinator implementation. |  56     // ScrollAnimatorCompositorCoordinator implementation. | 
|  57     void tickAnimation(double monotonicTime) override; |  57     void tickAnimation(double monotonicTime) override; | 
|  58     void cancelAnimation() override; |  58     void cancelAnimation() override; | 
|  59     void resetAnimationState() override; |  59     void resetAnimationState() override; | 
|  60     void updateCompositorAnimations() override; |  60     void updateCompositorAnimations() override; | 
|  61     void notifyCompositorAnimationFinished(int groupId) override; |  61     void notifyCompositorAnimationFinished(int groupId) override; | 
 |  62     void notifyCompositorAnimationAborted(int groupId) override; | 
|  62     void layerForCompositedScrollingDidChange(WebCompositorAnimationTimeline*) o
    verride; |  63     void layerForCompositedScrollingDidChange(WebCompositorAnimationTimeline*) o
    verride; | 
|  63  |  64  | 
|  64     DECLARE_VIRTUAL_TRACE(); |  65     DECLARE_VIRTUAL_TRACE(); | 
|  65  |  66  | 
|  66 protected: |  67 protected: | 
|  67     OwnPtr<WebScrollOffsetAnimationCurve> m_animationCurve; |  68     OwnPtr<WebScrollOffsetAnimationCurve> m_animationCurve; | 
|  68     double m_startTime; |  69     double m_startTime; | 
|  69     WTF::TimeFunction m_timeFunction; |  70     WTF::TimeFunction m_timeFunction; | 
|  70  |  71  | 
|  71 private: |  72 private: | 
|  72     FloatPoint desiredTargetPosition() const; |  73     FloatPoint desiredTargetPosition() const; | 
|  73  |  74  | 
|  74     // Returns true if the animation was scheduled successfully. If animation |  75     // Returns true if the animation was scheduled successfully. If animation | 
|  75     // could not be scheduled (e.g. because the frame is detached), scrolls |  76     // could not be scheduled (e.g. because the frame is detached), scrolls | 
|  76     // immediately to the target and returns false. |  77     // immediately to the target and returns false. | 
|  77     bool registerAndScheduleAnimation(); |  78     bool registerAndScheduleAnimation(); | 
|  78  |  79  | 
|  79     FloatPoint m_targetOffset; |  80     FloatPoint m_targetOffset; | 
|  80 }; |  81 }; | 
|  81  |  82  | 
|  82 } // namespace blink |  83 } // namespace blink | 
|  83  |  84  | 
|  84 #endif // ScrollAnimator_h |  85 #endif // ScrollAnimator_h | 
| OLD | NEW |