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

Unified Diff: cc/layers/layer.cc

Issue 1385123003: Delete scrollCompensationAdjustment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 4 years, 9 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/layers/layer.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index dc02b4cfb619a4edae6dd472be12f9651d3b918c..d8d7e51d95be6149f913adf45523990b7aefb837 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -835,18 +835,6 @@ void Layer::SetScrollOffset(const gfx::ScrollOffset& scroll_offset) {
SetNeedsCommit();
}
-void Layer::SetScrollCompensationAdjustment(
- const gfx::Vector2dF& scroll_compensation_adjustment) {
- if (scroll_compensation_adjustment_ == scroll_compensation_adjustment)
- return;
- scroll_compensation_adjustment_ = scroll_compensation_adjustment;
- SetNeedsCommit();
-}
-
-gfx::Vector2dF Layer::ScrollCompensationAdjustment() const {
- return scroll_compensation_adjustment_;
-}
-
void Layer::SetScrollOffsetFromImplSide(
const gfx::ScrollOffset& scroll_offset) {
DCHECK(IsPropertyChangeAllowed());
@@ -1283,7 +1271,6 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
->property_trees()
->scroll_tree.synced_scroll_offset(layer->id())
->set_clobber_active_value();
- layer->SetScrollCompensationAdjustment(ScrollCompensationAdjustment());
{
TRACE_EVENT0("cc", "Layer::PushPropertiesTo::CopyOutputRequests");
@@ -1529,8 +1516,6 @@ void Layer::LayerSpecificPropertiesToProto(proto::LayerProperties* proto) {
}
ScrollOffsetToProto(scroll_offset_, base->mutable_scroll_offset());
- Vector2dFToProto(scroll_compensation_adjustment_,
- base->mutable_scroll_compensation_adjustment());
// TODO(nyquist): Figure out what to do with CopyRequests.
// See crbug.com/570374.
@@ -1634,8 +1619,6 @@ void Layer::FromLayerSpecificPropertiesProto(
}
scroll_offset_ = ProtoToScrollOffset(base.scroll_offset());
- scroll_compensation_adjustment_ =
- ProtoToVector2dF(base.scroll_compensation_adjustment());
update_rect_.Union(ProtoToRect(base.update_rect()));
}
« no previous file with comments | « cc/layers/layer.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698