third_party/WebKit/Source/core/layout/LayoutBox.cpp - Issue 1738243002: Removed main-thread one dimensional scrolling paths.

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/core/layout/LayoutBox.cpp

Issue 1738243002: Removed main-thread one dimensional scrolling paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@removeStepFromUserScroll

Patch Set: Removed TODO that was already fixed Created 4 years, 10 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

« third_party/WebKit/Source/core/input/EventHandler.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.h » ('j') | third_party/WebKit/Source/platform/scroll/ScrollTypes.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp

index 3bc1709ebb82d41630deda811a4c8265d7b1c927..602c14383e3ff88f2d8bfd72ad04d82fc13514b1 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp

@@ -790,15 +790,15 @@ int LayoutBox::intrinsicScrollbarLogicalWidth() const

return 0;

}

-ScrollResultOneDimensional LayoutBox::scroll(ScrollDirectionPhysical direction, ScrollGranularity granularity, float delta)

+ScrollResult LayoutBox::scroll(ScrollGranularity granularity, const FloatSize& delta)

{

// Presumably the same issue as in setScrollTop. See crbug.com/343132.

DisableCompositingQueryAsserts disabler;

if (!layer() || !layer()->scrollableArea())

- return ScrollResultOneDimensional(false);

+ return ScrollResult();

- return layer()->scrollableArea()->userScroll(direction, granularity, delta);

+ return layer()->scrollableArea()->userScroll(granularity, delta);

}

bool LayoutBox::canBeScrolledAndHasScrollableArea() const