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

Unified Diff: cc/blink/web_layer_impl.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « cc/blink/web_layer_impl.h ('k') | cc/cc.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/web_layer_impl.cc
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index f73ae10429e1174f3c2dc83bd41be82bb1b158f3..6ce8ac5cbcdcc16424a6b5a1591f859744a5d56a 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -5,10 +5,10 @@
#include "cc/blink/web_layer_impl.h"
#include "base/bind.h"
-#include "base/debug/trace_event_impl.h"
#include "base/lazy_instance.h"
#include "base/strings/string_util.h"
#include "base/threading/thread_checker.h"
+#include "base/trace_event/trace_event_impl.h"
#include "cc/animation/animation.h"
#include "cc/base/region.h"
#include "cc/base/switches.h"
@@ -273,6 +273,12 @@ void WebLayerImpl::setScrollPositionDouble(blink::WebDoublePoint position) {
layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y));
}
+void WebLayerImpl::setScrollCompensationAdjustment(
+ blink::WebDoublePoint position) {
+ layer_->SetScrollCompensationAdjustment(
+ gfx::Vector2dF(position.x, position.y));
+}
+
blink::WebDoublePoint WebLayerImpl::scrollPositionDouble() const {
return blink::WebDoublePoint(layer_->scroll_offset().x(),
layer_->scroll_offset().y());
« no previous file with comments | « cc/blink/web_layer_impl.h ('k') | cc/cc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698