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

Unified Diff: cc/blink/web_layer_impl.cc

Issue 584503005: Make scroll offset type of float in cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use ScrollOffset instead of vector2dF for scroll offset Created 6 years, 3 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: cc/blink/web_layer_impl.cc
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index c1f67fbed3af08fbe712b402c8c9e47b58a24ddb..3a89208e35d8789ec6919e71958b56ab30c7320b 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -27,6 +27,7 @@
#include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/skia/include/utils/SkMatrix44.h"
+#include "ui/gfx/geometry/vector2d_conversions.h"
using cc::Animation;
using cc::Layer;
@@ -267,12 +268,23 @@ void WebLayerImpl::setForceRenderSurface(bool force_render_surface) {
layer_->SetForceRenderSurface(force_render_surface);
}
+void WebLayerImpl::setScrollPositionFloat(
+ const std::pair<double, double>& position) {
danakj 2014/09/25 15:13:30 are you allowed to use std::pair in the blink publ
Yufeng Shen (Slow to review) 2014/09/25 20:06:23 right, it is suggested to use a new type WebDouble
+ layer_->SetScrollOffset(gfx::ScrollOffset(position.first, position.second));
+}
+
+std::pair<double, double> WebLayerImpl::scrollPositionFloat() const {
+ return std::pair<double, double>(layer_->scroll_offset().x(),
+ layer_->scroll_offset().y());
+}
+
void WebLayerImpl::setScrollPosition(blink::WebPoint position) {
- layer_->SetScrollOffset(gfx::Point(position).OffsetFromOrigin());
+ layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y));
}
blink::WebPoint WebLayerImpl::scrollPosition() const {
- return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset());
+ return gfx::PointAtOffsetFromOrigin(
+ gfx::ToFlooredVector2d(layer_->scroll_offset()));
}
void WebLayerImpl::setScrollClipLayer(WebLayer* clip_layer) {
« no previous file with comments | « cc/blink/web_layer_impl.h ('k') | cc/layers/layer.h » ('j') | cc/layers/layer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698