third_party/WebKit/Source/platform/scroll/ScrollableArea.h - Issue 1496693005: Update RootFrameViewport::userScroll to distribute scrolls between viewports.

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: third_party/WebKit/Source/platform/scroll/ScrollableArea.h

Issue 1496693005: Update RootFrameViewport::userScroll to distribute scrolls between viewports. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update test expectation Created 5 years 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

« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp ('k') | third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp » ('j') | third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h

index d643a1a87451842f0d6bd3a69075080dc07a77f7..20e99897d033df3f2e9ac3aa0a17e123139df90b 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h

+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h

@@ -244,7 +244,7 @@ public:

void layerForScrollingDidChange(WebCompositorAnimationTimeline*);

void cancelScrollAnimation();

- void cancelProgrammaticScrollAnimation();

+ virtual void cancelProgrammaticScrollAnimation();

virtual ~ScrollableArea();

@@ -280,6 +280,9 @@ public:

protected:

ScrollableArea();

+ ScrollbarOrientation scrollbarOrientationFromDirection(ScrollDirectionPhysical) const;

+ float scrollStep(ScrollGranularity, ScrollbarOrientation) const;

void setScrollOrigin(const IntPoint&);

void resetScrollOriginChanged() { m_scrollOriginChanged = false; }