| 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 c19121ee003cbbcfcc1514687d54ab80e6589498..031af690f814c7fa0e177075a526bb2e9a77f3ec 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -768,15 +768,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 (!scrollableArea())
|
| - return ScrollResultOneDimensional(false);
|
| + return ScrollResult();
|
|
|
| - return scrollableArea()->userScroll(direction, granularity, delta);
|
| + return scrollableArea()->userScroll(granularity, delta);
|
| }
|
|
|
| bool LayoutBox::canBeScrolledAndHasScrollableArea() const
|
|
|