| 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 | 199 |
| 200 bool has_transparent_background() const { | 200 bool has_transparent_background() const { |
| 201 return has_transparent_background_; | 201 return has_transparent_background_; |
| 202 } | 202 } |
| 203 void set_has_transparent_background(bool transparent) { | 203 void set_has_transparent_background(bool transparent) { |
| 204 has_transparent_background_ = transparent; | 204 has_transparent_background_ = transparent; |
| 205 } | 205 } |
| 206 | 206 |
| 207 void UpdatePropertyTreeScrollingAndAnimationFromMainThread(); | 207 void UpdatePropertyTreeScrollingAndAnimationFromMainThread(); |
| 208 void SetPageScaleOnActiveTree(float active_page_scale); | 208 void SetPageScaleOnActiveTree(float active_page_scale); |
| 209 void SetPageScaleOnActiveTreeForTesting(float active_page_scale); |
| 209 void PushPageScaleFromMainThread(float page_scale_factor, | 210 void PushPageScaleFromMainThread(float page_scale_factor, |
| 210 float min_page_scale_factor, | 211 float min_page_scale_factor, |
| 211 float max_page_scale_factor); | 212 float max_page_scale_factor); |
| 212 float current_page_scale_factor() const { | 213 float current_page_scale_factor() const { |
| 213 return page_scale_factor()->Current(IsActiveTree()); | 214 return page_scale_factor()->Current(IsActiveTree()); |
| 214 } | 215 } |
| 215 float min_page_scale_factor() const { return min_page_scale_factor_; } | 216 float min_page_scale_factor() const { return min_page_scale_factor_; } |
| 216 float max_page_scale_factor() const { return max_page_scale_factor_; } | 217 float max_page_scale_factor() const { return max_page_scale_factor_; } |
| 217 | 218 |
| 218 float page_scale_delta() const { return page_scale_factor()->Delta(); } | 219 float page_scale_delta() const { return page_scale_factor()->Delta(); } |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 | 557 |
| 557 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; | 558 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; |
| 558 | 559 |
| 559 private: | 560 private: |
| 560 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); | 561 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); |
| 561 }; | 562 }; |
| 562 | 563 |
| 563 } // namespace cc | 564 } // namespace cc |
| 564 | 565 |
| 565 #endif // CC_TREES_LAYER_TREE_IMPL_H_ | 566 #endif // CC_TREES_LAYER_TREE_IMPL_H_ |
| OLD | NEW |