OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ | 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ |
6 #define CC_TREES_LAYER_TREE_IMPL_H_ | 6 #define CC_TREES_LAYER_TREE_IMPL_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 return top_controls_shown_ratio_->Current(IsActiveTree()); | 322 return top_controls_shown_ratio_->Current(IsActiveTree()); |
323 } | 323 } |
324 void set_top_controls_height(float top_controls_height); | 324 void set_top_controls_height(float top_controls_height); |
325 float top_controls_height() const { return top_controls_height_; } | 325 float top_controls_height() const { return top_controls_height_; } |
326 void PushTopControlsFromMainThread(float top_controls_shown_ratio); | 326 void PushTopControlsFromMainThread(float top_controls_shown_ratio); |
327 | 327 |
328 void SetPendingPageScaleAnimation( | 328 void SetPendingPageScaleAnimation( |
329 scoped_ptr<PendingPageScaleAnimation> pending_animation); | 329 scoped_ptr<PendingPageScaleAnimation> pending_animation); |
330 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); | 330 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); |
331 | 331 |
| 332 void GatherFrameTimingRequestIds(std::vector<int64_t>* request_ids); |
| 333 |
332 protected: | 334 protected: |
333 explicit LayerTreeImpl( | 335 explicit LayerTreeImpl( |
334 LayerTreeHostImpl* layer_tree_host_impl, | 336 LayerTreeHostImpl* layer_tree_host_impl, |
335 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, | 337 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, |
336 scoped_refptr<SyncedTopControls> top_controls_shown_ratio, | 338 scoped_refptr<SyncedTopControls> top_controls_shown_ratio, |
337 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll); | 339 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll); |
338 float ClampPageScaleFactorToLimits(float page_scale_factor) const; | 340 float ClampPageScaleFactorToLimits(float page_scale_factor) const; |
339 void PushPageScaleFactorAndLimits(const float* page_scale_factor, | 341 void PushPageScaleFactorAndLimits(const float* page_scale_factor, |
340 float min_page_scale_factor, | 342 float min_page_scale_factor, |
341 float max_page_scale_factor); | 343 float max_page_scale_factor); |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 | 418 |
417 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; | 419 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; |
418 | 420 |
419 private: | 421 private: |
420 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); | 422 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); |
421 }; | 423 }; |
422 | 424 |
423 } // namespace cc | 425 } // namespace cc |
424 | 426 |
425 #endif // CC_TREES_LAYER_TREE_IMPL_H_ | 427 #endif // CC_TREES_LAYER_TREE_IMPL_H_ |
OLD | NEW |