Source/core/paint/DeprecatedPaintLayerScrollableArea.h - Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/paint/DeprecatedPaintLayerScrollableArea.h

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 5 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 side-by-side diff with in-line comments

Download patch

« Source/core/frame/RootFrameViewport.h ('K') | « Source/core/page/SpatialNavigation.cpp ('k') | Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp » ('j') | Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/paint/DeprecatedPaintLayerScrollableArea.h

diff --git a/Source/core/paint/DeprecatedPaintLayerScrollableArea.h b/Source/core/paint/DeprecatedPaintLayerScrollableArea.h

index e90ed8b705eb8123e3f51eab8c90881bdbb7299a..8dd2a4e50141d57f165fb661c0bf9bac49602b8c 100644

--- a/Source/core/paint/DeprecatedPaintLayerScrollableArea.h

+++ b/Source/core/paint/DeprecatedPaintLayerScrollableArea.h

@@ -94,8 +94,8 @@ public:

virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const override;

virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override;

virtual int scrollSize(ScrollbarOrientation) const override;

- virtual void setScrollOffset(const IntPoint&) override;

- virtual void setScrollOffset(const DoublePoint&) override;

+ virtual void setScrollOffset(const IntPoint&, ScrollType) override;

+ virtual void setScrollOffset(const DoublePoint&, ScrollType) override;

virtual IntPoint scrollPosition() const override;

virtual DoublePoint scrollPositionDouble() const override;

virtual IntPoint minimumScrollPosition() const override;

@@ -135,7 +135,7 @@ public:

scrollToOffset(DoubleSize(scrollXOffset(), y), clamp, scrollBehavior);

}

- virtual void setScrollPosition(const DoublePoint& position, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) override

+ virtual void setScrollPosition(const DoublePoint& position, ScrollType scrollType, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) override

{

scrollToOffset(toDoubleSize(position), ScrollOffsetClamped, scrollBehavior);

}