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

Unified Diff: content/browser/renderer_host/overscroll_controller.cc

Issue 478023002: OverscrollController consumes scroll updates only during gesture-nav. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test. Created 6 years, 4 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
Index: content/browser/renderer_host/overscroll_controller.cc
diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc
index 01cf7660a1a944f273c64a07d74d4941f013780a..44a20b58206d0518966c1d452c998f256a9a64aa 100644
--- a/content/browser/renderer_host/overscroll_controller.cc
+++ b/content/browser/renderer_host/overscroll_controller.cc
@@ -222,10 +222,9 @@ bool OverscrollController::ProcessEventForOverscroll(
case blink::WebInputEvent::GestureScrollUpdate: {
const blink::WebGestureEvent& gesture =
static_cast<const blink::WebGestureEvent&>(event);
- ProcessOverscroll(gesture.data.scrollUpdate.deltaX,
- gesture.data.scrollUpdate.deltaY,
- gesture.type);
- event_processed = true;
+ event_processed = ProcessOverscroll(gesture.data.scrollUpdate.deltaX,
+ gesture.data.scrollUpdate.deltaY,
+ gesture.type);
break;
}
case blink::WebInputEvent::GestureFlingStart: {
@@ -263,7 +262,7 @@ bool OverscrollController::ProcessEventForOverscroll(
return event_processed;
}
-void OverscrollController::ProcessOverscroll(float delta_x,
+bool OverscrollController::ProcessOverscroll(float delta_x,
float delta_y,
blink::WebInputEvent::Type type) {
if (scroll_state_ != STATE_CONTENT_SCROLLING)
@@ -279,7 +278,7 @@ void OverscrollController::ProcessOverscroll(float delta_x,
if (fabs(overscroll_delta_x_) <= horiz_threshold &&
fabs(overscroll_delta_y_) <= vert_threshold) {
SetOverscrollMode(OVERSCROLL_NONE);
- return;
+ return false;
}
// Compute the current overscroll direction. If the direction is different
@@ -306,7 +305,7 @@ void OverscrollController::ProcessOverscroll(float delta_x,
SetOverscrollMode(OVERSCROLL_NONE);
if (overscroll_mode_ == OVERSCROLL_NONE)
- return;
+ return false;
// Tell the delegate about the overscroll update so that it can update
// the display accordingly (e.g. show history preview etc.).
@@ -332,8 +331,9 @@ void OverscrollController::ProcessOverscroll(float delta_x,
} else {
delegate_delta_y = 0.f;
}
- delegate_->OnOverscrollUpdate(delegate_delta_x, delegate_delta_y);
+ return delegate_->OnOverscrollUpdate(delegate_delta_x, delegate_delta_y);
}
+ return false;
}
void OverscrollController::CompleteAction() {

Powered by Google App Engine
This is Rietveld 408576698