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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 565673003: Properly initialize top controls content offset on LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed up unit tests 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
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index e368bb837732942570980c9da0a9e35e84677a5a..79dc32f627ddae5de8429f4a2975cc38fd8b4478 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -94,7 +94,7 @@ LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl)
has_ever_been_drawn_(false),
render_surface_layer_list_id_(0),
top_controls_layout_height_(0),
- top_controls_top_offset_(0),
+ top_controls_content_offset_(0),
top_controls_delta_(0),
sent_top_controls_delta_(0) {
}
@@ -205,7 +205,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
target_tree->PassSwapPromises(&swap_promise_list_);
target_tree->top_controls_layout_height_ = top_controls_layout_height_;
- target_tree->top_controls_top_offset_ = top_controls_top_offset_;
+ target_tree->top_controls_content_offset_ = top_controls_content_offset_;
target_tree->top_controls_delta_ =
target_tree->top_controls_delta_ -
target_tree->sent_top_controls_delta_;
@@ -387,7 +387,7 @@ void LayerTreeImpl::ApplySentScrollAndScaleDeltasFromAbortedCommit() {
page_scale_delta_ /= sent_page_scale_delta_;
sent_page_scale_delta_ = 1.f;
- top_controls_top_offset_ += sent_top_controls_delta_;
+ top_controls_content_offset_ += sent_top_controls_delta_;
top_controls_delta_ -= sent_top_controls_delta_;
sent_top_controls_delta_ = 0.f;
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698