| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 #include "cc/trees/layer_tree_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 888 } | 888 } |
| 889 | 889 |
| 890 bool LayerTreeImpl::PinchGestureActive() const { | 890 bool LayerTreeImpl::PinchGestureActive() const { |
| 891 return layer_tree_host_impl_->pinch_gesture_active(); | 891 return layer_tree_host_impl_->pinch_gesture_active(); |
| 892 } | 892 } |
| 893 | 893 |
| 894 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const { | 894 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const { |
| 895 return layer_tree_host_impl_->CurrentBeginFrameArgs(); | 895 return layer_tree_host_impl_->CurrentBeginFrameArgs(); |
| 896 } | 896 } |
| 897 | 897 |
| 898 base::TimeDelta LayerTreeImpl::begin_impl_frame_interval() const { | 898 base::TimeDelta LayerTreeImpl::CurrentBeginFrameInterval() const { |
| 899 return layer_tree_host_impl_->begin_impl_frame_interval(); | 899 return layer_tree_host_impl_->CurrentBeginFrameInterval(); |
| 900 } | 900 } |
| 901 | 901 |
| 902 void LayerTreeImpl::SetNeedsCommit() { | 902 void LayerTreeImpl::SetNeedsCommit() { |
| 903 layer_tree_host_impl_->SetNeedsCommit(); | 903 layer_tree_host_impl_->SetNeedsCommit(); |
| 904 } | 904 } |
| 905 | 905 |
| 906 gfx::Rect LayerTreeImpl::DeviceViewport() const { | 906 gfx::Rect LayerTreeImpl::DeviceViewport() const { |
| 907 return layer_tree_host_impl_->DeviceViewport(); | 907 return layer_tree_host_impl_->DeviceViewport(); |
| 908 } | 908 } |
| 909 | 909 |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1581 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1581 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
| 1582 pending_page_scale_animation_ = pending_animation.Pass(); | 1582 pending_page_scale_animation_ = pending_animation.Pass(); |
| 1583 } | 1583 } |
| 1584 | 1584 |
| 1585 scoped_ptr<PendingPageScaleAnimation> | 1585 scoped_ptr<PendingPageScaleAnimation> |
| 1586 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1586 LayerTreeImpl::TakePendingPageScaleAnimation() { |
| 1587 return pending_page_scale_animation_.Pass(); | 1587 return pending_page_scale_animation_.Pass(); |
| 1588 } | 1588 } |
| 1589 | 1589 |
| 1590 } // namespace cc | 1590 } // namespace cc |
| OLD | NEW |