| Index: content/browser/renderer_host/render_widget_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
| index 7bb64e595952a639692cc6feb6d0050514cee258..02b57912c0196f077b5f02d390eff2f370fdb6a6 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -1611,6 +1611,10 @@ void RenderWidgetHostImpl::OnSetCursor(const WebCursor& cursor) {
|
|
|
| void RenderWidgetHostImpl::OnSetTouchEventEmulationEnabled(
|
| bool enabled, bool allow_pinch) {
|
| + // Disable overscroll when touch emulation is on.
|
| + if (delegate_)
|
| + delegate_->SetOverscrollContentDisabled(enabled);
|
| +
|
| if (enabled) {
|
| if (!touch_emulator_)
|
| touch_emulator_.reset(new TouchEmulator(this));
|
|
|