| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 105 |
| 106 // TODO(vmpstr): Early out if there are no requests on any of the layers. For | 106 // TODO(vmpstr): Early out if there are no requests on any of the layers. For |
| 107 // that, we need to inform LayerTreeImpl whenever there are requests when we | 107 // that, we need to inform LayerTreeImpl whenever there are requests when we |
| 108 // get them. | 108 // get them. |
| 109 LayerTreeHostCommon::CallFunctionForSubtree( | 109 LayerTreeHostCommon::CallFunctionForSubtree( |
| 110 root_layer_.get(), [request_ids](LayerImpl* layer) { | 110 root_layer_.get(), [request_ids](LayerImpl* layer) { |
| 111 layer->GatherFrameTimingRequestIds(request_ids); | 111 layer->GatherFrameTimingRequestIds(request_ids); |
| 112 }); | 112 }); |
| 113 } | 113 } |
| 114 | 114 |
| 115 bool LayerTreeImpl::IsExternalFlingActive() const { | 115 bool LayerTreeImpl::IsExternalScrollActive() const { |
| 116 return root_layer_scroll_offset_delegate_ && | 116 return root_layer_scroll_offset_delegate_ && |
| 117 root_layer_scroll_offset_delegate_->IsExternalFlingActive(); | 117 root_layer_scroll_offset_delegate_->IsExternalScrollActive(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 void LayerTreeImpl::DidUpdateScrollOffset(int layer_id) { | 120 void LayerTreeImpl::DidUpdateScrollOffset(int layer_id) { |
| 121 int inner_layer_id = InnerViewportScrollLayer() | 121 int inner_layer_id = InnerViewportScrollLayer() |
| 122 ? InnerViewportScrollLayer()->id() | 122 ? InnerViewportScrollLayer()->id() |
| 123 : Layer::INVALID_ID; | 123 : Layer::INVALID_ID; |
| 124 int outer_layer_id = OuterViewportScrollLayer() | 124 int outer_layer_id = OuterViewportScrollLayer() |
| 125 ? OuterViewportScrollLayer()->id() | 125 ? OuterViewportScrollLayer()->id() |
| 126 : Layer::INVALID_ID; | 126 : Layer::INVALID_ID; |
| 127 if (layer_id != outer_layer_id && layer_id != inner_layer_id) | 127 if (layer_id != outer_layer_id && layer_id != inner_layer_id) |
| (...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1589 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1589 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
| 1590 pending_page_scale_animation_ = pending_animation.Pass(); | 1590 pending_page_scale_animation_ = pending_animation.Pass(); |
| 1591 } | 1591 } |
| 1592 | 1592 |
| 1593 scoped_ptr<PendingPageScaleAnimation> | 1593 scoped_ptr<PendingPageScaleAnimation> |
| 1594 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1594 LayerTreeImpl::TakePendingPageScaleAnimation() { |
| 1595 return pending_page_scale_animation_.Pass(); | 1595 return pending_page_scale_animation_.Pass(); |
| 1596 } | 1596 } |
| 1597 | 1597 |
| 1598 } // namespace cc | 1598 } // namespace cc |
| OLD | NEW |