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