Index: content/renderer/render_widget.cc |
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc |
index 0f53306133004e870e0fbca12970d1156fdd0860..1759842940ee685feb65bdab729ab08571d3d061 100644 |
--- a/content/renderer/render_widget.cc |
+++ b/content/renderer/render_widget.cc |
@@ -1993,6 +1993,13 @@ void RenderWidget::didOverscroll( |
const blink::WebFloatSize& accumulatedRootOverScroll, |
const blink::WebFloatPoint& position, |
const blink::WebFloatSize& velocity) { |
+#if defined(OS_MACOSX) |
+ // On OSX the user can disable the elastic overscroll effect. If that's the |
+ // case, don't forward the overscroll notification. |
+ DCHECK(compositor_deps()); |
+ if (!compositor_deps()->IsElasticOverscrollEnabled()) |
+ return; |
+#endif |
input_handler_->DidOverscrollFromBlink(unusedDelta, accumulatedRootOverScroll, |
position, velocity); |
} |