Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2117)

Unified Diff: content/renderer/render_widget.cc

Issue 1861343002: Remove "reportWheelOverscroll" from Blink settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed unit tests and moved check to RenderWidget Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/fake_compositor_dependencies.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/fake_compositor_dependencies.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698