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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 16871016: cc: Use BeginFrameArgs (Closed) Base URL: http://git.chromium.org/chromium/src.git@bfargs2
Patch Set: Another round of cleanup Created 7 years, 4 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/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index be25e6543063f5cba9201e8d242a6e7fec4e55fc..84581f5198a7d3d9dee49495b8a8098ce541d5ef 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -111,9 +111,8 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
latency_info_.Clear();
target_tree->SetPageScaleFactorAndLimits(
page_scale_factor(), min_page_scale_factor(), max_page_scale_factor());
- target_tree->SetPageScaleDelta(
- target_tree->page_scale_delta() / target_tree->sent_page_scale_delta());
- target_tree->set_sent_page_scale_delta(1);
+ target_tree->SetPageScaleDelta(page_scale_delta());
+ target_tree->set_sent_page_scale_delta(sent_page_scale_delta());
enne (OOO) 2013/08/06 23:35:16 If you're going to change this code, can you DCHEC
// This should match the property synchronization in
// LayerTreeHost::finishCommitOnImplThread().
@@ -190,18 +189,8 @@ void LayerTreeImpl::SetPageScaleDelta(float delta) {
if (delta == page_scale_delta_)
return;
-
page_scale_delta_ = delta;
- if (IsActiveTree()) {
- LayerTreeImpl* pending_tree = layer_tree_host_impl_->pending_tree();
- if (pending_tree) {
- DCHECK_EQ(1, pending_tree->sent_page_scale_delta());
- pending_tree->SetPageScaleDelta(
enne (OOO) 2013/08/06 23:35:16 This is what keeps the pending tree's total page s
- page_scale_delta_ / sent_page_scale_delta_);
- }
- }
-
UpdateMaxScrollOffset();
set_needs_update_draw_properties();
}

Powered by Google App Engine
This is Rietveld 408576698