| Index: content/renderer/input/render_widget_input_handler.cc
|
| diff --git a/content/renderer/input/render_widget_input_handler.cc b/content/renderer/input/render_widget_input_handler.cc
|
| index 6fc4edd7d965edd99813dd2f262869733e808404..75b8c33581fd12e3f781cf6805dcb5bd691aa64c 100644
|
| --- a/content/renderer/input/render_widget_input_handler.cc
|
| +++ b/content/renderer/input/render_widget_input_handler.cc
|
| @@ -44,6 +44,7 @@ using blink::WebInputEventResult;
|
| using blink::WebKeyboardEvent;
|
| using blink::WebMouseEvent;
|
| using blink::WebMouseWheelEvent;
|
| +using blink::WebScrollBoundaryBehavior;
|
| using blink::WebTouchEvent;
|
| using blink::WebTouchPoint;
|
| using ui::DidOverscrollParams;
|
| @@ -422,7 +423,8 @@ void RenderWidgetInputHandler::DidOverscrollFromBlink(
|
| const WebFloatSize& overscrollDelta,
|
| const WebFloatSize& accumulatedOverscroll,
|
| const WebFloatPoint& position,
|
| - const WebFloatSize& velocity) {
|
| + const WebFloatSize& velocity,
|
| + const WebScrollBoundaryBehavior& behavior) {
|
| std::unique_ptr<DidOverscrollParams> params(new DidOverscrollParams());
|
| params->accumulated_overscroll = gfx::Vector2dF(
|
| accumulatedOverscroll.width, accumulatedOverscroll.height);
|
| @@ -431,6 +433,7 @@ void RenderWidgetInputHandler::DidOverscrollFromBlink(
|
| params->current_fling_velocity =
|
| gfx::Vector2dF(velocity.width, velocity.height);
|
| params->causal_event_viewport_point = gfx::PointF(position.x, position.y);
|
| + params->scroll_boundary_behavior = behavior;
|
|
|
| // If we're currently handling an event, stash the overscroll data such that
|
| // it can be bundled in the event ack.
|
|
|