Commit 28f009ce authored by David Bokan's avatar David Bokan Committed by Commit Bot

[Touchless] Disable Overscroll

Unneeded without touch.

Bug: 986559
Change-Id: I9243f915924cc36e304ce5e864c708b5045638ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717264
Auto-Submit: David Bokan <bokan@chromium.org>
Commit-Queue: Ken Buchanan <kenrb@chromium.org>
Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680594}
parent 1c67a2e8
...@@ -2498,9 +2498,13 @@ jumbo_source_set("browser") { ...@@ -2498,9 +2498,13 @@ jumbo_source_set("browser") {
] ]
libs += [ "jnigraphics" ] libs += [ "jnigraphics" ]
# TODO(crbug.com/986346): this define should not be required once debug URL if (notouch_build) {
# triggering has been generalized. # Similar to the bug below, there should be an API to let the embedder
if (!notouch_build) { # control this.
defines += [ "DISABLE_OVERSCROLL" ]
} else {
# TODO(crbug.com/986346): this define should not be required once debug URL
# triggering has been generalized.
defines += [ "ENABLE_ADDRESS_BAR" ] defines += [ "ENABLE_ADDRESS_BAR" ]
} }
} else { } else {
......
...@@ -2463,6 +2463,9 @@ void RenderWidgetHostViewAndroid::ComputeEventLatencyOSTouchHistograms( ...@@ -2463,6 +2463,9 @@ void RenderWidgetHostViewAndroid::ComputeEventLatencyOSTouchHistograms(
} }
void RenderWidgetHostViewAndroid::CreateOverscrollControllerIfPossible() { void RenderWidgetHostViewAndroid::CreateOverscrollControllerIfPossible() {
#if defined(DISABLE_OVERSCROLL)
return;
#else
// an OverscrollController is already set // an OverscrollController is already set
if (overscroll_controller_) if (overscroll_controller_)
return; return;
...@@ -2498,6 +2501,7 @@ void RenderWidgetHostViewAndroid::CreateOverscrollControllerIfPossible() { ...@@ -2498,6 +2501,7 @@ void RenderWidgetHostViewAndroid::CreateOverscrollControllerIfPossible() {
overscroll_controller_ = std::make_unique<OverscrollControllerAndroid>( overscroll_controller_ = std::make_unique<OverscrollControllerAndroid>(
overscroll_refresh_handler, compositor, view_.GetDipScale()); overscroll_refresh_handler, compositor, view_.GetDipScale());
#endif
} }
void RenderWidgetHostViewAndroid::SetOverscrollControllerForTesting( void RenderWidgetHostViewAndroid::SetOverscrollControllerForTesting(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment