| Index: third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.cpp b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| index 98ae6fc199d21b7223d7a1b965022eaad084d87e..d9d3850aefd3f5b921ba57338347c38841560498 100644
|
| --- a/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| @@ -396,16 +396,18 @@ Page* ChromeClientImpl::CreateWindow(LocalFrame* frame,
|
| return new_view->GetPage();
|
| }
|
|
|
| -void ChromeClientImpl::DidOverscroll(const FloatSize& overscroll_delta,
|
| - const FloatSize& accumulated_overscroll,
|
| - const FloatPoint& position_in_viewport,
|
| - const FloatSize& velocity_in_viewport) {
|
| +void ChromeClientImpl::DidOverscroll(
|
| + const FloatSize& overscroll_delta,
|
| + const FloatSize& accumulated_overscroll,
|
| + const FloatPoint& position_in_viewport,
|
| + const FloatSize& velocity_in_viewport,
|
| + const WebScrollBoundaryBehavior& behavior) {
|
| if (!web_view_->Client())
|
| return;
|
|
|
| web_view_->Client()->DidOverscroll(overscroll_delta, accumulated_overscroll,
|
| - position_in_viewport,
|
| - velocity_in_viewport);
|
| + position_in_viewport, velocity_in_viewport,
|
| + behavior);
|
| }
|
|
|
| void ChromeClientImpl::Show(NavigationPolicy navigation_policy) {
|
| @@ -1183,6 +1185,11 @@ void ChromeClientImpl::DidUpdateBrowserControls() const {
|
| web_view_->DidUpdateBrowserControls();
|
| }
|
|
|
| +void ChromeClientImpl::SetScrollBoundaryBehavior(
|
| + WebScrollBoundaryBehavior scroll_boundary_behavior) const {
|
| + web_view_->SetScrollBoundaryBehavior(scroll_boundary_behavior);
|
| +}
|
| +
|
| CompositorWorkerProxyClient*
|
| ChromeClientImpl::CreateCompositorWorkerProxyClient(LocalFrame* frame) {
|
| WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame);
|
|
|