diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/third_party/blink/renderer/core/scroll/scroll_animator.cc | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/scroll/scroll_animator.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/scroll/scroll_animator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/core/scroll/scroll_animator.cc b/chromium/third_party/blink/renderer/core/scroll/scroll_animator.cc index 53814bea940..d2dc57d9b30 100644 --- a/chromium/third_party/blink/renderer/core/scroll/scroll_animator.cc +++ b/chromium/third_party/blink/renderer/core/scroll/scroll_animator.cc @@ -211,7 +211,7 @@ bool ScrollAnimator::WillAnimateToOffset(const ScrollOffset& target_offset) { void ScrollAnimator::AdjustAnimationAndSetScrollOffset( const ScrollOffset& offset, - ScrollType scroll_type) { + mojom::blink::ScrollType scroll_type) { IntSize adjustment = RoundedIntSize(offset) - RoundedIntSize(scrollable_area_->GetScrollOffset()); ScrollOffsetChanged(offset, scroll_type); @@ -407,7 +407,7 @@ bool ScrollAnimator::RegisterAndScheduleAnimation() { return true; } -void ScrollAnimator::Trace(blink::Visitor* visitor) { +void ScrollAnimator::Trace(Visitor* visitor) { ScrollAnimatorBase::Trace(visitor); } |