| 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 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 871 } | 871 } |
| 872 | 872 |
| 873 bool LayerTreeImpl::PinchGestureActive() const { | 873 bool LayerTreeImpl::PinchGestureActive() const { |
| 874 return layer_tree_host_impl_->pinch_gesture_active(); | 874 return layer_tree_host_impl_->pinch_gesture_active(); |
| 875 } | 875 } |
| 876 | 876 |
| 877 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const { | 877 BeginFrameArgs LayerTreeImpl::CurrentBeginFrameArgs() const { |
| 878 return layer_tree_host_impl_->CurrentBeginFrameArgs(); | 878 return layer_tree_host_impl_->CurrentBeginFrameArgs(); |
| 879 } | 879 } |
| 880 | 880 |
| 881 base::TimeDelta LayerTreeImpl::CurrentBeginFrameInterval() const { | 881 base::TimeDelta LayerTreeImpl::begin_impl_frame_interval() const { |
| 882 return layer_tree_host_impl_->CurrentBeginFrameInterval(); | 882 return layer_tree_host_impl_->begin_impl_frame_interval(); |
| 883 } | 883 } |
| 884 | 884 |
| 885 void LayerTreeImpl::SetNeedsCommit() { | 885 void LayerTreeImpl::SetNeedsCommit() { |
| 886 layer_tree_host_impl_->SetNeedsCommit(); | 886 layer_tree_host_impl_->SetNeedsCommit(); |
| 887 } | 887 } |
| 888 | 888 |
| 889 gfx::Rect LayerTreeImpl::DeviceViewport() const { | 889 gfx::Rect LayerTreeImpl::DeviceViewport() const { |
| 890 return layer_tree_host_impl_->DeviceViewport(); | 890 return layer_tree_host_impl_->DeviceViewport(); |
| 891 } | 891 } |
| 892 | 892 |
| (...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1565 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1565 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
| 1566 pending_page_scale_animation_ = pending_animation.Pass(); | 1566 pending_page_scale_animation_ = pending_animation.Pass(); |
| 1567 } | 1567 } |
| 1568 | 1568 |
| 1569 scoped_ptr<PendingPageScaleAnimation> | 1569 scoped_ptr<PendingPageScaleAnimation> |
| 1570 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1570 LayerTreeImpl::TakePendingPageScaleAnimation() { |
| 1571 return pending_page_scale_animation_.Pass(); | 1571 return pending_page_scale_animation_.Pass(); |
| 1572 } | 1572 } |
| 1573 | 1573 |
| 1574 } // namespace cc | 1574 } // namespace cc |
| OLD | NEW |