| 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 <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 return top_controls_shown_ratio_->Current(IsActiveTree()); | 427 return top_controls_shown_ratio_->Current(IsActiveTree()); |
| 428 } | 428 } |
| 429 void set_top_controls_height(float top_controls_height); | 429 void set_top_controls_height(float top_controls_height); |
| 430 float top_controls_height() const { return top_controls_height_; } | 430 float top_controls_height() const { return top_controls_height_; } |
| 431 void PushTopControlsFromMainThread(float top_controls_shown_ratio); | 431 void PushTopControlsFromMainThread(float top_controls_shown_ratio); |
| 432 | 432 |
| 433 void SetPendingPageScaleAnimation( | 433 void SetPendingPageScaleAnimation( |
| 434 std::unique_ptr<PendingPageScaleAnimation> pending_animation); | 434 std::unique_ptr<PendingPageScaleAnimation> pending_animation); |
| 435 std::unique_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); | 435 std::unique_ptr<PendingPageScaleAnimation> TakePendingPageScaleAnimation(); |
| 436 | 436 |
| 437 void GatherFrameTimingRequestIds(std::vector<int64_t>* request_ids); | |
| 438 | |
| 439 void DidUpdateScrollOffset(int layer_id, int transform_id); | 437 void DidUpdateScrollOffset(int layer_id, int transform_id); |
| 440 void DidUpdateScrollState(int layer_id); | 438 void DidUpdateScrollState(int layer_id); |
| 441 | 439 |
| 442 bool IsAnimatingFilterProperty(const LayerImpl* layer) const; | 440 bool IsAnimatingFilterProperty(const LayerImpl* layer) const; |
| 443 bool IsAnimatingOpacityProperty(const LayerImpl* layer) const; | 441 bool IsAnimatingOpacityProperty(const LayerImpl* layer) const; |
| 444 bool IsAnimatingTransformProperty(const LayerImpl* layer) const; | 442 bool IsAnimatingTransformProperty(const LayerImpl* layer) const; |
| 445 | 443 |
| 446 bool HasPotentiallyRunningFilterAnimation(const LayerImpl* layer) const; | 444 bool HasPotentiallyRunningFilterAnimation(const LayerImpl* layer) const; |
| 447 bool HasPotentiallyRunningOpacityAnimation(const LayerImpl* layer) const; | 445 bool HasPotentiallyRunningOpacityAnimation(const LayerImpl* layer) const; |
| 448 bool HasPotentiallyRunningTransformAnimation(const LayerImpl* layer) const; | 446 bool HasPotentiallyRunningTransformAnimation(const LayerImpl* layer) const; |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 | 593 |
| 596 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; | 594 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; |
| 597 | 595 |
| 598 private: | 596 private: |
| 599 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); | 597 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); |
| 600 }; | 598 }; |
| 601 | 599 |
| 602 } // namespace cc | 600 } // namespace cc |
| 603 | 601 |
| 604 #endif // CC_TREES_LAYER_TREE_IMPL_H_ | 602 #endif // CC_TREES_LAYER_TREE_IMPL_H_ |
| OLD | NEW |