diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/page/scrolling/viewport_scroll_callback.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/page/scrolling/viewport_scroll_callback.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chromium/third_party/blink/renderer/core/page/scrolling/viewport_scroll_callback.cc b/chromium/third_party/blink/renderer/core/page/scrolling/viewport_scroll_callback.cc index ecbb10eb338..89a5d9ad278 100644 --- a/chromium/third_party/blink/renderer/core/page/scrolling/viewport_scroll_callback.cc +++ b/chromium/third_party/blink/renderer/core/page/scrolling/viewport_scroll_callback.cc @@ -25,7 +25,7 @@ ViewportScrollCallback::ViewportScrollCallback( ViewportScrollCallback::~ViewportScrollCallback() = default; -void ViewportScrollCallback::Trace(blink::Visitor* visitor) { +void ViewportScrollCallback::Trace(Visitor* visitor) { visitor->Trace(browser_controls_); visitor->Trace(overscroll_controller_); visitor->Trace(root_frame_viewport_); @@ -59,8 +59,7 @@ bool ViewportScrollCallback::ScrollBrowserControls(ScrollState& state) { browser_controls_->ScrollBegin(); FloatSize delta(state.deltaX(), state.deltaY()); - ScrollGranularity granularity = - ScrollGranularity(static_cast<int>(state.deltaGranularity())); + ScrollGranularity granularity = state.delta_granularity(); if (ShouldScrollBrowserControls(delta, granularity)) { FloatSize remaining_delta = browser_controls_->ScrollBy(delta); FloatSize consumed = delta - remaining_delta; @@ -101,8 +100,7 @@ ScrollResult ViewportScrollCallback::PerformNativeScroll(ScrollState& state) { DCHECK(root_frame_viewport_); FloatSize delta(state.deltaX(), state.deltaY()); - ScrollGranularity granularity = - ScrollGranularity(static_cast<int>(state.deltaGranularity())); + ScrollGranularity granularity = state.delta_granularity(); ScrollResult result = root_frame_viewport_->UserScroll( granularity, delta, ScrollableArea::ScrollCallback()); |