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

Side by Side 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: fix some tests; needs rebase; Created 7 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_impl.h" 5 #include "cc/trees/layer_tree_impl.h"
6 6
7 #include "base/strings/stringprintf.h"
7 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
8 #include "cc/animation/keyframed_animation_curve.h" 9 #include "cc/animation/keyframed_animation_curve.h"
9 #include "cc/animation/scrollbar_animation_controller.h" 10 #include "cc/animation/scrollbar_animation_controller.h"
10 #include "cc/debug/traced_value.h" 11 #include "cc/debug/traced_value.h"
11 #include "cc/layers/heads_up_display_layer_impl.h" 12 #include "cc/layers/heads_up_display_layer_impl.h"
12 #include "cc/layers/render_surface_impl.h" 13 #include "cc/layers/render_surface_impl.h"
13 #include "cc/layers/scrollbar_layer_impl.h" 14 #include "cc/layers/scrollbar_layer_impl.h"
14 #include "cc/trees/layer_tree_host_common.h" 15 #include "cc/trees/layer_tree_host_common.h"
15 #include "cc/trees/layer_tree_host_impl.h" 16 #include "cc/trees/layer_tree_host_impl.h"
16 #include "ui/gfx/size_conversions.h" 17 #include "ui/gfx/size_conversions.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 float min_page_scale_factor, float max_page_scale_factor) { 172 float min_page_scale_factor, float max_page_scale_factor) {
172 if (!page_scale_factor) 173 if (!page_scale_factor)
173 return; 174 return;
174 175
175 min_page_scale_factor_ = min_page_scale_factor; 176 min_page_scale_factor_ = min_page_scale_factor;
176 max_page_scale_factor_ = max_page_scale_factor; 177 max_page_scale_factor_ = max_page_scale_factor;
177 page_scale_factor_ = page_scale_factor; 178 page_scale_factor_ = page_scale_factor;
178 } 179 }
179 180
180 void LayerTreeImpl::SetPageScaleDelta(float delta) { 181 void LayerTreeImpl::SetPageScaleDelta(float delta) {
182 std::string str;
183 base::StringAppendF(&str, "%s : delta %f",
184 __PRETTY_FUNCTION__,
185 delta);
186 TRACE_EVENT0("cc", str.c_str());
187
181 // Clamp to the current min/max limits. 188 // Clamp to the current min/max limits.
182 float total = page_scale_factor_ * delta; 189 float total = page_scale_factor_ * delta;
183 if (min_page_scale_factor_ && total < min_page_scale_factor_) 190 if (min_page_scale_factor_ && total < min_page_scale_factor_)
184 delta = min_page_scale_factor_ / page_scale_factor_; 191 delta = min_page_scale_factor_ / page_scale_factor_;
185 else if (max_page_scale_factor_ && total > max_page_scale_factor_) 192 else if (max_page_scale_factor_ && total > max_page_scale_factor_)
186 delta = max_page_scale_factor_ / page_scale_factor_; 193 delta = max_page_scale_factor_ / page_scale_factor_;
187 194
188 if (delta == page_scale_delta_) 195 if (delta == page_scale_delta_)
189 return; 196 return;
190 197 TRACE_EVENT0("cc", __PRETTY_FUNCTION__);
191 page_scale_delta_ = delta; 198 page_scale_delta_ = delta;
192 199
193 if (IsActiveTree()) { 200 if (IsActiveTree()) {
194 LayerTreeImpl* pending_tree = layer_tree_host_impl_->pending_tree(); 201 LayerTreeImpl* pending_tree = layer_tree_host_impl_->pending_tree();
195 if (pending_tree) { 202 if (pending_tree) {
196 DCHECK_EQ(1, pending_tree->sent_page_scale_delta()); 203 DCHECK_EQ(1, pending_tree->sent_page_scale_delta());
197 pending_tree->SetPageScaleDelta( 204 pending_tree->SetPageScaleDelta(
198 page_scale_delta_ / sent_page_scale_delta_); 205 page_scale_delta_ / sent_page_scale_delta_);
199 } 206 }
200 } 207 }
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 574
568 void LayerTreeImpl::ClearLatencyInfo() { 575 void LayerTreeImpl::ClearLatencyInfo() {
569 latency_info_.Clear(); 576 latency_info_.Clear();
570 } 577 }
571 578
572 void LayerTreeImpl::WillModifyTilePriorities() { 579 void LayerTreeImpl::WillModifyTilePriorities() {
573 layer_tree_host_impl_->SetNeedsManageTiles(); 580 layer_tree_host_impl_->SetNeedsManageTiles();
574 } 581 }
575 582
576 } // namespace cc 583 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698