Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: third_party/WebKit/Source/platform/scroll/ScrollAnimator.h

Issue 2015113003: Correctly update scroll offset animations in response to scroll anchoring (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 bool hasRunningAnimation() const override; 51 bool hasRunningAnimation() const override;
52 FloatSize computeDeltaToConsume(const FloatSize& delta) const override; 52 FloatSize computeDeltaToConsume(const FloatSize& delta) const override;
53 53
54 ScrollResult userScroll(ScrollGranularity, const FloatSize& delta) override; 54 ScrollResult userScroll(ScrollGranularity, const FloatSize& delta) override;
55 void scrollToOffsetWithoutAnimation(const FloatPoint&) override; 55 void scrollToOffsetWithoutAnimation(const FloatPoint&) override;
56 FloatPoint desiredTargetPosition() const override; 56 FloatPoint desiredTargetPosition() const override;
57 57
58 // ScrollAnimatorCompositorCoordinator implementation. 58 // ScrollAnimatorCompositorCoordinator implementation.
59 void tickAnimation(double monotonicTime) override; 59 void tickAnimation(double monotonicTime) override;
60 void cancelAnimation() override; 60 void cancelAnimation() override;
61 void adjustAnimationAndSetScrollPosition(IntSize adjustment, ScrollType) ove rride;
61 void takeOverCompositorAnimation() override; 62 void takeOverCompositorAnimation() override;
62 void resetAnimationState() override; 63 void resetAnimationState() override;
63 void updateCompositorAnimations() override; 64 void updateCompositorAnimations() override;
64 void notifyCompositorAnimationFinished(int groupId) override; 65 void notifyCompositorAnimationFinished(int groupId) override;
65 void notifyCompositorAnimationAborted(int groupId) override; 66 void notifyCompositorAnimationAborted(int groupId) override;
66 void layerForCompositedScrollingDidChange(CompositorAnimationTimeline*) over ride; 67 void layerForCompositedScrollingDidChange(CompositorAnimationTimeline*) over ride;
67 68
68 DECLARE_VIRTUAL_TRACE(); 69 DECLARE_VIRTUAL_TRACE();
69 70
70 protected: 71 protected:
(...skipping 25 matching lines...) Expand all
96 // because we are already at targetPos. 97 // because we are already at targetPos.
97 bool willAnimateToOffset(const FloatPoint& targetPos); 98 bool willAnimateToOffset(const FloatPoint& targetPos);
98 99
99 FloatPoint m_targetOffset; 100 FloatPoint m_targetOffset;
100 ScrollGranularity m_lastGranularity; 101 ScrollGranularity m_lastGranularity;
101 }; 102 };
102 103
103 } // namespace blink 104 } // namespace blink
104 105
105 #endif // ScrollAnimator_h 106 #endif // ScrollAnimator_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698