| Index: Source/core/dom/Element.cpp
|
| diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
|
| index ddee2df92be60fbc5fc8bbdf42b2c34de427e6f0..e2cf6225687a8f5a253bbee38dd762346f220223 100644
|
| --- a/Source/core/dom/Element.cpp
|
| +++ b/Source/core/dom/Element.cpp
|
| @@ -516,7 +516,7 @@ void Element::applyScroll(ScrollState& scrollState)
|
| // Handle the documentElement separately, as it scrolls the FrameView.
|
| if (this == document().documentElement()) {
|
| FloatSize delta(deltaX, deltaY);
|
| - if (document().frame()->applyScrollDelta(delta, scrollState.isBeginning())) {
|
| + if (document().frame()->applyScrollDelta(delta, scrollState.isBeginning()).didScroll) {
|
| scrolled = true;
|
| scrollState.consumeDeltaNative(scrollState.deltaX(), scrollState.deltaY());
|
| }
|
| @@ -526,12 +526,12 @@ void Element::applyScroll(ScrollState& scrollState)
|
| LayoutBox* curBox = layoutObject()->enclosingBox();
|
| // FIXME: Native scrollers should only consume the scroll they
|
| // apply. See crbug.com/457765.
|
| - if (deltaX && curBox->scroll(ScrollLeft, ScrollByPrecisePixel, deltaX)) {
|
| + if (deltaX && curBox->scroll(ScrollLeft, ScrollByPrecisePixel, deltaX).didScroll) {
|
| scrollState.consumeDeltaNative(scrollState.deltaX(), 0);
|
| scrolled = true;
|
| }
|
|
|
| - if (deltaY && curBox->scroll(ScrollUp, ScrollByPrecisePixel, deltaY)) {
|
| + if (deltaY && curBox->scroll(ScrollUp, ScrollByPrecisePixel, deltaY).didScroll) {
|
| scrollState.consumeDeltaNative(0, scrollState.deltaY());
|
| scrolled = true;
|
| }
|
|
|