summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authormiletus <miletus@chromium.org>2015-02-04 12:44:49 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-04 20:46:24 +0000
commit7a2217569bc1a7596ad6671513249e241b3491c3 (patch)
tree15fef4d70a7f84a910d01b032396027720fff1b1 /mojo
parentf813693baf707fd30d0e25eebaf0da6c08f74acc (diff)
downloadchromium_src-7a2217569bc1a7596ad6671513249e241b3491c3.zip
chromium_src-7a2217569bc1a7596ad6671513249e241b3491c3.tar.gz
chromium_src-7a2217569bc1a7596ad6671513249e241b3491c3.tar.bz2
Remove scroll_delta flooring hack
Now that fractional scroll offset can pass through cc main thread and Blink, we can remove the scroll_delta flooring hack and send the full fractional scroll_delta from impl to main. Note that this will break the old pinch viewport code path ( which is to be removed soon) since it still only expects integer scroll offset. BUG=414283 Review URL: https://codereview.chromium.org/870363005 Cr-Commit-Position: refs/heads/master@{#314626}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/services/html_viewer/weblayertreeview_impl.cc4
-rw-r--r--mojo/services/html_viewer/weblayertreeview_impl.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/mojo/services/html_viewer/weblayertreeview_impl.cc b/mojo/services/html_viewer/weblayertreeview_impl.cc
index a9a6945..00507dee 100644
--- a/mojo/services/html_viewer/weblayertreeview_impl.cc
+++ b/mojo/services/html_viewer/weblayertreeview_impl.cc
@@ -80,8 +80,8 @@ void WebLayerTreeViewImpl::Layout() {
}
void WebLayerTreeViewImpl::ApplyViewportDeltas(
- const gfx::Vector2d& inner_delta,
- const gfx::Vector2d& outer_delta,
+ const gfx::Vector2dF& inner_delta,
+ const gfx::Vector2dF& outer_delta,
const gfx::Vector2dF& elastic_overscroll_delta,
float page_scale,
float top_controls_delta) {
diff --git a/mojo/services/html_viewer/weblayertreeview_impl.h b/mojo/services/html_viewer/weblayertreeview_impl.h
index 269fc9f..d69cd9b 100644
--- a/mojo/services/html_viewer/weblayertreeview_impl.h
+++ b/mojo/services/html_viewer/weblayertreeview_impl.h
@@ -52,8 +52,8 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
void DidBeginMainFrame() override;
void BeginMainFrame(const cc::BeginFrameArgs& args) override;
void Layout() override;
- void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
- const gfx::Vector2d& outer_delta,
+ void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
+ const gfx::Vector2dF& outer_delta,
const gfx::Vector2dF& elastic_overscroll_delta,
float page_scale,
float top_controls_delta) override;