diff options
| author | ccameron <ccameron@chromium.org> | 2014-12-09 11:56:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-09 19:56:58 +0000 |
| commit | 98be9ac05260466ebd0da0373edebb0b20ef54b2 (patch) | |
| tree | 160c79e4c5cdbbb9a0ebc5c4aa83725a014b7507 /mojo | |
| parent | 984a84a3d1a99a1accf55b4db46dfdc7df29e6d6 (diff) | |
| download | chromium_src-98be9ac05260466ebd0da0373edebb0b20ef54b2.zip chromium_src-98be9ac05260466ebd0da0373edebb0b20ef54b2.tar.gz chromium_src-98be9ac05260466ebd0da0373edebb0b20ef54b2.tar.bz2 | |
Add argument to pass elastic overscroll delta to Blink (Chrome side)
Blink will need to use this argument to translate input events during
overscroll.
R=enne
TBR=jam
BUG=133097
Review URL: https://codereview.chromium.org/783373002
Cr-Commit-Position: refs/heads/master@{#307525}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/weblayertreeview_impl.cc | 2 | ||||
| -rw-r--r-- | mojo/services/html_viewer/weblayertreeview_impl.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mojo/services/html_viewer/weblayertreeview_impl.cc b/mojo/services/html_viewer/weblayertreeview_impl.cc index 0b19b10..c0d77b1 100644 --- a/mojo/services/html_viewer/weblayertreeview_impl.cc +++ b/mojo/services/html_viewer/weblayertreeview_impl.cc @@ -79,11 +79,13 @@ void WebLayerTreeViewImpl::Layout() { void WebLayerTreeViewImpl::ApplyViewportDeltas( const gfx::Vector2d& inner_delta, const gfx::Vector2d& outer_delta, + const gfx::Vector2dF& elastic_overscroll_delta, float page_scale, float top_controls_delta) { widget_->applyViewportDeltas( inner_delta, outer_delta, + elastic_overscroll_delta, page_scale, top_controls_delta); } diff --git a/mojo/services/html_viewer/weblayertreeview_impl.h b/mojo/services/html_viewer/weblayertreeview_impl.h index e394df0..3cc53d4 100644 --- a/mojo/services/html_viewer/weblayertreeview_impl.h +++ b/mojo/services/html_viewer/weblayertreeview_impl.h @@ -51,6 +51,7 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView, void Layout() override; void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, const gfx::Vector2d& outer_delta, + const gfx::Vector2dF& elastic_overscroll_delta, float page_scale, float top_controls_delta) override; void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |