| 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 return top_controls_shown_ratio_->Current(IsActiveTree()); | 325 return top_controls_shown_ratio_->Current(IsActiveTree()); |
| 326 } | 326 } |
| 327 void set_top_controls_height(float top_controls_height); | 327 void set_top_controls_height(float top_controls_height); |
| 328 float top_controls_height() const { return top_controls_height_; } | 328 float top_controls_height() const { return top_controls_height_; } |
| 329 void PushTopControlsFromMainThread(float top_controls_shown_ratio); | 329 void PushTopControlsFromMainThread(float top_controls_shown_ratio); |
| 330 | 330 |
| 331 void SetPendingPageScaleAnimation( | 331 void SetPendingPageScaleAnimation( |
| 332 scoped_ptr<PendingPageScaleAnimation> pending_animation); | 332 scoped_ptr<PendingPageScaleAnimation> pending_animation); |
| 333 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); | 333 scoped_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); |
| 334 | 334 |
| 335 void GatherFrameTimingRequestIds(std::vector<int64_t>* request_ids); |
| 336 |
| 335 protected: | 337 protected: |
| 336 explicit LayerTreeImpl( | 338 explicit LayerTreeImpl( |
| 337 LayerTreeHostImpl* layer_tree_host_impl, | 339 LayerTreeHostImpl* layer_tree_host_impl, |
| 338 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, | 340 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor, |
| 339 scoped_refptr<SyncedTopControls> top_controls_shown_ratio, | 341 scoped_refptr<SyncedTopControls> top_controls_shown_ratio, |
| 340 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll); | 342 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll); |
| 341 float ClampPageScaleFactorToLimits(float page_scale_factor) const; | 343 float ClampPageScaleFactorToLimits(float page_scale_factor) const; |
| 342 void PushPageScaleFactorAndLimits(const float* page_scale_factor, | 344 void PushPageScaleFactorAndLimits(const float* page_scale_factor, |
| 343 float min_page_scale_factor, | 345 float min_page_scale_factor, |
| 344 float max_page_scale_factor); | 346 float max_page_scale_factor); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 | 421 |
| 420 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; | 422 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; |
| 421 | 423 |
| 422 private: | 424 private: |
| 423 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); | 425 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); |
| 424 }; | 426 }; |
| 425 | 427 |
| 426 } // namespace cc | 428 } // namespace cc |
| 427 | 429 |
| 428 #endif // CC_TREES_LAYER_TREE_IMPL_H_ | 430 #endif // CC_TREES_LAYER_TREE_IMPL_H_ |
| OLD | NEW |