Index: Source/core/rendering/RenderBox.cpp |
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp |
index 7c0317be2904508c2c8bb47f8f9942dddf60f2b2..3e4de86c09cd64845a3509781061c062d0ff76cb 100644 |
--- a/Source/core/rendering/RenderBox.cpp |
+++ b/Source/core/rendering/RenderBox.cpp |
@@ -402,7 +402,7 @@ void RenderBox::setScrollLeft(LayoutUnit newLeft) |
DisableCompositingQueryAsserts disabler; |
if (hasOverflowClip()) |
- layer()->scrollableArea()->scrollToXOffset(newLeft, ScrollOffsetClamped); |
+ layer()->scrollableArea()->scrollToXOffset(newLeft, ScrollOffsetClamped, ScrollBehaviorAuto); |
} |
void RenderBox::setScrollTop(LayoutUnit newTop) |
@@ -411,17 +411,17 @@ void RenderBox::setScrollTop(LayoutUnit newTop) |
DisableCompositingQueryAsserts disabler; |
if (hasOverflowClip()) |
- layer()->scrollableArea()->scrollToYOffset(newTop, ScrollOffsetClamped); |
+ layer()->scrollableArea()->scrollToYOffset(newTop, ScrollOffsetClamped, ScrollBehaviorAuto); |
} |
-void RenderBox::scrollToOffset(const DoubleSize& offset) |
+void RenderBox::scrollToOffset(const DoubleSize& offset, ScrollBehavior scrollBehavior) |
{ |
ASSERT(hasOverflowClip()); |
// This doesn't hit in any tests, but since the equivalent code in setScrollTop |
// does, presumably this code does as well. |
DisableCompositingQueryAsserts disabler; |
- layer()->scrollableArea()->scrollToOffset(offset, ScrollOffsetClamped); |
+ layer()->scrollableArea()->scrollToOffset(offset, ScrollOffsetClamped, scrollBehavior); |
} |
static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameElementBase, FrameView* frameView) |