| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 | 258 |
| 259 target_tree->has_ever_been_drawn_ = false; | 259 target_tree->has_ever_been_drawn_ = false; |
| 260 } | 260 } |
| 261 | 261 |
| 262 LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const { | 262 LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const { |
| 263 return inner_viewport_scroll_layer_ | 263 return inner_viewport_scroll_layer_ |
| 264 ? inner_viewport_scroll_layer_->scroll_clip_layer() | 264 ? inner_viewport_scroll_layer_->scroll_clip_layer() |
| 265 : NULL; | 265 : NULL; |
| 266 } | 266 } |
| 267 | 267 |
| 268 LayerImpl* LayerTreeImpl::OuterViewportContainerLayer() const { |
| 269 return outer_viewport_scroll_layer_ |
| 270 ? outer_viewport_scroll_layer_->scroll_clip_layer() |
| 271 : NULL; |
| 272 } |
| 273 |
| 268 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const { | 274 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const { |
| 269 DCHECK(IsActiveTree()); | 275 DCHECK(IsActiveTree()); |
| 270 return currently_scrolling_layer_; | 276 return currently_scrolling_layer_; |
| 271 } | 277 } |
| 272 | 278 |
| 273 void LayerTreeImpl::SetCurrentlyScrollingLayer(LayerImpl* layer) { | 279 void LayerTreeImpl::SetCurrentlyScrollingLayer(LayerImpl* layer) { |
| 274 if (currently_scrolling_layer_ == layer) | 280 if (currently_scrolling_layer_ == layer) |
| 275 return; | 281 return; |
| 276 | 282 |
| 277 if (currently_scrolling_layer_ && | 283 if (currently_scrolling_layer_ && |
| (...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1500 page_scale, | 1506 page_scale, |
| 1501 duration.InSecondsF()); | 1507 duration.InSecondsF()); |
| 1502 } | 1508 } |
| 1503 } | 1509 } |
| 1504 | 1510 |
| 1505 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { | 1511 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { |
| 1506 return page_scale_animation_.Pass(); | 1512 return page_scale_animation_.Pass(); |
| 1507 } | 1513 } |
| 1508 | 1514 |
| 1509 } // namespace cc | 1515 } // namespace cc |
| OLD | NEW |