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 <limits> | 7 #include <limits> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 | 259 |
260 target_tree->has_ever_been_drawn_ = false; | 260 target_tree->has_ever_been_drawn_ = false; |
261 } | 261 } |
262 | 262 |
263 LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const { | 263 LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const { |
264 return inner_viewport_scroll_layer_ | 264 return inner_viewport_scroll_layer_ |
265 ? inner_viewport_scroll_layer_->scroll_clip_layer() | 265 ? inner_viewport_scroll_layer_->scroll_clip_layer() |
266 : NULL; | 266 : NULL; |
267 } | 267 } |
268 | 268 |
| 269 LayerImpl* LayerTreeImpl::OuterViewportContainerLayer() const { |
| 270 return outer_viewport_scroll_layer_ |
| 271 ? outer_viewport_scroll_layer_->scroll_clip_layer() |
| 272 : NULL; |
| 273 } |
| 274 |
269 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const { | 275 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const { |
270 DCHECK(IsActiveTree()); | 276 DCHECK(IsActiveTree()); |
271 return currently_scrolling_layer_; | 277 return currently_scrolling_layer_; |
272 } | 278 } |
273 | 279 |
274 void LayerTreeImpl::SetCurrentlyScrollingLayer(LayerImpl* layer) { | 280 void LayerTreeImpl::SetCurrentlyScrollingLayer(LayerImpl* layer) { |
275 if (currently_scrolling_layer_ == layer) | 281 if (currently_scrolling_layer_ == layer) |
276 return; | 282 return; |
277 | 283 |
278 if (currently_scrolling_layer_ && | 284 if (currently_scrolling_layer_ && |
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1505 page_scale, | 1511 page_scale, |
1506 duration.InSecondsF()); | 1512 duration.InSecondsF()); |
1507 } | 1513 } |
1508 } | 1514 } |
1509 | 1515 |
1510 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { | 1516 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { |
1511 return page_scale_animation_.Pass(); | 1517 return page_scale_animation_.Pass(); |
1512 } | 1518 } |
1513 | 1519 |
1514 } // namespace cc | 1520 } // namespace cc |
OLD | NEW |