diff options
| author | rharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 22:49:40 +0000 |
|---|---|---|
| committer | rharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 22:49:40 +0000 |
| commit | 888878e849615b963d8055944c295d1661fdaeb2 (patch) | |
| tree | 7f4f45f67d6298afbb00b1d702032f7aadcf1925 /content/browser/renderer_host/overscroll_controller.cc | |
| parent | 5a45eac52de20243a47d6a79013c7cfb9d230802 (diff) | |
| download | chromium_src-888878e849615b963d8055944c295d1661fdaeb2.zip chromium_src-888878e849615b963d8055944c295d1661fdaeb2.tar.gz chromium_src-888878e849615b963d8055944c295d1661fdaeb2.tar.bz2 | |
Initial plumbing for Scroll End Effect
This CL adds a flag, scroll-end-effect, for controlling whether or not the
experimental scroll end effect is enabled. This flags is false by default. This
CL also adds in the needed plumbing to detect vertical overscroll occurring and
send information about it to BrowserView.
BUG=151356
TEST=Built image with squish effect patch and confirmed:
- Feature turned off by default
- Enabling the flag turns on the feature
- Vertical overscroll causes the expected squish effect
- Other overscroll effects are not broken
Review URL: https://chromiumcodereview.appspot.com/18265004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/overscroll_controller.cc')
| -rw-r--r-- | content/browser/renderer_host/overscroll_controller.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc index 7e9ba4b..37f9e37 100644 --- a/content/browser/renderer_host/overscroll_controller.cc +++ b/content/browser/renderer_host/overscroll_controller.cc @@ -299,12 +299,6 @@ void OverscrollController::ProcessOverscroll(float delta_x, float delta_y) { else if (fabs(overscroll_delta_y_) > fabs(overscroll_delta_x_) * kMinRatio) new_mode = overscroll_delta_y_ > 0.f ? OVERSCROLL_SOUTH : OVERSCROLL_NORTH; - // The vertical oversrcoll currently does not have any UX effects, which can - // be confusing to users. So disable vertical overscroll for now. - // (http://crbug.com/243551 and http://crbug.com/151356). - if (new_mode == OVERSCROLL_SOUTH || new_mode == OVERSCROLL_NORTH) - new_mode = OVERSCROLL_NONE; - if (overscroll_mode_ == OVERSCROLL_NONE) { SetOverscrollMode(new_mode); } else if (new_mode != overscroll_mode_) { |